From nobody Sun Apr 21 16:58:54 2024 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 4VMvjV50Slz5HKPY; Sun, 21 Apr 2024 16:58:54 +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 4VMvjV2hyTz4Ry1; Sun, 21 Apr 2024 16:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713718734; 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=NGcbN3uIlj5Dhxz4fkeFyIub5t4ktMRpXBZYBS4pxyo=; b=U/fWqGm9FNM5LCcbLRpeyqr+Jupg/7XyhajfdtUQGbd5o2R+YYj4fgg+Z14+OWXiUN91LS RjfmaKcf3MxEGxeLo6zMgkwMpq2exaJtdiLOibmZ5R2a/moaS0UF6nD+gJwjJTf+zhdl0X o6fMar5jdTReU/ZToJhZdq4fAjAJSoK4JpzY7iYp4hGoBSO9Gi0PLElRrA7o891ragPZf5 8hWEK+c4T0Yk8wQn9ulD03FPAlmte4n57IvWKyA3BiwXrHwmO6zWC1Q+mp4PNvpsypq7Lf bDSHaqLRavt3FxjtYHohw6vdzlSMEbYArsQsWAu8CcvA/NzGISBggbE4uKFyiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713718734; a=rsa-sha256; cv=none; b=L9zOUDm5vi5xvJHfDU2fGJEY2rjsMI1goCdQCm4iNlrC+EzrvYbFA2HynOfsWhQzq77HSx 9II7iM048kAk02q1+4HCTZNaJAl/VYbfWJE6gg5KyOFTl0mmKp7S/qT4E0k+sdRVpJxeM5 2a5Ig3FeEVQZcv1MCZal7NeJAKdvAd7FCdB29n71UD1z0+qwIj9suAfUB19R+SVXFJevYd z61YM045Wk1lrg64kMTeajBYv2SUBemk+WBY0iuIUzHuYyAb6NeYW8V5ghk1yMvsbr3eCM cF8WKjQpy+SPSKNhT5GywBEulQBPOrvQ2qU9K0D5u8QHQP7+kW52eeyku7yLiQ== 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=1713718734; 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=NGcbN3uIlj5Dhxz4fkeFyIub5t4ktMRpXBZYBS4pxyo=; b=SMzEgierGv0Y4iTl+giOSnIvMmBcidjwUZ0sht6zKUpJ5R7+WRfDvw6D53S+xAL6rPDn1H emI1dN54Q5pnFRqs0QKziqs0cRfLUGcpDGx3LXJd82wAnEEl9dozPr7cZgvzc/WLrjggRw 1JhLughbJzxZ/5l5S8in2mwzFgIjsUtQJY7/K+uy1SXnRtj9n4mTPQn2vMq4r2YxglOghn p3nN6mUClOHzcYXfiye78ibrJ7VgjOxCGSrsHyE4EHbcvaLJJbX4ZY4Km6YQeRLClaQCmV X49f9FQWYrMIBuR5HM67EARs3F+ckl/EXhGmvspghZloM71tqIa1xhyahQ2OCw== 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 4VMvjV2JFsz1SBc; Sun, 21 Apr 2024 16:58:54 +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 43LGwssM006928; Sun, 21 Apr 2024 16:58:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43LGwsNG006925; Sun, 21 Apr 2024 16:58:54 GMT (envelope-from git) Date: Sun, 21 Apr 2024 16:58:54 GMT Message-Id: <202404211658.43LGwsNG006925@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 572948d00ddf - main - Revert "OpenSSL: use the upstream provided version.map files for the fips/legacy providers" 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 572948d00ddfea1dbd2cba9117b36fc3c47ca444 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=572948d00ddfea1dbd2cba9117b36fc3c47ca444 commit 572948d00ddfea1dbd2cba9117b36fc3c47ca444 Author: Enji Cooper AuthorDate: 2024-04-21 16:55:01 +0000 Commit: Enji Cooper CommitDate: 2024-04-21 16:58:31 +0000 Revert "OpenSSL: use the upstream provided version.map files for the fips/legacy providers" This change is still under review and should not have been merged directly to main (yet). This is a case and point for using `push.default` to nothing instead of matching or simple. This reverts commit 42ce242e353065dfbaa248955f6657005a395a95. --- crypto/openssl/providers/fips.ld | 5 ----- crypto/openssl/providers/legacy.ld | 5 ----- secure/lib/libcrypto/modules/fips/Makefile | 2 -- secure/lib/libcrypto/modules/legacy/Makefile | 2 -- 4 files changed, 14 deletions(-) diff --git a/crypto/openssl/providers/fips.ld b/crypto/openssl/providers/fips.ld deleted file mode 100644 index 1debaaa7ff65..000000000000 --- a/crypto/openssl/providers/fips.ld +++ /dev/null @@ -1,5 +0,0 @@ -{ - global: - OSSL_provider_init; - local: *; -}; diff --git a/crypto/openssl/providers/legacy.ld b/crypto/openssl/providers/legacy.ld deleted file mode 100644 index 1debaaa7ff65..000000000000 --- a/crypto/openssl/providers/legacy.ld +++ /dev/null @@ -1,5 +0,0 @@ -{ - global: - OSSL_provider_init; - local: *; -}; diff --git a/secure/lib/libcrypto/modules/fips/Makefile b/secure/lib/libcrypto/modules/fips/Makefile index ceaa57ab066e..8843cb9717c9 100644 --- a/secure/lib/libcrypto/modules/fips/Makefile +++ b/secure/lib/libcrypto/modules/fips/Makefile @@ -1,8 +1,6 @@ SHLIB_NAME?= fips.so -VERSION_MAP= ${SRCTOP}/crypto/openssl/providers/fips.ld - CFLAGS+= -DFIPS_MODULE SRCS+= fips_entry.c fipsprov.c self_test.c self_test_kats.c diff --git a/secure/lib/libcrypto/modules/legacy/Makefile b/secure/lib/libcrypto/modules/legacy/Makefile index e435c5aa2c41..a285d0b1148b 100644 --- a/secure/lib/libcrypto/modules/legacy/Makefile +++ b/secure/lib/libcrypto/modules/legacy/Makefile @@ -2,8 +2,6 @@ SHLIB_NAME?= legacy.so LIBADD= crypto -VERSION_MAP= ${SRCTOP}/crypto/openssl/providers/legacy.ld - SRCS+= legacyprov.c prov_running.c # ciphers