[src/netbsd-9]: src/crypto/external/bsd/netpgp/lib/verify Pull up following r...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fa9ea87eb64e
branches:  netbsd-9
changeset: 963860:fa9ea87eb64e
user:      martin <martin%NetBSD.org@localhost>
date:      Mon May 04 14:03:12 2020 +0000

description:
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:

 crypto/external/bsd/netpgp/lib/verify/Makefile   |   4 +++-
 crypto/external/bsd/netpgp/lib/verify/verify.map |  17 +++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletions(-)

diffs (38 lines):

diff -r 718854d85e39 -r fa9ea87eb64e crypto/external/bsd/netpgp/lib/verify/Makefile
--- a/crypto/external/bsd/netpgp/lib/verify/Makefile    Mon May 04 13:58:17 2020 +0000
+++ b/crypto/external/bsd/netpgp/lib/verify/Makefile    Mon May 04 14:03:12 2020 +0000
@@ -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 @@
 .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 -r 718854d85e39 -r fa9ea87eb64e crypto/external/bsd/netpgp/lib/verify/verify.map
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/netpgp/lib/verify/verify.map  Mon May 04 14:03:12 2020 +0000
@@ -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: *;
+};