[src/trunk]: src/crypto/external/bsd/openssh Enable ssh-sk-helper

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

details:   https://anonhg.NetBSD.org/src/rev/81543f4e9baf
branches:  trunk
changeset: 969846:81543f4e9baf
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Mar 03 00:43:20 2020 +0000

description:
Enable ssh-sk-helper

diffstat:

 crypto/external/bsd/openssh/Makefile                       |  4 ++--
 crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (30 lines):

diff -r e6d0b1285490 -r 81543f4e9baf crypto/external/bsd/openssh/Makefile
--- a/crypto/external/bsd/openssh/Makefile      Tue Mar 03 00:42:33 2020 +0000
+++ b/crypto/external/bsd/openssh/Makefile      Tue Mar 03 00:43:20 2020 +0000
@@ -1,5 +1,5 @@
-#      $NetBSD: Makefile,v 1.2 2020/02/27 00:24:38 christos Exp $
+#      $NetBSD: Makefile,v 1.3 2020/03/03 00:43:20 christos Exp $
 
-SUBDIR=                lib .WAIT bin # libexec
+SUBDIR=                lib .WAIT bin libexec
 
 .include <bsd.subdir.mk>
diff -r e6d0b1285490 -r 81543f4e9baf crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile
--- a/crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile        Tue Mar 03 00:42:33 2020 +0000
+++ b/crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile        Tue Mar 03 00:43:20 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2020/02/27 00:24:41 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2020/03/03 00:43:20 christos Exp $
 
 BINDIR=        /usr/libexec
 
@@ -6,7 +6,7 @@
 SRCS=  ssh-sk-helper.c ssh-sk.c sk-usbhid.c
 MAN=   ssh-sk-helper.8
 
-LDADD+=-lfido2 -lusbhid
-DPADD+=${LIBFIDO2} ${LIBUSBHID}
+LDADD+=-lfido2 -lcbor -lusbhid
+DPADD+=${LIBFIDO2} ${LIBCBOR} ${LIBUSBHID}
 
 .include <bsd.prog.mk>