From nobody Tue Sep 19 17:19:25 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 4RqpLP6jcPz4v9hR; Tue, 19 Sep 2023 17:19:25 +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 4RqpLP6J8hz3FHD; Tue, 19 Sep 2023 17:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695143965; 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=YHAXA7o+8cxZ2X0T8+cdYsTNnKaAzoucF362qDnLQis=; b=NO18NNTTUMKGoMpoGEHxbgROxSoqqb9eaqgRJWEPQMnwOSCn9+vfxywnSkrdOhfgHa7dZS T8L2EsPDkRMGjmjPNFvVnwx1N9ksC5yuaf4SZjMbv+EFZft4HC34t5oWEIYGLNSyG1THDw l1yDjQR91LSApHy0rrVeUM1zMYMvIrZXLwq+TfJZT3yNM795jMXAQkaY+SyCNgLacNVlWd dNAFqjgd7Zs0CtkDXsZMA9enxTN1jsllVMvgOkfnicBE4HL+gIVqkMyPrkwsq+nNJ1CKJa 42mfWXHbFVYyY+h+P62b0hsTIdzYW5jlpWYrto6aMUpybo2vaPupDSH8tJOerA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695143965; a=rsa-sha256; cv=none; b=kydj2e4EFinu1rvR70e3U9dPxNyJUTVIP9diHqPEc8wgXyDnsEmownh37YDlDOyRHyWOOd HRR7m/UwSbRrvZf1KMjyKtWqHIldIENRM12uUi2Tka3bjmEY28cBG+CJIvzGjakIh8JLZh fvYCdkAxo1EToKMRriCw5drrkK8Wm6dtE+xkurctuu4r0Orqxa445bb8HuvVJq48fYy1IQ +IM4ntnNGEBZG6I57LSzgFvdInfvK1+f3OhT3aYWIjMYms1SFMj2XC3Lx3sFys+2br+NaU rUrtGD+lbC6e/gL1eVn/+2C6RXuGtK5UAfVS1jDxtyVmeNL/uCYFxVXUtTxtmQ== 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=1695143965; 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=YHAXA7o+8cxZ2X0T8+cdYsTNnKaAzoucF362qDnLQis=; b=Q7Md19nJhMQjiJZ3lrf8itKMPuRy2xp+OkO/tHIbqU/tmoMkQJEt07lpyejq+0c+YAVi9p x56hKQmUYhghIl+H2+gCzuQHjez1f89jW2i5tMckpie6YaVNxPiqRBHLOZIj0PZ3gFXHdw vsh9BInishDvPPNNU2+YnOppCSrfSTtKyi8TwEQySatvUUWBHAeAKXzTHBZfhen6F9ZdBG 39VF0HR/sklgEMrWEBFfihcU997xoZwpYCzFSEUyIj+4Lu/SXUJ9cIeh9PqRuSTZmsuFQt 9Px/AYPWL8be2Rssdv7QBpyAa9HM2PATAYwGPdgp59Z+4zmBuNfhHkpV3ZJ1zg== 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 4RqpLP5FL5z6qM; Tue, 19 Sep 2023 17:19:25 +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 38JHJPHW075294; Tue, 19 Sep 2023 17:19:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38JHJP1i075291; Tue, 19 Sep 2023 17:19:25 GMT (envelope-from git) Date: Tue, 19 Sep 2023 17:19:25 GMT Message-Id: <202309191719.38JHJP1i075291@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: b7312b90289e - releng/14.0 - 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: b7312b90289e7244c124da9845c0a3011ba8d936 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b7312b90289e7244c124da9845c0a3011ba8d936 commit b7312b90289e7244c124da9845c0a3011ba8d936 Author: Pierre Pronchery AuthorDate: 2023-09-15 15:14:16 +0000 Commit: Ed Maste CommitDate: 2023-09-19 17:19:17 +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) (cherry picked from commit fd4b13acd90bdc107a072660d91baa163474ebef) Approved by: re (gjb) --- 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 f4bd4a3247f3..827dee41201d 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