? scp/obj
? sftp/obj
? sftp-server/obj
? ssh/obj
? ssh-add/obj
? ssh-agent/obj
? ssh-keygen/obj
? ssh-keyscan/obj
? ssh-keysign/obj
? ssh-pkcs11-helper/obj
? ssh-sk-helper/obj
? sshd/obj
Index: Makefile.inc
===================================================================
RCS file: /cvs/src/usr.bin/ssh/Makefile.inc,v
retrieving revision 1.84
diff -u -p -r1.84 Makefile.inc
--- Makefile.inc 3 Aug 2020 02:42:49 -0000 1.84
+++ Makefile.inc 27 Sep 2020 07:46:07 -0000
@@ -133,7 +133,7 @@ SRCS_MODULI+=
.endif
SRCS_SK= ssh-sk.c
-SRCS_SK+= sk-usbhid.c
+#SRCS_SK+= sk-usbhid.c
SRCS_SK_CLIENT= ssh-sk-client.c
SRCS_SK_CLIENT+= msg.c
Index: misc.c
===================================================================
RCS file: /cvs/src/usr.bin/ssh/misc.c,v
retrieving revision 1.153
diff -u -p -r1.153 misc.c
--- misc.c 26 Jun 2020 05:16:38 -0000 1.153
+++ misc.c 27 Sep 2020 07:46:07 -0000
@@ -1640,7 +1640,7 @@ static const struct {
{ "cs6", IPTOS_DSCP_CS6 },
{ "cs7", IPTOS_DSCP_CS7 },
{ "ef", IPTOS_DSCP_EF },
- { "le", IPTOS_DSCP_LE },
+ { "le", 0x01 },
{ "lowdelay", IPTOS_LOWDELAY },
{ "throughput", IPTOS_THROUGHPUT },
{ "reliability", IPTOS_RELIABILITY },
Index: ssh-sk.c
===================================================================
RCS file: /cvs/src/usr.bin/ssh/ssh-sk.c,v
retrieving revision 1.32
diff -u -p -r1.32 ssh-sk.c
--- ssh-sk.c 9 Sep 2020 03:08:02 -0000 1.32
+++ ssh-sk.c 27 Sep 2020 07:46:07 -0000
@@ -108,19 +108,7 @@ sshsk_open(const char *path)
}
/* Skip the rest if we're using the linked in middleware */
if (strcasecmp(ret->path, "internal") == 0) {
- ret->sk_enroll = ssh_sk_enroll;
- ret->sk_sign = ssh_sk_sign;
- ret->sk_load_resident_keys = ssh_sk_load_resident_keys;
- return ret;
- }
- if ((ret->dlhandle = dlopen(path, RTLD_NOW)) == NULL) {
- error("Provider \"%s\" dlopen failed: %s", path, dlerror());
- goto fail;
- }
- if ((ret->sk_api_version = dlsym(ret->dlhandle,
- "sk_api_version")) == NULL) {
- error("Provider \"%s\" dlsym(sk_api_version) failed: %s",
- path, dlerror());
+ error("Internal SK provider not available");
goto fail;
}
version = ret->sk_api_version();
Index: ssh-sk-helper/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/ssh/ssh-sk-helper/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- ssh-sk-helper/Makefile 13 Dec 2019 19:09:10 -0000 1.5
+++ ssh-sk-helper/Makefile 27 Sep 2020 07:46:07 -0000
@@ -13,8 +13,8 @@ MAN= ssh-sk-helper.8
.include <bsd.prog.mk>
-LDADD+= -lfido2 -lcbor -lusbhid
-DPADD+= ${LIBFIDO2} ${LIBCBOR} ${LIBUSBHID}
+#LDADD+= -lfido2 -lcbor -lusbhid
+#DPADD+= ${LIBFIDO2} ${LIBCBOR} ${LIBUSBHID}
LDADD+= -lcrypto -lutil
DPADD+= ${LIBCRYPTO} ${LIBUTIL}
