From nobody Tue Sep 19 15:02:23 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 4RqlJJ1TYZz4v2Bb; Tue, 19 Sep 2023 15:02:24 +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 4RqlJJ0ysBz4fWj; Tue, 19 Sep 2023 15:02:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695135744; 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=WbbOMQCTZ5l5EkFMUX0QGq46ToYrozjm65UPFpeMypM=; b=AM/D514Dink754mYVEQcH0zPy88X0byUNOvq2u//gVig+LExVrKBB/CnwFllY/P7v5Uivo JlzZhCbUqkdVxRjKOhkB07ew61RFlyZHEyvbr9fvTNK4RakqirFVIfZBt3FXBxhTRmKmot NACcv+RFD9OpUJwslixyo3nwvQvxZfRLrfiijSIfCCZilBREA+gW0Y4y4Dz0WYy70hQUDG MPBc8Nm+gUlrlcuvP2iX9a/7BHOc5HuYV2tXtGg6YaOTRtg39sajkw6VkLWHjbW5Q6DJVs zqXTbmzCV/yM/MSXKSwr5vActWPXqG83vvHij8D1hFQgOkFyXr9iSYnTctR8AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695135744; a=rsa-sha256; cv=none; b=wLQTMl0xh6eZZL68VPRogVH73coKgNwIjEeMlIzNR4OAsA+wjJo68aiOr/dY6m6RFIwpTr zAVrsrMNlFlVWS0q/CpjyGYE0R2I54TcexVUWh04EdS5NpDzEqXNGTmcUd5SCE9+gTcTs+ GbCRfN75HPOvmpq/GjyDF67vGzZbtRRd9tRFs11afP7qf3hGZoDsQQgja+gX3DpSRGNn9p 9ZnRTZ7U2U/G9Rvh+7EuU9ynbW0Ohswf0v9/Va2XpCTJELtPAgfYSgx7kluts+0+k4U+kV bOcsP6mLnKsK2Oh+aOJXNikafUbTIdU6VvtIKl8Dj8sshvcMeH0ssQa67j/U2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695135744; 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=WbbOMQCTZ5l5EkFMUX0QGq46ToYrozjm65UPFpeMypM=; b=Y8g525oV/LXATLuJWI5fR8K4M8JL9lUzPAYOH+1gExsItdjrjINtCnlpe2wBhwF4io80S2 sVJg1m4mSKYsrbjv4at3LB8PJNNuk5R0WeLj1PJnRflTFflsRSnJPhztXSZeDc08jAQHb0 L8Y0ES4eQGGWkIQIbwWIu+kRCF7lc+LrpIAjEwpY08WqtlPvNX/1+1BT9xYJtpI0mSobJA 0eH/HP+a5n3dSgfas/rfSneg9VqvFbEqiGp/87JzE54rnuJ0ees1CBdTo+Mgf2DcTH6crL OhBtMiSyokbWLnbk2mhUNREmmD4H2YhNPN0+dE2mOjstLisy9arMIl92IsHs3A== 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 4RqlJH6rlBz3GQ; Tue, 19 Sep 2023 15:02:23 +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 38JF2N7q055791; Tue, 19 Sep 2023 15:02:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38JF2Nj0055788; Tue, 19 Sep 2023 15:02:23 GMT (envelope-from git) Date: Tue, 19 Sep 2023 15:02:23 GMT Message-Id: <202309191502.38JF2Nj0055788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: fd4b13acd90b - stable/14 - libcrypto: link engines and the legacy provider to libcrypto 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/stable/14 X-Git-Reftype: branch X-Git-Commit: fd4b13acd90bdc107a072660d91baa163474ebef Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fd4b13acd90bdc107a072660d91baa163474ebef commit fd4b13acd90bdc107a072660d91baa163474ebef Author: Pierre Pronchery AuthorDate: 2023-09-15 15:14:16 +0000 Commit: Ed Maste CommitDate: 2023-09-19 15:01:55 +0000 libcrypto: link engines and the legacy provider to libcrypto OpenSSL's legacy provider module and engines need to link to libcrypto.so, as it provides some of the actual implementations of legacy routines. This is a little tricky due to build order issues. Introduce a small hack (LIBCRYPTO_WITHOUT_SUBDIRS) that builds libcrypto.so in its usual early phase without any OpenSSL provider modules or engines. This is intended to restore the test suite; a future change should remove the hack and replace it with a better approach. PR: 254853, 273528 Discussed with: Folks at EuroBSDCon in Coimbra Sponsored by: The FreeBSD Foundation (cherry picked from commit 1a18383a52bc373e316d224cef1298debf6f7e25) --- Makefile.inc1 | 2 +- secure/lib/libcrypto/Makefile | 2 ++ secure/lib/libcrypto/engines/Makefile.inc | 2 ++ secure/lib/libcrypto/modules/legacy/Makefile | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index f740cc5abcca..45d034c0002c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2980,7 +2980,7 @@ libraries: .MAKE .PHONY ${_+_}cd ${.CURDIR}; \ ${MAKE} -f Makefile.inc1 _prereq_libs; \ ${MAKE} -f Makefile.inc1 _startup_libs; \ - ${MAKE} -f Makefile.inc1 _prebuild_libs; \ + ${MAKE} -f Makefile.inc1 _prebuild_libs -DLIBCRYPTO_WITHOUT_SUBDIRS; \ ${MAKE} -f Makefile.inc1 _generic_libs # diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 585e89861815..d8ae91bb3272 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -1,6 +1,8 @@ SHLIBDIR?= /lib +.if !defined(LIBCRYPTO_WITHOUT_SUBDIRS) SUBDIR= engines modules +.endif .include .include diff --git a/secure/lib/libcrypto/engines/Makefile.inc b/secure/lib/libcrypto/engines/Makefile.inc index 39b728ff722f..13d5f4849cbc 100644 --- a/secure/lib/libcrypto/engines/Makefile.inc +++ b/secure/lib/libcrypto/engines/Makefile.inc @@ -16,6 +16,8 @@ CFLAGS+= -DB_ENDIAN .endif CFLAGS+= -DNDEBUG +LIBADD= crypto + .PATH: ${LCRYPTO_SRC}/engines WARNS?= 0 diff --git a/secure/lib/libcrypto/modules/legacy/Makefile b/secure/lib/libcrypto/modules/legacy/Makefile index 913c0c41f5eb..a285d0b1148b 100644 --- a/secure/lib/libcrypto/modules/legacy/Makefile +++ b/secure/lib/libcrypto/modules/legacy/Makefile @@ -1,5 +1,6 @@ SHLIB_NAME?= legacy.so +LIBADD= crypto SRCS+= legacyprov.c prov_running.c