From nobody Fri Jun 2 01:24:03 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 4QXQJM2c01z4Z8HB; Fri, 2 Jun 2023 01:24:03 +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 4QXQJM27lcz3H0T; Fri, 2 Jun 2023 01:24:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685669043; 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=UHKNKbbX0bLnfdsewiAa+x2glTCv0eWsdoPiBVahFEU=; b=pQSF96aRqZBEzUDLqp6BHVzQlJD+Blcwf1ovqESj17QLNe0M+B8IGllO+lbCYkWkm0JrwW AWgVqz8Fna4g0psI91HuMDnZlRSc2oqNzkUrw2zvr2qA0baG6rjphrDYT8AmQtmJie7CN/ KpO1CZGYJJ7IMSb8XZITD9sJeMEq0r9nuEzYfaP9hzREhKOnHovQ7e0Yvt/0W3CcBXqX9Z tapgQEvVG91NARVPKDDX8xHAGfqX2VTSKDFpDyPdeoDHeMsode5XTsYHVyCgipEYvJc5Qe qcVWppo5gRWxOEGBZ3+ETwaBYeXhXtY7AUiQ1vsVIjXhKWLd44GP+PBAv5GDBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685669043; 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=UHKNKbbX0bLnfdsewiAa+x2glTCv0eWsdoPiBVahFEU=; b=xqGlENf6WEwMirw5Xl/RHF7pDClXXvKlunjAp3yxGJBhiJUxPT3pyZbChZEdP7HFsCzTaN fjN3TxqLmB6itlbt6WGNQzg4x2awC7g6x5O+F5PHM1CAtWl/Tl0FKDp/fn/1hiuTEkF8hw /CmX9OpAci4bkxinceXnH/oUBbDSHOI+Dcv8xx1uAwLzfZSu+BTF+5mAWKbqaOyTq1Rtko XJPBV/T+nvjoIyzjd5zbno5zZS+Do4BqABXSsyXNv6VMGnnXzkAJTS1thayk41APH4nNT6 gWNRdcfMTMadQV5SmNLLlMI4d2k3/NkIYJ5mQYnBZ1DA8UmUvmx508cRnEVY3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685669043; a=rsa-sha256; cv=none; b=W9/ptceaiVELW+2QzREOraQJxs/ZItrv0zIvQH2LT1zFmgOd/H/Ld9X78NnBDF5FlnWDdj zpNg1lg6lZIqR+Yni9YaHVB3ZJzQOWTBtYejDXjypYTY+bjUnvsqhuB5ajSxQX0zPprvUw E+HaRqPfExXkrK4Kt0ALKCEPnBDWyqnIufohOyctgL4wCAEaMGKHrOp79WQaKWrs2nGaeO QCmFVSpS6iQ2Z6dWVtAZ1/FsHJvItC6AHpOaTSGKyoNEg1k6eQ7I6HcFIiGavBz9l+L+UR bhZvUNNWRzwaxVy5TDQM+nZJq/iCz4l1gUXv6WMgtga8NmcHzAqUct7mTJP0dA== 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 4QXQJM1CCZzg7d; Fri, 2 Jun 2023 01:24:03 +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 3521O309089948; Fri, 2 Jun 2023 01:24:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3521O3Hu089947; Fri, 2 Jun 2023 01:24:03 GMT (envelope-from git) Date: Fri, 2 Jun 2023 01:24:03 GMT Message-Id: <202306020124.3521O3Hu089947@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: 79d4d7133f07 - main - dumpon: update OpenSSL initialization call 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: 79d4d7133f07b399155a4d2eb20a8ee1ca705569 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=79d4d7133f07b399155a4d2eb20a8ee1ca705569 commit 79d4d7133f07b399155a4d2eb20a8ee1ca705569 Author: Ed Maste AuthorDate: 2023-05-31 16:25:58 +0000 Commit: Ed Maste CommitDate: 2023-06-02 01:21:23 +0000 dumpon: update OpenSSL initialization call ERR_load_crypto_strings() was deprecated in OpenSSL 1.1.0, and explicit initialization is generally not reqiured. In the case of dumpon however we initialize prior to entering capability mode, so replace with an OPENSSL_init_crypto call. Reviewed by: def, Pierre Pronchery Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40353 --- sbin/dumpon/dumpon.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c index c530c9ad59ed..5bcfe2b8f1e7 100644 --- a/sbin/dumpon/dumpon.c +++ b/sbin/dumpon/dumpon.c @@ -566,7 +566,12 @@ main(int argc, char *argv[]) if (cipher != KERNELDUMP_ENC_NONE && pubkeyfile == NULL) { errx(EX_USAGE, "-C option requires a public key file."); } else if (pubkeyfile != NULL) { +#if OPENSSL_VERSION_NUMBER < 0x10100000L ERR_load_crypto_strings(); +#else + if (!OPENSSL_init_crypto(0, NULL)) + errx(EX_UNAVAILABLE, "Unable to initialize OpenSSL"); +#endif } #else if (pubkeyfile != NULL)