[src/trunk]: src/external/bsd/libfido2/lib merge conflicts

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

details:   https://anonhg.NetBSD.org/src/rev/38afbdf0cb4b
branches:  trunk
changeset: 1023718:38afbdf0cb4b
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Sep 24 13:07:34 2021 +0000

description:
merge conflicts

diffstat:

 external/bsd/libfido2/dist/tools/util.c |  17 ++++++++++++++---
 external/bsd/libfido2/lib/Makefile      |   4 ++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r 6f747a1f64d1 -r 38afbdf0cb4b external/bsd/libfido2/dist/tools/util.c
--- a/external/bsd/libfido2/dist/tools/util.c   Fri Sep 24 12:51:20 2021 +0000
+++ b/external/bsd/libfido2/dist/tools/util.c   Fri Sep 24 13:07:34 2021 +0000
@@ -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 @@
 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;
 }
diff -r 6f747a1f64d1 -r 38afbdf0cb4b external/bsd/libfido2/lib/Makefile
--- a/external/bsd/libfido2/lib/Makefile        Fri Sep 24 12:51:20 2021 +0000
+++ b/external/bsd/libfido2/lib/Makefile        Fri Sep 24 13:07:34 2021 +0000
@@ -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_strerr.3 \
 rs256_pk_new.3
 
-SHLIB_MAJOR=3
+SHLIB_MAJOR=4
 SHLIB_MINOR=0
 
 .SUFFIXES: .in