[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.17 and 1.18

version 1.17, 2020/04/28 04:02:29 version 1.18, 2020/05/13 09:57:17
Line 51 
Line 51 
   
 /* #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 */
Line 453 
Line 459 
         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;
Line 743 
Line 748 
         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");
Line 988 
Line 991 
         char *device = NULL;          char *device = NULL;
         *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 */

Legend:
Removed from v.1.17  
changed lines
  Added in v.1.18