Fix ECDSA P521. Refs blinksh#872

page66688 · Dec 27, 2019 · fe4e4bb · fe4e4bb
1 parent aa1ca77
commit fe4e4bb
Showing 1 changed file with 22 additions and 1 deletion.
diff --git a/Settings/Model/BKPubKey.m b/Settings/Model/BKPubKey.m
@@ -43,6 +43,10 @@
 const NSString *BK_KEYTYPE_RSA = @"RSA";
 const NSString *BK_KEYTYPE_DSA = @"DSA";
 const NSString *BK_KEYTYPE_ECDSA = @"ECDSA";
+const NSString *BK_KEYTYPE_ECDSA_P256 = @"ECDSA P256";
+const NSString *BK_KEYTYPE_ECDSA_P384 = @"ECDSA P384";
+const NSString *BK_KEYTYPE_ECDSA_P521 = @"ECDSA P521";
+
 const NSString *BK_KEYTYPE_Ed25519 = @"Ed25519";
 
 struct blink_ssh_key_struct {
@@ -151,6 +155,7 @@ + (void)importPrivateKey:(NSString *)privateKey controller:(UIViewController *)c
 
     sshbuf_free(b);
     ssh_key skey = ssh_key_new();
+    int bits = 0;
     struct blink_ssh_key_struct *bkey = (struct blink_ssh_key_struct *)skey;
     bkey->flags = 0x0002 | 0x0001;
     bkey->dsa = keyp->dsa;
@@ -169,7 +174,17 @@ + (void)importPrivateKey:(NSString *)privateKey controller:(UIViewController *)c
         bkey->type_c = ssh_key_type_to_char(bkey->type);
         break;
       case KEY_ECDSA:
-        bkey->type = SSH_KEYTYPE_ECDSA;
+        bits = sshkey_curve_nid_to_bits(keyp->ecdsa_nid);
+        if (bits == 256) {
+          bkey->type = SSH_KEYTYPE_ECDSA_P256;
+        } else if (bits == 384) {
+          bkey->type = SSH_KEYTYPE_ECDSA_P384;
+        } else if (bits == 521) {
+          bkey->type = SSH_KEYTYPE_ECDSA_P521;
+        } else {
+          bkey->type = SSH_KEYTYPE_ECDSA;
+        }
+
         bkey->type_c = ssh_pki_key_ecdsa_name(skey);
         break;
       case KEY_ED25519:
@@ -217,6 +232,12 @@ - (const NSString *)keyTypeName {
       return BK_KEYTYPE_RSA;
     case SSH_KEYTYPE_ECDSA:
       return BK_KEYTYPE_ECDSA;
+    case SSH_KEYTYPE_ECDSA_P256:
+      return BK_KEYTYPE_ECDSA_P256;
+    case SSH_KEYTYPE_ECDSA_P384:
+      return BK_KEYTYPE_ECDSA_P384;
+    case SSH_KEYTYPE_ECDSA_P521:
+      return BK_KEYTYPE_ECDSA_P521;
     case SSH_KEYTYPE_ED25519:
       return BK_KEYTYPE_Ed25519;
     default: