From nobody Thu Mar 28 05:06:25 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V4s2V3d4lz5GCcd; Thu, 28 Mar 2024 05:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V4s2T73y4z4V5X; Thu, 28 Mar 2024 05:06:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711602386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bdPMIvCoGVQ7/u8AJWfmjCxUowLtam52UDaebRRmQeY=; b=ickgkrBzztp9krghMpONYyBHccbTRMnNi+7jACj0i+FBYb4nNylDgEDyJXIoGg21s2FjLF VHcrwWXIzknxUtxJOZfRPvZpq+l02cYo9V1zY6PQGUdLsGHARDfzYMpqC6XXlRU8SqZw7I ElnU6N2wFW55Q2cPRDQWPoxVvc0PxlP65DKcgHU7k+EKtRimn9jhQGjkWCajsht2THOkLM zzC5pDx53UvzWGi9iwSWZt+2sDBeHZ+zzhF8xIptWReFBkYpt7YUMOui83BkRYGLjPdf/i R57bEk66ITBBPqOy7RaU5Iv4DLhIkO+s/9Mk7Syqcwfuzw8PSC5UQqNxI4x4IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711602386; a=rsa-sha256; cv=none; b=LL6Nt+R7wMx0tWtcdHRproMcEzDdudIbPNfW/40M8EfCz2K67Tm515YmdVZwUujwXXSCxx aZDdeOVSilJY+K8jmrEngXzEIWAZvc27Q9JOmmjRsqH6hg5tlqzKcRbPAaemq3tchmjZqE GIR4iVudBJsZyYLEIxVatynhQte+GNuZuK6Px3sgLQMe0qMLG+YEIvrnmdu4XFfsDtGTpA AUAQWDun5DShNfdoGmLJ8dFWC3EdC9j9SI3kN4OgT9Ho0M/ozqw7bB4oyLunTbeFZm/nnC 2Gg0yk6GWLcIeidpDj2SCarLkor2fAQJ7TfJr0EUGUWi9dIf8aT2lv9+6lRPzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711602386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bdPMIvCoGVQ7/u8AJWfmjCxUowLtam52UDaebRRmQeY=; b=XnkTM3UlpS1Af2+DjIry7jMa+RJ1LE/m3V6nYK9YROovSbGyX82hjVgx6tWtrIc0kMkBsa 9Wy5fqUTmBusgeExazTlRRPc04FS2xj9jeB07NWZ9E/sLOpy4QZY3k9TQw8KeYWfM7bveN GNFqk7ZgQwS2bbpTD4euvUC/PtzKNggEP4k8y89dTjGBuXnLiioHKyAuKgwD22asNlgfj+ Y8bWpU1jDr6AzvaCzOXpqhwCtFcjlKS9idi5u9dZAh72579UB4pvHYMduZ+JTXYpfIWrKt VYfiizow/MczZnMizwarPTjy2GBV+xrPXsG2zsJosnvpphgHdy1VKLsdcynK5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V4s2T6Sl9zDqx; Thu, 28 Mar 2024 05:06:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42S56P05099188; Thu, 28 Mar 2024 05:06:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42S56Po6099185; Thu, 28 Mar 2024 05:06:25 GMT (envelope-from git) Date: Thu, 28 Mar 2024 05:06:25 GMT Message-Id: <202403280506.42S56Po6099185@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: c48fe39ad139 - releng/14.0 - kerberos5: Mitigate the possibility of using an old libcrypto List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: c48fe39ad13906f9425ec36bf42c2725e8e31979 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=c48fe39ad13906f9425ec36bf42c2725e8e31979 commit c48fe39ad13906f9425ec36bf42c2725e8e31979 Author: Cy Schubert AuthorDate: 2024-01-18 08:22:20 +0000 Commit: Gordon Tetlow CommitDate: 2024-03-28 03:15:14 +0000 kerberos5: Mitigate the possibility of using an old libcrypto By using the full library name (libcrypto.so.30) we avoid the exposure of using an old, possibly vulnerable, library. Reported by: jrtc27 Fixes: 476d63e091c2 Approved by: so Security: FreeBSD-EN-24:08.kerberos (cherry picked from commit 0990136ed1753ac7837206f9c5f4b83ccff6c405) (cherry picked from commit 17e941a0c88cac2d8cd28d6614448adbd65d4b72) --- kerberos5/lib/libroken/fbsd_ossl_provider_load.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kerberos5/lib/libroken/fbsd_ossl_provider_load.c b/kerberos5/lib/libroken/fbsd_ossl_provider_load.c index 497b32124f96..2328041bc166 100644 --- a/kerberos5/lib/libroken/fbsd_ossl_provider_load.c +++ b/kerberos5/lib/libroken/fbsd_ossl_provider_load.c @@ -5,6 +5,7 @@ #include #if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) +#define CRYPTO_LIBRARY "/lib/libcrypto.so.30" static void fbsd_ossl_provider_unload(void); static void print_dlerror(char *); static OSSL_PROVIDER *legacy; @@ -46,7 +47,7 @@ fbsd_ossl_provider_load(void) { #if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) if (crypto_lib_handle == NULL) { - if (!(crypto_lib_handle = dlopen("/usr/lib/libcrypto.so", + if (!(crypto_lib_handle = dlopen(CRYPTO_LIBRARY, RTLD_LAZY|RTLD_GLOBAL))) { print_dlerror("Unable to load libcrypto.so"); return (EINVAL);