From nobody Sat Sep 16 15:55:30 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 4Rnwcy5DqFz4tYck; Sat, 16 Sep 2023 15:55:30 +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 4Rnwcy4p7Yz4hdH; Sat, 16 Sep 2023 15:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694879730; 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=baICKY+foJtt6fyNZdgvbxO+8ENdjZrweWS86xekGQw=; b=nqjrV9G3GaUs+2KXKSW9Ms1tCyan/nhLFjmmcp/Pj/I7T0hj7WUiWjiymO56EYkGzZFvRc bUiRmQPS/gnGcPUTJQf2E9H4UgbJFupwDJ64f4IkFusO1DPzGCEnUK8dFdRud7k0wr6XxT pgvqDDNISHzHW0H8A2jv23EkfB5VSoXfgBtbM0chC6DlyU6Tb0VXylgTgOXuhsgMcdOt1P PbRYMfY2HwdnrBenQeqNpHXtjgJGaY0qH09TddD6ewlYnETwDvPK/dgLuNenXJijhq2B7P n8InmHcBRIOaUSPqUKOGGhVABzEFtDsWXpgPtdAp66+WtVzV7VkrqvrFWSc0yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694879730; a=rsa-sha256; cv=none; b=oUTv63+LS7RUDXugX9JoaaJ0h9kT8Emm6Z9cSiY7q8g1mF6BscBBJ5AZWW2hOZ05BlDNN6 9YcxQzm+7VseR98TBoH5ykQ9iDbw8myXJeFFOh3AGWOucsXU72PjAqcHbAiSWESmBNaAX1 0k6y85tnjvA1AYC38AnztKOjYqZA5vCOtz38xKFJttUN/thy4/o+oRxatZCBmLD+8olvm6 XNOga4hGrFLeD3nkdbK1Gal2Poh0P7ROsxTOumBcGv29Ee0kPk2cutk8JW1+D8H4bRXJPQ IpfhrkYHb2mzkx2YbduKkWdi/Nq0Uy3SvsaRI9JjlDfaJWCC+SZ8DK3efm8+vw== 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=1694879730; 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=baICKY+foJtt6fyNZdgvbxO+8ENdjZrweWS86xekGQw=; b=sWLurqGAcvQqYpuSl3EgFzNxwiwfA6h6eRUX/UCMB3bkvyZN+yaSpwB/VNdkT2jtixhjs/ isBptZOMx/nbHu9XggBkfkQnRA3qnZ4Aglf0l5lOAAf7tRYKkdsxJUjn9ptf7IQJHehdN/ yAw2QN6WHMee5s/s1LA7LLfOfBtBDGHIOgR0emlXXugnAdBRcSxN832j/wgcURZdg6KicB bBSHPxT/wSX65qsOrFfpxIk/mriCKUdCtqD77YI7qXt/lIzuYhoLAgCFi6iSdJyg227a6+ m2LOcZ0eCYj8V30MVPYkom2qC2siMjKfpZdunkuxnXxcGqbQjKvOsHSdny/+0g== 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 4Rnwcy3Dy2z1BsT; Sat, 16 Sep 2023 15:55:30 +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 38GFtUdQ064789; Sat, 16 Sep 2023 15:55:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38GFtUXj064786; Sat, 16 Sep 2023 15:55:30 GMT (envelope-from git) Date: Sat, 16 Sep 2023 15:55:30 GMT Message-Id: <202309161555.38GFtUXj064786@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: 1a18383a52bc - main - 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/main X-Git-Reftype: branch X-Git-Commit: 1a18383a52bc373e316d224cef1298debf6f7e25 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1a18383a52bc373e316d224cef1298debf6f7e25 commit 1a18383a52bc373e316d224cef1298debf6f7e25 Author: Pierre Pronchery AuthorDate: 2023-09-15 15:14:16 +0000 Commit: Ed Maste CommitDate: 2023-09-16 15:55:12 +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 --- 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 7c6981f0f890..7776b40a9801 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