tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: always call fido_init(); previous behaviour only called 

fido_init() when SK_DEBUG was defined. Harmless with current libfido2, but
this isn't guaranteed in the future.

OpenBSD-Commit-ID: c7ea20ff2bcd98dd12015d748d3672d4f01f0864
This commit is contained in:
djm@openbsd.org 2020-05-13 09:57:17 +00:00 committed by Damien Miller
parent f2d84f1b3f
commit 1e70dc3285
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sk-usbhid.c
View File

@ -57,6 +57,12 @@
/* #define SK_DEBUG 1 */ /* #define SK_DEBUG 1 */
#ifdef SK_DEBUG
#define SSH_FIDO_INIT_ARG FIDO_DEBUG
#else
#define SSH_FIDO_INIT_ARG 0
#endif
#define MAX_FIDO_DEVICES 256 #define MAX_FIDO_DEVICES 256
/* Compatibility with OpenSSH 1.0.x */ /* Compatibility with OpenSSH 1.0.x */
@ -459,9 +465,8 @@ sk_enroll(uint32_t alg, const uint8_t *challenge, size_t challenge_len,
int r; int r;
char *device = NULL; char *device = NULL;
#ifdef SK_DEBUG fido_init(SSH_FIDO_INIT_ARG);
fido_init(FIDO_DEBUG);
#endif
if (enroll_response == NULL) { if (enroll_response == NULL) {
skdebug(__func__, "enroll_response == NULL"); skdebug(__func__, "enroll_response == NULL");
goto out; goto out;
@ -749,9 +754,7 @@ sk_sign(uint32_t alg, const uint8_t *data, size_t datalen,
int ret = SSH_SK_ERR_GENERAL; int ret = SSH_SK_ERR_GENERAL;
int r; int r;
#ifdef SK_DEBUG fido_init(SSH_FIDO_INIT_ARG);
fido_init(FIDO_DEBUG);
#endif
if (sign_response == NULL) { if (sign_response == NULL) {
skdebug(__func__, "sign_response == NULL"); skdebug(__func__, "sign_response == NULL");
@ -995,6 +998,8 @@ sk_load_resident_keys(const char *pin, struct sk_option **options,
*rksp = NULL; *rksp = NULL;
*nrksp = 0; *nrksp = 0;
fido_init(SSH_FIDO_INIT_ARG);
if (check_sign_load_resident_options(options, &device) != 0) if (check_sign_load_resident_options(options, &device) != 0)
goto out; /* error already logged */ goto out; /* error already logged */
if (device != NULL) { if (device != NULL) {