[src/trunk]: src/crypto/external/bsd/netpgp/lib/verify Add a linker map to hi...

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

details:   https://anonhg.NetBSD.org/src/rev/927bf078bf49
branches:  trunk
changeset: 932271:927bf078bf49
user:      christos <christos%NetBSD.org@localhost>
date:      Sun May 03 21:46:37 2020 +0000

description:
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 (37 lines):

diff -r 9ecd2f9dc358 -r 927bf078bf49 crypto/external/bsd/netpgp/lib/verify/Makefile
--- a/crypto/external/bsd/netpgp/lib/verify/Makefile    Sun May 03 21:02:24 2020 +0000
+++ b/crypto/external/bsd/netpgp/lib/verify/Makefile    Sun May 03 21:46:37 2020 +0000
@@ -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 @@
 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>
diff -r 9ecd2f9dc358 -r 927bf078bf49 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  Sun May 03 21:46:37 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: *;
+};