[src/trunk]: src/external/bsd/libfido2/lib Handle OpenSSL-3.x

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

details:   https://anonhg.NetBSD.org/src/rev/b1ef25e54b94
branches:  trunk
changeset: 374637:b1ef25e54b94
user:      christos <christos%NetBSD.org@localhost>
date:      Mon May 08 23:45:52 2023 +0000

description:
Handle OpenSSL-3.x

diffstat:

 external/bsd/libfido2/bin/fido2-assert/Makefile |  5 ++++-
 external/bsd/libfido2/bin/fido2-cred/Makefile   |  4 +++-
 external/bsd/libfido2/bin/fido2-token/Makefile  |  4 +++-
 external/bsd/libfido2/dist/src/assert.c         |  4 ++--
 external/bsd/libfido2/dist/src/cred.c           |  2 +-
 external/bsd/libfido2/lib/Makefile              |  9 ++++++++-
 6 files changed, 21 insertions(+), 7 deletions(-)

diffs (103 lines):

diff -r 614cceae1c60 -r b1ef25e54b94 external/bsd/libfido2/bin/fido2-assert/Makefile
--- a/external/bsd/libfido2/bin/fido2-assert/Makefile   Mon May 08 22:17:36 2023 +0000
+++ b/external/bsd/libfido2/bin/fido2-assert/Makefile   Mon May 08 23:45:52 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2021/06/17 01:15:44 christos Exp $
+#      $NetBSD: Makefile,v 1.3 2023/05/08 23:45:52 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -24,4 +24,7 @@ freezero.c \
 readpassphrase.c \
 recallocarray.c
 
+COPTS.assert_verify.c+=-Wno-error=deprecated-declarations
+COPTS.util.c+=-Wno-error=deprecated-declarations
+
 .include <bsd.prog.mk>
diff -r 614cceae1c60 -r b1ef25e54b94 external/bsd/libfido2/bin/fido2-cred/Makefile
--- a/external/bsd/libfido2/bin/fido2-cred/Makefile     Mon May 08 22:17:36 2023 +0000
+++ b/external/bsd/libfido2/bin/fido2-cred/Makefile     Mon May 08 23:45:52 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2021/06/17 01:15:44 christos Exp $
+#      $NetBSD: Makefile,v 1.3 2023/05/08 23:45:52 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -24,4 +24,6 @@ freezero.c \
 readpassphrase.c \
 recallocarray.c
 
+COPTS.util.c+=-Wno-error=deprecated-declarations
+
 .include <bsd.prog.mk>
diff -r 614cceae1c60 -r b1ef25e54b94 external/bsd/libfido2/bin/fido2-token/Makefile
--- a/external/bsd/libfido2/bin/fido2-token/Makefile    Mon May 08 22:17:36 2023 +0000
+++ b/external/bsd/libfido2/bin/fido2-token/Makefile    Mon May 08 23:45:52 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2021/06/17 01:15:44 christos Exp $
+#      $NetBSD: Makefile,v 1.3 2023/05/08 23:45:52 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -22,4 +22,6 @@ freezero.c \
 readpassphrase.c \
 recallocarray.c
 
+COPTS.util.c+=-Wno-error=deprecated-declarations
+
 .include <bsd.prog.mk>
diff -r 614cceae1c60 -r b1ef25e54b94 external/bsd/libfido2/dist/src/assert.c
--- a/external/bsd/libfido2/dist/src/assert.c   Mon May 08 22:17:36 2023 +0000
+++ b/external/bsd/libfido2/dist/src/assert.c   Mon May 08 23:45:52 2023 +0000
@@ -430,7 +430,7 @@ fido_verify_sig_es256(const fido_blob_t 
        }
 
        if ((pkey = es256_pk_to_EVP_PKEY(pk)) == NULL ||
-           (ec = EVP_PKEY_get0_EC_KEY(pkey)) == NULL) {
+           (ec = __UNCONST(EVP_PKEY_get0_EC_KEY(pkey))) == NULL) {
                fido_log_debug("%s: pk -> ec", __func__);
                goto fail;
        }
@@ -465,7 +465,7 @@ fido_verify_sig_rs256(const fido_blob_t 
        }
 
        if ((pkey = rs256_pk_to_EVP_PKEY(pk)) == NULL ||
-           (rsa = EVP_PKEY_get0_RSA(pkey)) == NULL) {
+           (rsa = __UNCONST(EVP_PKEY_get0_RSA(pkey))) == NULL) {
                fido_log_debug("%s: pk -> ec", __func__);
                goto fail;
        }
diff -r 614cceae1c60 -r b1ef25e54b94 external/bsd/libfido2/dist/src/cred.c
--- a/external/bsd/libfido2/dist/src/cred.c     Mon May 08 22:17:36 2023 +0000
+++ b/external/bsd/libfido2/dist/src/cred.c     Mon May 08 23:45:52 2023 +0000
@@ -266,7 +266,7 @@ verify_sig(const fido_blob_t *dgst, cons
        if ((rawcert = BIO_new_mem_buf(x5c->ptr, (int)x5c->len)) == NULL ||
            (cert = d2i_X509_bio(rawcert, NULL)) == NULL ||
            (pkey = X509_get_pubkey(cert)) == NULL ||
-           (ec = EVP_PKEY_get0_EC_KEY(pkey)) == NULL) {
+           (ec = __UNCONST(EVP_PKEY_get0_EC_KEY(pkey))) == NULL) {
                fido_log_debug("%s: x509 key", __func__);
                goto fail;
        }
diff -r 614cceae1c60 -r b1ef25e54b94 external/bsd/libfido2/lib/Makefile
--- a/external/bsd/libfido2/lib/Makefile        Mon May 08 22:17:36 2023 +0000
+++ b/external/bsd/libfido2/lib/Makefile        Mon May 08 23:45:52 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/09/24 13:07:34 christos Exp $
+# $NetBSD: Makefile,v 1.9 2023/05/08 23:45:52 christos Exp $
 
 NOLINT=
 .include <bsd.own.mk>
@@ -112,4 +112,11 @@ FILESDIR=/usr/lib/pkgconfig
 FILES+=libfido2.pc
 FILESBUILD_libfido2.pc=yes
 
+COPTS.assert.c+=-Wno-error=deprecated-declarations
+COPTS.cbor.c+=-Wno-error=deprecated-declarations
+COPTS.cred.c+=-Wno-error=deprecated-declarations
+COPTS.ecdh.c+=-Wno-error=deprecated-declarations
+COPTS.es256.c+=-Wno-error=deprecated-declarations
+COPTS.rs256.c+=-Wno-error=deprecated-declarations
+
 .include <bsd.lib.mk>