tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 08:14:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

make key_lookup compatible with winhello

Browse Source
This commit is contained in:
Tess Gauthier 2022-10-18 14:04:50 -04:00
parent ca9f04bd94
commit 803e013b3b
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/win32/openssh/config.h.vs
View File

@ -151,6 +151,7 @@
#define HAVE_FIDO_DEV_GET_TOUCH_STATUS #define HAVE_FIDO_DEV_GET_TOUCH_STATUS
#define HAVE_FIDO_CRED_SET_CLIENTDATA #define HAVE_FIDO_CRED_SET_CLIENTDATA
#define HAVE_FIDO_ASSERT_SET_CLIENTDATA #define HAVE_FIDO_ASSERT_SET_CLIENTDATA
#define HAVE_FIDO_DEV_IS_WINHELLO
/* File names may not contain backslash characters */ /* File names may not contain backslash characters */
/* #undef FILESYSTEM_NO_BACKSLASH */ /* #undef FILESYSTEM_NO_BACKSLASH */
@ -1736,3 +1737,4 @@
#define HAVE_KILLPG 1 #define HAVE_KILLPG 1

16
sk-usbhid.c
View File

@ -780,7 +780,10 @@ static int
key_lookup(fido_dev_t *dev, const char *application, const uint8_t *user_id, key_lookup(fido_dev_t *dev, const char *application, const uint8_t *user_id,
size_t user_id_len, const char *pin) size_t user_id_len, const char *pin)
{ {
fido_assert_t *assert = NULL; #ifdef HAVE_FIDO_DEV_IS_WINHELLO
return FIDO_OK;
#else
fido_assert_t* assert = NULL;
uint8_t message[32]; uint8_t message[32];
int r = FIDO_ERR_INTERNAL; int r = FIDO_ERR_INTERNAL;
int sk_supports_uv, uv; int sk_supports_uv, uv;
@ -809,33 +812,32 @@ key_lookup(fido_dev_t *dev, const char *application, const uint8_t *user_id,
} }
uv = FIDO_OPT_OMIT; uv = FIDO_OPT_OMIT;
if (pin == NULL && check_sk_options(dev, "uv", &sk_supports_uv) == 0 && if (pin == NULL && check_sk_options(dev, "uv", &sk_supports_uv) == 0 &&
sk_supports_uv != -1) sk_supports_uv != -1)
uv = FIDO_OPT_TRUE; uv = FIDO_OPT_TRUE;
if ((r = fido_assert_set_uv(assert, uv)) != FIDO_OK) { if ((r = fido_assert_set_uv(assert, uv)) != FIDO_OK) {
skdebug(__func__, "fido_assert_set_uv: %s", fido_strerr(r)); skdebug(__func__, "fido_assert_set_uv: %s", fido_strerr(r));
goto out; goto out;
} }
#ifndef WINDOWS
if ((r = fido_dev_get_assert(dev, assert, pin)) != FIDO_OK) { if ((r = fido_dev_get_assert(dev, assert, pin)) != FIDO_OK) {
skdebug(__func__, "fido_dev_get_assert: %s", fido_strerr(r)); skdebug(__func__, "fido_dev_get_assert: %s", fido_strerr(r));
goto out; goto out;
} }
#endif
r = FIDO_ERR_NO_CREDENTIALS; r = FIDO_ERR_NO_CREDENTIALS;
skdebug(__func__, "%zu signatures returned", fido_assert_count(assert)); skdebug(__func__, "%zu signatures returned", fido_assert_count(assert));
for (i = 0; i < fido_assert_count(assert); i++) { for (i = 0; i < fido_assert_count(assert); i++) {
if (fido_assert_user_id_len(assert, i) == user_id_len && if (fido_assert_user_id_len(assert, i) == user_id_len &&
memcmp(fido_assert_user_id_ptr(assert, i), user_id, memcmp(fido_assert_user_id_ptr(assert, i), user_id,
user_id_len) == 0) { user_id_len) == 0) {
skdebug(__func__, "credential exists"); skdebug(__func__, "credential exists");
r = FIDO_OK; r = FIDO_OK;
goto out; goto out;
} }
} }
out: out:
fido_assert_free(&assert); fido_assert_free(&assert);
return r; return r;
#endif /* HAVE_FIDO_DEV_IS_WINHELLO */
} }
int int