From nobody Wed May 31 16:20:43 2023 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 4QWZHv6tntz4XCNW; Wed, 31 May 2023 16:20:43 +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 4QWZHv6MVLz4YBJ; Wed, 31 May 2023 16:20:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685550043; 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=G/xuYp51BCtkxS0GS68diTfYLKyfEKIGqutmxWgB1dc=; b=BZssyRJIfNdAVaTK5HJYD8sZy0u4X17XZrpDNAoTlzSuEV2LARx0dff3D35a8egf+xuQAj ygzGnufrTKY5FufkNx55BnfFgJQINkW1UxIlhecw6SmQdBehwoZFiXJwSl2XX7+Q57eOHZ xFptHoL80BU+N1qXEewppTkIVY+rzaB6wcHjl8TPSkgx1Gktkk9jJ6ADLdJd6uvVLiuWm0 Qb7X41+Bt4JUZxftKRQ7UDckeDwnxebMDGcFt1z6tbzZP0NlVITO9wU74dCUrZ0msvs709 dD4JD2lveq4UFuyk6kmOU6xBRrNhqE827Fc/VNzJxsDcTK6ed/bZS/uoJBm7jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685550043; 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=G/xuYp51BCtkxS0GS68diTfYLKyfEKIGqutmxWgB1dc=; b=IXPbIMazi764pXkWupeXxvH7BvNvLV1cs8QkPdWkKTAGMqwJKMIoqSxOG0GmDaR/0rnw1A 7X7lqz0zJOrX9NWswaNqRFNAHEGOX3EE7esRGjWrhdp84QSJF+oKbKiSBheoRZsjO+wAMD 4MTRxSxdIEOzliTirnm01JShiMvYxllkrMpAUxVfY/w++OqZqW5Yma5XXxn2EZcwJoX05f S1mqo8jEwWFnyjxOPMR8uWP2lOyP1Djie08hklTmq3Yc/8jORSP4BKWwCqyCQ2Es8D42VY cjDFsqUk2+dsvF7ohn2BWAtTnx5vIZSz7E687LAlyNBuGZTu8guIUV0xP3iWTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685550043; a=rsa-sha256; cv=none; b=EzYYQlfuwZ/njICkbqP5qnAWbO/zHp7MNPyQjsRJ/s/d6C/kCkV8QUkFJozXvoLdDqG2LS mGl5ppvP6roHp8u9NwHxlQKRsGD+0bc0bnqGPs+S1yWADgVMxz2WCEpePsXs84R26qt5jO xD9n2dPiCNQm+KOEPEk9FeQgCJkbqY+UmfE0oBs8iyif0jSdbZR0hSl+NMglNFyLv1xdpu +/0fetCBH7kZMZwxxMpWKm8r0xGWaB/KuOtaNcReDgPZHzhcgjPHeq29j3XEOc9P2J4Cmk +/9XDMpP+jNJ4TgJ0Qi3ikmk1FSOzIpuccYOmntv5ZEJpomWyxVfLtPeJZaiSg== 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 4QWZHv5R4XzhT9; Wed, 31 May 2023 16:20:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34VGKhaA017782; Wed, 31 May 2023 16:20:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34VGKhfP017781; Wed, 31 May 2023 16:20:43 GMT (envelope-from git) Date: Wed, 31 May 2023 16:20:43 GMT Message-Id: <202305311620.34VGKhfP017781@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 8e7a31b65f9a - main - decryptcore: update for OpenSSL 1.1 API 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e7a31b65f9ab0210b9648211a4f5268e2680058 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8e7a31b65f9ab0210b9648211a4f5268e2680058 commit 8e7a31b65f9ab0210b9648211a4f5268e2680058 Author: Ed Maste AuthorDate: 2023-05-31 14:17:52 +0000 Commit: Ed Maste CommitDate: 2023-05-31 16:20:34 +0000 decryptcore: update for OpenSSL 1.1 API ERR_load_crypto_strings is deprecated in OpenSSL 1.1, and OpenSSL 1.1 generally does not require explicit initialization. However, we do need to ensure that initialization is done before entering capability mode so call OPENSSL_init_crypto instead. Also include header needed for ERR_error_string. Reviewed by: vangyzen Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40343 --- sbin/decryptcore/decryptcore.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sbin/decryptcore/decryptcore.c b/sbin/decryptcore/decryptcore.c index fc6599fb0ecc..8f80c948b341 100644 --- a/sbin/decryptcore/decryptcore.c +++ b/sbin/decryptcore/decryptcore.c @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -179,8 +180,10 @@ decrypt(int ofd, const char *privkeyfile, const char *keyfile, unsigned char c[1]; RAND_bytes(c, 1); } -#endif ERR_load_crypto_strings(); +#else + OPENSSL_init_crypto(0, NULL); +#endif caph_cache_catpages(); if (caph_enter() < 0) {