summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2020-05-04 14:03:12 +0000
committermartin <martin@NetBSD.org>2020-05-04 14:03:12 +0000
commit3d8d1cc87a9ef737c3d160a3bab0475d85ae67cf (patch)
tree799315c20af09f8992e44a3de28d3a9dc645dc79 /crypto
parent80c0c12175995af4852030c4104caed777346e2d (diff)
Pull up following revision(s) (requested by christos in ticket #887):
crypto/external/bsd/netpgp/lib/verify/Makefile: revision 1.13 crypto/external/bsd/netpgp/lib/verify/verify.map: revision 1.1 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.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/external/bsd/netpgp/lib/verify/Makefile4
-rw-r--r--crypto/external/bsd/netpgp/lib/verify/verify.map17
2 files changed, 20 insertions, 1 deletions
diff --git a/crypto/external/bsd/netpgp/lib/verify/Makefile b/crypto/external/bsd/netpgp/lib/verify/Makefile
index 59012e8fa41..62b0e731d59 100644
--- a/crypto/external/bsd/netpgp/lib/verify/Makefile
+++ b/crypto/external/bsd/netpgp/lib/verify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/02/04 04:05:15 mrg Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2020/05/04 14:03:12 martin Exp $
LIB=netpgpverify
SRCS+=b64.c
@@ -30,5 +30,7 @@ INCSDIR=/usr/include/netpgp
.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
COPTS+= -Wno-error=implicit-fallthrough
.endif
+LDFLAGS+=-Wl,--version-script=${.CURDIR}/verify.map
+
.include <bsd.lib.mk>
diff --git a/crypto/external/bsd/netpgp/lib/verify/verify.map b/crypto/external/bsd/netpgp/lib/verify/verify.map
new file mode 100644
index 00000000000..8da95be0a01
--- /dev/null
+++ b/crypto/external/bsd/netpgp/lib/verify/verify.map
@@ -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: *;
+};