From nobody Mon Aug 25 17:13:00 2025 X-Original-To: dev-commits-src-all@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 4c9cn85rzSz65Kfr; Mon, 25 Aug 2025 17:13:00 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9cn85J4Hz3rYV; Mon, 25 Aug 2025 17:13:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756141980; 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=n6sLaFuO3oLZD4V39e3PSeRQpW4uoWDDfNa77cbdOw4=; b=QDQzfHYeKx4aY5g5wFFtK2N3mr2tqL5teaWOhcucKcyTzjpiu3C2iTpOkKUorjsb6srgtS E+/dAQfxYgQrBDROqcRG1LwCLgZq7WecdG8+ZTeOoYUY1mDUuNzjTxQ4eL6bAomCV6TZhL //dFJyiYhHo2rrYiTKcAPGJr0wWTqfySFak++M4isD86kG/tI2EnOEuVCfOgmk9F5LmZxX ROs4oAFbEJz1GX+KHoHmWOJRyZ89413qsiejr2aDRdu6+aUL6zxlLd6iOK/U0C7mIW8lLQ hP5UZzYznGJUx8tRAx9EsXL+PB2ZK2COqwB9b6dRRwTts2U4x3Gl+5iE8LV+qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756141980; 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=n6sLaFuO3oLZD4V39e3PSeRQpW4uoWDDfNa77cbdOw4=; b=l9xhKVVtXdrLO6NocNWtJrglKhOQpJMZOE0Xh3p+/I5MSRPoC5E33FwpuvgmLMfwAavMkn yrHpozIzONfKg+jgNK0rIN4pMWSSoznZvbXe2Od9XdDFOroOSvohTd5Em9IPfXVz3fLqA6 Ij6/fnt2FBO8PPeYqjfQ/KWGKgw978oHiTI1CgWiyOBrA0SSNzrkNXrfi00VIHd1iVF5se WKXq5gh5bkqf/Dxz0bSm1q35uKg1JgPv5avM9atKbWggxk1RTxQB2whFX64GiwxNe97qeT W+vv1TqFGN8gk6vq0yJtkkm/WwjxQjHeS1izz+vk/UdHvfip6vQ8Yoxw8849FQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756141980; a=rsa-sha256; cv=none; b=SkYaMYrDZIdo9/6/kH8IRSyfX8EhaYfLxfkzDwKwoAvcfzvYzlRUJtaJGaGjrdV5w3c6yR PC3Jt7jYgrnJ3BHtIIRz3xPyeU89KvhQ9TWSAA6VR/p9C5RVnqU2Jy0eo2nlGOayDmRpHQ b+d80qwPPTCQfo6MtWVbXB3ld4CK7H6iQpUln0XuaqFEshUAXu9HYM9EDWNt0ii5ADvLx3 8vHedGJR9BdFnhCujWl65/TxK3ihD9MYsIwNWGbIZap5JAJbo2EUTiMN35hJMz4jM+zeGE wK0VIscWrR4U61ljcZug6VcwN1VPFmkGFVPM6JyveSrHaYN61pWjvzt9FV5Enw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c9cn84lMRz101w; Mon, 25 Aug 2025 17:13:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57PHD0Up062483; Mon, 25 Aug 2025 17:13:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PHD05H062480; Mon, 25 Aug 2025 17:13:00 GMT (envelope-from git) Date: Mon, 25 Aug 2025 17:13:00 GMT Message-Id: <202508251713.57PHD05H062480@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 9ab31f821ad1 - main - heimdal: fix wrt OpenSSL 3.5 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ab31f821ad1c6bad474510447387c50bef2c24c Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=9ab31f821ad1c6bad474510447387c50bef2c24c commit 9ab31f821ad1c6bad474510447387c50bef2c24c Author: Gleb Smirnoff AuthorDate: 2025-08-25 17:12:52 +0000 Commit: Gleb Smirnoff CommitDate: 2025-08-25 17:12:52 +0000 heimdal: fix wrt OpenSSL 3.5 - Bump the library version. - Don't load the legacy provider. It is no longer enabled by default and looks like kdc doesn't actually need it. Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D52114 --- kerberos5/lib/libroken/fbsd_ossl_provider_load.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/kerberos5/lib/libroken/fbsd_ossl_provider_load.c b/kerberos5/lib/libroken/fbsd_ossl_provider_load.c index 2328041bc166..b8812f207af8 100644 --- a/kerberos5/lib/libroken/fbsd_ossl_provider_load.c +++ b/kerberos5/lib/libroken/fbsd_ossl_provider_load.c @@ -5,10 +5,9 @@ #include #if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) -#define CRYPTO_LIBRARY "/lib/libcrypto.so.30" +#define CRYPTO_LIBRARY "/lib/libcrypto.so.35" static void fbsd_ossl_provider_unload(void); static void print_dlerror(char *); -static OSSL_PROVIDER *legacy; static OSSL_PROVIDER *deflt; static int providers_loaded = 0; static OSSL_PROVIDER * (*ossl_provider_load)(OSSL_LIB_CTX *, const char*) = NULL; @@ -25,7 +24,6 @@ fbsd_ossl_provider_unload(void) } } if (providers_loaded == 1) { - (*ossl_provider_unload)(legacy); (*ossl_provider_unload)(deflt); providers_loaded = 0; } @@ -61,10 +59,7 @@ fbsd_ossl_provider_load(void) } if (providers_loaded == 0) { - if ((legacy = (*ossl_provider_load)(NULL, "legacy")) == NULL) - return (EINVAL); if ((deflt = (*ossl_provider_load)(NULL, "default")) == NULL) { - (*ossl_provider_unload)(legacy); return (EINVAL); } if (atexit(fbsd_ossl_provider_unload)) {