Module Name: src
Committed By: christos
Date: Mon May 8 23:45:52 UTC 2023
Modified Files:
src/external/bsd/libfido2/bin/fido2-assert: Makefile
src/external/bsd/libfido2/bin/fido2-cred: Makefile
src/external/bsd/libfido2/bin/fido2-token: Makefile
src/external/bsd/libfido2/dist/src: assert.c cred.c
src/external/bsd/libfido2/lib: Makefile
Log Message:
Handle OpenSSL-3.x
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libfido2/bin/fido2-assert/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libfido2/bin/fido2-cred/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libfido2/bin/fido2-token/Makefile
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/libfido2/dist/src/assert.c \
src/external/bsd/libfido2/dist/src/cred.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/libfido2/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libfido2/bin/fido2-assert/Makefile
diff -u src/external/bsd/libfido2/bin/fido2-assert/Makefile:1.2 src/external/bsd/libfido2/bin/fido2-assert/Makefile:1.3
--- src/external/bsd/libfido2/bin/fido2-assert/Makefile:1.2 Wed Jun 16 21:15:44 2021
+++ src/external/bsd/libfido2/bin/fido2-assert/Makefile Mon May 8 19:45:52 2023
@@ -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>
Index: src/external/bsd/libfido2/bin/fido2-cred/Makefile
diff -u src/external/bsd/libfido2/bin/fido2-cred/Makefile:1.2 src/external/bsd/libfido2/bin/fido2-cred/Makefile:1.3
--- src/external/bsd/libfido2/bin/fido2-cred/Makefile:1.2 Wed Jun 16 21:15:44 2021
+++ src/external/bsd/libfido2/bin/fido2-cred/Makefile Mon May 8 19:45:52 2023
@@ -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>
Index: src/external/bsd/libfido2/bin/fido2-token/Makefile
diff -u src/external/bsd/libfido2/bin/fido2-token/Makefile:1.2 src/external/bsd/libfido2/bin/fido2-token/Makefile:1.3
--- src/external/bsd/libfido2/bin/fido2-token/Makefile:1.2 Wed Jun 16 21:15:44 2021
+++ src/external/bsd/libfido2/bin/fido2-token/Makefile Mon May 8 19:45:52 2023
@@ -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>
Index: src/external/bsd/libfido2/dist/src/assert.c
diff -u src/external/bsd/libfido2/dist/src/assert.c:1.1.1.4 src/external/bsd/libfido2/dist/src/assert.c:1.2
--- src/external/bsd/libfido2/dist/src/assert.c:1.1.1.4 Fri Sep 24 08:43:29 2021
+++ src/external/bsd/libfido2/dist/src/assert.c Mon May 8 19:45:52 2023
@@ -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;
}
Index: src/external/bsd/libfido2/dist/src/cred.c
diff -u src/external/bsd/libfido2/dist/src/cred.c:1.1.1.4 src/external/bsd/libfido2/dist/src/cred.c:1.2
--- src/external/bsd/libfido2/dist/src/cred.c:1.1.1.4 Fri Sep 24 08:43:29 2021
+++ src/external/bsd/libfido2/dist/src/cred.c Mon May 8 19:45:52 2023
@@ -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;
}
Index: src/external/bsd/libfido2/lib/Makefile
diff -u src/external/bsd/libfido2/lib/Makefile:1.8 src/external/bsd/libfido2/lib/Makefile:1.9
--- src/external/bsd/libfido2/lib/Makefile:1.8 Fri Sep 24 09:07:34 2021
+++ src/external/bsd/libfido2/lib/Makefile Mon May 8 19:45:52 2023
@@ -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>
