[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.6 and 1.7

version 1.6, 2019/11/15 15:41:01 version 1.7, 2019/11/18 16:08:57
Line 21 
Line 21 
 #include <stddef.h>  #include <stddef.h>
 #include <stdarg.h>  #include <stdarg.h>
   
   #ifdef WITH_OPENSSL
 #include <openssl/opensslv.h>  #include <openssl/opensslv.h>
 #include <openssl/crypto.h>  #include <openssl/crypto.h>
 #include <openssl/bn.h>  #include <openssl/bn.h>
 #include <openssl/ec.h>  #include <openssl/ec.h>
 #include <openssl/ecdsa.h>  #include <openssl/ecdsa.h>
   #endif /* WITH_OPENSSL */
   
 #include <fido.h>  #include <fido.h>
   
Line 267 
Line 269 
         return dev;          return dev;
 }  }
   
   #ifdef WITH_OPENSSL
 /*  /*
  * The key returned via fido_cred_pubkey_ptr() is in affine coordinates,   * The key returned via fido_cred_pubkey_ptr() is in affine coordinates,
  * but the API expects a SEC1 octet string.   * but the API expects a SEC1 octet string.
Line 339 
Line 342 
         BN_clear_free(y);          BN_clear_free(y);
         return ret;          return ret;
 }  }
   #endif /* WITH_OPENSSL */
   
 static int  static int
 pack_public_key_ed25519(fido_cred_t *cred, struct sk_enroll_response *response)  pack_public_key_ed25519(fido_cred_t *cred, struct sk_enroll_response *response)
Line 375 
Line 379 
 pack_public_key(int alg, fido_cred_t *cred, struct sk_enroll_response *response)  pack_public_key(int alg, fido_cred_t *cred, struct sk_enroll_response *response)
 {  {
         switch(alg) {          switch(alg) {
   #ifdef WITH_OPENSSL
         case SK_ECDSA:          case SK_ECDSA:
                 return pack_public_key_ecdsa(cred, response);                  return pack_public_key_ecdsa(cred, response);
   #endif /* WITH_OPENSSL */
         case SK_ED25519:          case SK_ED25519:
                 return pack_public_key_ed25519(cred, response);                  return pack_public_key_ed25519(cred, response);
         default:          default:
Line 410 
Line 416 
         }          }
         *enroll_response = NULL;          *enroll_response = NULL;
         switch(alg) {          switch(alg) {
   #ifdef WITH_OPENSSL
         case SK_ECDSA:          case SK_ECDSA:
                 cose_alg = COSE_ES256;                  cose_alg = COSE_ES256;
                 break;                  break;
   #endif /* WITH_OPENSSL */
         case SK_ED25519:          case SK_ED25519:
                 cose_alg = COSE_EDDSA;                  cose_alg = COSE_EDDSA;
                 break;                  break;
Line 532 
Line 540 
         return ret;          return ret;
 }  }
   
   #ifdef WITH_OPENSSL
 static int  static int
 pack_sig_ecdsa(fido_assert_t *assert, struct sk_sign_response *response)  pack_sig_ecdsa(fido_assert_t *assert, struct sk_sign_response *response)
 {  {
Line 568 
Line 577 
         }          }
         return ret;          return ret;
 }  }
   #endif /* WITH_OPENSSL */
   
 static int  static int
 pack_sig_ed25519(fido_assert_t *assert, struct sk_sign_response *response)  pack_sig_ed25519(fido_assert_t *assert, struct sk_sign_response *response)
Line 601 
Line 611 
 pack_sig(int alg, fido_assert_t *assert, struct sk_sign_response *response)  pack_sig(int alg, fido_assert_t *assert, struct sk_sign_response *response)
 {  {
         switch(alg) {          switch(alg) {
   #ifdef WITH_OPENSSL
         case SK_ECDSA:          case SK_ECDSA:
                 return pack_sig_ecdsa(assert, response);                  return pack_sig_ecdsa(assert, response);
   #endif /* WITH_OPENSSL */
         case SK_ED25519:          case SK_ED25519:
                 return pack_sig_ed25519(assert, response);                  return pack_sig_ed25519(assert, response);
         default:          default:
Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7