[BACK]Return to sk-usbhid.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/sk-usbhid.c between version 1.41 and 1.42

version 1.41, 2022/07/20 03:31:42 version 1.42, 2022/08/17 06:01:57
Line 443 
Line 443 
   
 static struct sk_usbhid *  static struct sk_usbhid *
 sk_probe(const char *application, const uint8_t *key_handle,  sk_probe(const char *application, const uint8_t *key_handle,
     size_t key_handle_len)      size_t key_handle_len, int probe_resident)
 {  {
         struct sk_usbhid *sk;          struct sk_usbhid *sk;
         fido_dev_info_t *devlist;          fido_dev_info_t *devlist;
Line 751 
Line 751 
         if (device != NULL)          if (device != NULL)
                 sk = sk_open(device);                  sk = sk_open(device);
         else          else
                 sk = sk_probe(NULL, NULL, 0);                  sk = sk_probe(NULL, NULL, 0, 0);
         if (sk == NULL) {          if (sk == NULL) {
                 ret = SSH_SK_ERR_DEVICE_NOT_FOUND;                  ret = SSH_SK_ERR_DEVICE_NOT_FOUND;
                 skdebug(__func__, "failed to find sk");                  skdebug(__func__, "failed to find sk");
Line 1046 
Line 1046 
         if (device != NULL)          if (device != NULL)
                 sk = sk_open(device);                  sk = sk_open(device);
         else if (pin != NULL || (flags & SSH_SK_USER_VERIFICATION_REQD))          else if (pin != NULL || (flags & SSH_SK_USER_VERIFICATION_REQD))
                 sk = sk_probe(NULL, NULL, 0);                  sk = sk_probe(NULL, NULL, 0, 0);
         else          else
                 sk = sk_probe(application, key_handle, key_handle_len);                  sk = sk_probe(application, key_handle, key_handle_len, 0);
         if (sk == NULL) {          if (sk == NULL) {
                 ret = SSH_SK_ERR_DEVICE_NOT_FOUND;                  ret = SSH_SK_ERR_DEVICE_NOT_FOUND;
                 skdebug(__func__, "failed to find sk");                  skdebug(__func__, "failed to find sk");
Line 1312 
Line 1312 
         if (device != NULL)          if (device != NULL)
                 sk = sk_open(device);                  sk = sk_open(device);
         else          else
                 sk = sk_probe(NULL, NULL, 0);                  sk = sk_probe(NULL, NULL, 0, 1);
         if (sk == NULL) {          if (sk == NULL) {
                 ret = SSH_SK_ERR_DEVICE_NOT_FOUND;                  ret = SSH_SK_ERR_DEVICE_NOT_FOUND;
                 skdebug(__func__, "failed to find sk");                  skdebug(__func__, "failed to find sk");
Legend:
Removed from v.1.41  
changed lines
  Added in v.1.42