Skip to content

Commit b6c982f

Browse files
committed
sk-usbhid: move Windows-specific bits under #ifdef WINDOWS; requested by bagajjal@
1 parent 7606c43 commit b6c982f

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

sk-usbhid.c

+12
Original file line numberDiff line numberDiff line change
@@ -711,9 +711,14 @@ sk_enroll(uint32_t alg, const uint8_t *challenge, size_t challenge_len,
711711
if (device != NULL)
712712
sk = sk_open(device);
713713
else {
714+
#ifdef WINDOWS
714715
if ((sk = sk_open("windows://hello")) == NULL)
715716
sk = sk_probe(NULL, NULL, 0);
717+
#else
718+
sk = sk_probe(NULL, NULL, 0);
719+
#endif
716720
}
721+
717722
if (sk == NULL) {
718723
skdebug(__func__, "failed to find sk");
719724
goto out;
@@ -992,6 +997,7 @@ sk_sign(uint32_t alg, const uint8_t *data, size_t datalen,
992997
goto out; /* error already logged */
993998
if (device != NULL)
994999
sk = sk_open(device);
1000+
#ifdef WINDOWS
9951001
else {
9961002
if ((sk = sk_open("windows://hello")) == NULL) {
9971003
if (pin != NULL ||
@@ -1002,6 +1008,12 @@ sk_sign(uint32_t alg, const uint8_t *data, size_t datalen,
10021008
key_handle_len);
10031009
}
10041010
}
1011+
#else
1012+
else if (pin != NULL || (flags & SSH_SK_USER_VERIFICATION_REQD))
1013+
sk = sk_probe(NULL, NULL, 0);
1014+
else
1015+
sk = sk_probe(application, key_handle, key_handle_len);
1016+
#endif
10051017
if (sk == NULL) {
10061018
skdebug(__func__, "failed to find sk");
10071019
goto out;

0 commit comments

Comments
 (0)