Module Name: src
Committed By: christos
Date: Sun May 3 21:46:37 UTC 2020
Modified Files:
src/crypto/external/bsd/netpgp/lib/verify: Makefile
Added Files:
src/crypto/external/bsd/netpgp/lib/verify: verify.map
Log Message:
Add a linker map to hide all the symbols the this library accidentally
exported. In particular the following symbols:
DSA_SIG_free
DSA_SIG_new
DSA_do_sign
DSA_do_verify
DSA_free
DSA_new
DSA_size
RSA_check_key
RSA_free
RSA_generate_key
RSA_new
RSA_private_decrypt
RSA_private_encrypt
RSA_public_decrypt
RSA_public_encrypt
conflict with libcrypto and break pkg_add which links against both
libraries.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/netpgp/lib/verify/Makefile
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/netpgp/lib/verify/verify.map
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/lib/verify/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.12 src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.13
--- src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.12 Sun Oct 13 03:28:05 2019
+++ src/crypto/external/bsd/netpgp/lib/verify/Makefile Sun May 3 17:46:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/10/13 07:28:05 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2020/05/03 21:46:37 christos Exp $
LIB=netpgpverify
SRCS+=b64.c
@@ -30,4 +30,6 @@ INCSDIR=/usr/include/netpgp
COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-implicit-fallthrough :}
COPTS.libverify.c+= ${GCC_NO_FORMAT_TRUNCATION}
+LDFLAGS+=-Wl,--version-script=${.CURDIR}/verify.map
+
.include <bsd.lib.mk>
Added files:
Index: src/crypto/external/bsd/netpgp/lib/verify/verify.map
diff -u /dev/null src/crypto/external/bsd/netpgp/lib/verify/verify.map:1.1
--- /dev/null Sun May 3 17:46:37 2020
+++ src/crypto/external/bsd/netpgp/lib/verify/verify.map Sun May 3 17:46:37 2020
@@ -0,0 +1,17 @@
+NETPGPVERIFY_5_0 {
+ global:
+ pgpv_new;
+ pgpv_new_cursor;
+ pgpv_read_pubring;
+ pgpv_read_ssh_pubkeys;
+ pgpv_verify;
+ pgpv_get_verified;
+ pgpv_dump;
+ pgpv_get_entry;
+ pgpv_get_cursor_num;
+ pgpv_get_cursor_str;
+ pgpv_get_cursor_element;
+ pgpv_close;
+ pgpv_cursor_close;
+ local: *;
+};
