From nobody Wed Jul 5 20:01:12 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 4Qx9X84XYNz4lFkb; Wed, 5 Jul 2023 20:01:12 +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 4Qx9X845mBz3QmY; Wed, 5 Jul 2023 20:01:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688587272; 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=zYf1gqSwSLz/FzpepEJkfxZ0OqcE5NLTVN6ta3iZoIM=; b=TTNI6YyVGwGGOKTu10y6q/gyIn9PJYQLFfzIJRdPRwToC4vHqHJssuBkhfcgu1kl0R7w3U SUZBBag8Nxt2Cr8niRJjzJ+OqUT/riSWMzCv6bYcDwQav1jLU8aKIMeg7TrZSPafxq9rJw nYgUyzaEXWzts4ugtmlrQaDgiIgPxU8OSKLUc5uGd4lOb24bJ/iVb7XHJiomI9SXUFrB41 jayssLLy149uSABwc3PUKwwVzDXj3lZlMdIgHYX5/pe4AChlNnX+5g6gttcRusKmgnxZae Uc2Q53V6gzIkQTtibWsT68ZcFJj1+cMGUzGFjImoSFC4U0U+hC/vl1fVfY70Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688587272; 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=zYf1gqSwSLz/FzpepEJkfxZ0OqcE5NLTVN6ta3iZoIM=; b=fKn9+rzdaWpNjLTf8D88ta/C7+ChTf1L9dpPjkZkEZt70oE20c/D7uD4XYDDvGCDvkqDXR 5CvCugvOHki3n7EtbVAS7keu8GVSVKjM4mZVGzupMcnE4YHmqgexbz7xqdl+1hPF8R/zX6 jTyPVLNtj8VgKE4ERyZnQ+BAwEJI3JM/7cculPCsBDMESdDGDRmcJcY3wReL8uCNaFkOZh YP3JWzc3AFn41+Vs6JWF9dIfP3/6N5/CONDgzAOSxxXwWUcpJUYX1zjVcUnbmmcvv82YUP +WGTMXHaQfBCMwytGTf1fNVD3+YdX7sHrlEDrlYWcu3I73V6SW8oOKGD4npW0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688587272; a=rsa-sha256; cv=none; b=awfEd0qUEi7AaH+KwEg7QypCLUw6RPOP2RTxhmmsI/52+rIpMpMCu0kBaM+PGPsvQJs/to 1uYeqM74KPj1DE7acUaOZUt0R60kuAVsnlv6BKiMtcL/iUrwldFRXyCAOZHllpvhh+/vwQ SrGe4E0/5P0BPL7G7LQ5ft2YueVbWVKjooxfIg7SI5fDlftkGfs4IB8pvHg3WXj4LdXHk0 bMYZ8VsqHiZ5aes8t9VTSjnArAhoyvFW7QoPOcIUR3giFIutOmuXEQh17EPI+4NAPZyoJ5 nDxuwENBExtgKauJz5etraAc55e+brm972SrWFLmP2F0qYRzYgYgEMaDIwNlCA== 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 4Qx9X837rYzRwv; Wed, 5 Jul 2023 20:01:12 +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 365K1CbI058596; Wed, 5 Jul 2023 20:01:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 365K1Cpf058595; Wed, 5 Jul 2023 20:01:12 GMT (envelope-from git) Date: Wed, 5 Jul 2023 20:01:12 GMT Message-Id: <202307052001.365K1Cpf058595@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: 87e08018b175 - main - libcrypto: add missing symbols to the legacy provider 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87e08018b175e564b6a19ee41bc65af66f55e078 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=87e08018b175e564b6a19ee41bc65af66f55e078 commit 87e08018b175e564b6a19ee41bc65af66f55e078 Author: Pierre Pronchery AuthorDate: 2023-06-29 21:32:59 +0000 Commit: Mark Johnston CommitDate: 2023-07-05 20:00:53 +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