git: 572948d00ddf - main - Revert "OpenSSL: use the upstream provided version.map files for the fips/legacy providers"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 21 Apr 2024 16:58:54 UTC
The branch main has been updated by ngie:
URL: https://cgit.FreeBSD.org/src/commit/?id=572948d00ddfea1dbd2cba9117b36fc3c47ca444
commit 572948d00ddfea1dbd2cba9117b36fc3c47ca444
Author: Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2024-04-21 16:55:01 +0000
Commit: Enji Cooper <ngie@FreeBSD.org>
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