From nobody Tue Jul 4 19:08:19 2023 X-Original-To: dev-commits-src-main@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 4QwXPc2XfXz4lGLN; Tue, 4 Jul 2023 19:08:20 +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 4QwXPb6Lgbz4L23; Tue, 4 Jul 2023 19:08:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688497699; 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=SKCCVPLdA7KbLUFhkgZHZPuUGhVIkBYbg/llzf5+M10=; b=qR94YUfkGDZ6nCMpI6xxFsk0+yJqlvCkR21nNQdk+7H4wouRWERprAhL92V/405nPFRYqy AFCxn78ZeQPb+0PqSxr+JgcfgFL/p8LnLy5OBnzzFVzA1B0PWc+vl0WdZSxAsjjxHED0c5 1sw55cDYstbdc/BEdJnJ1w9p1NFVcMk31v2jzE/bllPJ+7eeUyJAVD1SrRK5AD/KT9rDxT kHc7S99h8I1rVSgvU+g3864XRwNATZ0H/WWncxZtXKHi13DL4yCGBXYHVoWj33Lnm/Z2ct yPIK6/MkbT+NdDocLkGsd9+Uu8RE0Dg7FoVFCHQufn/UXLA2oMTIw2Lr32+o9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688497699; 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=SKCCVPLdA7KbLUFhkgZHZPuUGhVIkBYbg/llzf5+M10=; b=Djf5417PHDQVxTBvvxTuTFAhJLvAqyc7mUFLYdFye+DBWUhXp4Dq92ay+51WQdQ6PwH+bs Fk47QiFmPGbBzVJPSWn1Oe50WvdPxnO4JjQ3W2fd626I0INFYrUmtWzp0svPU06jnJXW9k J9CLmYqO42mnOiJv3gLZ7fBMq1b+NASxv5ulrcbwvEKEhYET1U+mCdOtRvuOB64Bl+j3MR EDLxKu1nAk8KU03OtvqWss+ycPPHj+/avpeq77EwVR7y3Ez5jIO8atcRqXsLKWQ0wBhc6Z FVWWDX8OAt2+++W+SxDxtQS8q/kUyPKzY0VR1rEAoAi1OS/TR6deAVNsB4sfVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688497699; a=rsa-sha256; cv=none; b=S47/pDoOD9iCGe5/mCON2Z0jFyq3hqnj0tjd7t80eigLHcSykbCKh/btyLFqKiWQlYgD5u bJMwku6Xx0IEqJy7GO+GkJyHxhrDZtmscGdpYE5E8rXYXzsPfJ4MAm9HhKqr7O4K2sKnPq hQNp3m3sBfMa5K0mKpdM70y3Jr91J5UGQOs/UTo14me+UHssgYJI53FfxUPlmomtp/lxDp rmDAEIy3YBgHaHl3QPCnb2ZElbrzxDPkOhxXMI1UgpaNeZGKXGUMwijU4R9SZT5MZndo0B wiNj22f+ihPl3g6tA9FP2169MaH09H4eDdN+Zu0Q6RBXkNGb2x3AreWa2yjIeA== 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 4QwXPb589DzkZs; Tue, 4 Jul 2023 19:08:19 +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 364J8JCY080976; Tue, 4 Jul 2023 19:08:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 364J8Jai080975; Tue, 4 Jul 2023 19:08:19 GMT (envelope-from git) Date: Tue, 4 Jul 2023 19:08:19 GMT Message-Id: <202307041908.364J8Jai080975@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 0457eebbe83f - main - libcrypto: add missing symbols to the legacy provider List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0457eebbe83f951238387f6f720597f3165c3828 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0457eebbe83f951238387f6f720597f3165c3828 commit 0457eebbe83f951238387f6f720597f3165c3828 Author: Pierre Pronchery AuthorDate: 2023-06-29 21:32:59 +0000 Commit: Mark Johnston CommitDate: 2023-07-04 19:04:04 +0000 libcrypto: add missing symbols to the legacy provider OpenSSL 3 supports a modular architecture, allowing different providers to bring specific implementations of cryptographical algorithms. One such provider, "legacy", ships with OpenSSL 3 directly, and groups obsoleted algorithms that can still optionally be used anyway. The import of OpenSSL 3.0.9 was building this provider incorrectly, missing symbols required for proper operation. Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/787 --- secure/lib/libcrypto/modules/Makefile.inc | 3 ++- secure/lib/libcrypto/modules/legacy/Makefile | 34 +++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/secure/lib/libcrypto/modules/Makefile.inc b/secure/lib/libcrypto/modules/Makefile.inc index e2f8e9437953..9047c938ef1d 100644 --- a/secure/lib/libcrypto/modules/Makefile.inc +++ b/secure/lib/libcrypto/modules/Makefile.inc @@ -11,6 +11,7 @@ CFLAGS+= -I${LCRYPTO_SRC}/providers/implementations/include .include -.PATH: ${LCRYPTO_SRC}/providers +.PATH: ${LCRYPTO_SRC}/providers \ + ${LCRYPTO_SRC}/providers/common WARNS?= 0 diff --git a/secure/lib/libcrypto/modules/legacy/Makefile b/secure/lib/libcrypto/modules/legacy/Makefile index 3ed4bed6cd52..3eef2549d44f 100644 --- a/secure/lib/libcrypto/modules/legacy/Makefile +++ b/secure/lib/libcrypto/modules/legacy/Makefile @@ -2,6 +2,38 @@ SHLIB_NAME?= legacy.so -SRCS= legacyprov.c +SRCS= legacyprov.c prov_running.c + +# common +SRCS+= provider_err.c provider_ctx.c +SRCS+= provider_util.c + +# ciphers +SRCS+= ciphercommon.c ciphercommon_hw.c ciphercommon_block.c \ + ciphercommon_gcm.c ciphercommon_gcm_hw.c \ + ciphercommon_ccm.c ciphercommon_ccm_hw.c +SRCS+= cipher_desx.c cipher_desx_hw.c cipher_des.c cipher_des_hw.c +SRCS+= cipher_tdes_common.c +SRCS+= cipher_blowfish.c cipher_blowfish_hw.c +SRCS+= cipher_cast5.c cipher_cast5_hw.c +SRCS+= cipher_rc2.c cipher_rc2_hw.c +SRCS+= cipher_rc4.c cipher_rc4_hw.c +SRCS+= cipher_rc4_hmac_md5.c cipher_rc4_hmac_md5_hw.c +SRCS+= cipher_seed.c cipher_seed_hw.c + +# digests +SRCS+= digestcommon.c +SRCS+= md4_prov.c wp_prov.c ripemd_prov.c + +# kdfs +SRCS+= pbkdf1.c + +# ssl +SRCS+= record/tls_pad.c .include + +.PATH: ${LCRYPTO_SRC}/providers/implementations/ciphers \ + ${LCRYPTO_SRC}/providers/implementations/digests \ + ${LCRYPTO_SRC}/providers/implementations/kdfs \ + ${LCRYPTO_SRC}/ssl