Module Name: src
Committed By: christos
Date: Fri Sep 24 13:07:34 UTC 2021
Modified Files:
src/external/bsd/libfido2/dist/tools: util.c
src/external/bsd/libfido2/lib: Makefile
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libfido2/dist/tools/util.c
cvs rdiff -u -r1.7 -r1.8 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/dist/tools/util.c
diff -u src/external/bsd/libfido2/dist/tools/util.c:1.2 src/external/bsd/libfido2/dist/tools/util.c:1.3
--- src/external/bsd/libfido2/dist/tools/util.c:1.2 Wed Jun 16 21:15:46 2021
+++ src/external/bsd/libfido2/dist/tools/util.c Fri Sep 24 09:07:34 2021
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018 Yubico AB. All rights reserved.
+ * Copyright (c) 2018-2021 Yubico AB. All rights reserved.
* Use of this source code is governed by a BSD-style
* license that can be found in the LICENSE file.
*/
@@ -576,6 +576,17 @@ plural(size_t x)
int
should_retry_with_pin(const fido_dev_t *dev, int r)
{
- return fido_dev_has_pin(dev) && (r == FIDO_ERR_PIN_REQUIRED ||
- r == FIDO_ERR_UV_INVALID || r == FIDO_ERR_UNAUTHORIZED_PERM);
+ if (fido_dev_has_pin(dev) == false) {
+ return 0;
+ }
+
+ switch (r) {
+ case FIDO_ERR_PIN_REQUIRED:
+ case FIDO_ERR_UNAUTHORIZED_PERM:
+ case FIDO_ERR_UV_BLOCKED:
+ case FIDO_ERR_UV_INVALID:
+ return 1;
+ }
+
+ return 0;
}
Index: src/external/bsd/libfido2/lib/Makefile
diff -u src/external/bsd/libfido2/lib/Makefile:1.7 src/external/bsd/libfido2/lib/Makefile:1.8
--- src/external/bsd/libfido2/lib/Makefile:1.7 Fri Jun 18 09:57:52 2021
+++ src/external/bsd/libfido2/lib/Makefile Fri Sep 24 09:07:34 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/06/18 13:57:52 christos Exp $
+# $NetBSD: Makefile,v 1.8 2021/09/24 13:07:34 christos Exp $
NOLINT=
.include <bsd.own.mk>
@@ -96,7 +96,7 @@ fido_init.3 \
fido_strerr.3 \
rs256_pk_new.3
-SHLIB_MAJOR=3
+SHLIB_MAJOR=4
SHLIB_MINOR=0
.SUFFIXES: .in
