WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ECC Key Reading 

Update wolfSSH_ReadKey_buffer() to handle P-384 and P-521 when reading a key from a buffer.
pull/288/head
John Safranek 2020-09-25 14:45:12 -07:00
parent 4dad28da55
commit a269b1e843
No known key found for this signature in database
GPG Key ID: 8CE817DE0D3CCB4A
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/ssh.c
View File

@ -1413,24 +1413,13 @@ int wolfSSH_ReadKey_buffer(const byte* in, word32 inSz, int format,
if (type != NULL && key != NULL) {
const char* name;
word32 typeSz;
byte nameId;
typeSz = (word32)WSTRLEN(type);
name = IdToName(ID_SSH_RSA);
if (WSTRNCMP(type, name, typeSz) == 0) {
*outType = (const byte*)name;
}
else {
name = IdToName(ID_ECDSA_SHA2_NISTP256);
if (WSTRNCMP(type, name, typeSz) == 0) {
*outType = (const byte*)name;
}
else {
name = IdToName(ID_UNKNOWN);
*outType = (const byte*)name;
typeSz = (word32)WSTRLEN(name);
}
}
nameId = NameToId(type, typeSz);
name = IdToName(nameId);
*outType = (const byte*)name;
*outTypeSz = typeSz;
ret = Base64_Decode((byte*)key, (word32)WSTRLEN(key), *out, outSz);
@ -1480,6 +1469,8 @@ int wolfSSH_ReadKey_buffer(const byte* in, word32 inSz, int format,
}
else {
#endif
byte curveId = ID_UNKNOWN;
/* Couldn't decode as RSA testKey. Try decoding as ECC testKey. */
scratch = 0;
if (wc_ecc_init_ex(&testKey.ecc, heap, INVALID_DEVID) != 0)
@ -1487,11 +1478,23 @@ int wolfSSH_ReadKey_buffer(const byte* in, word32 inSz, int format,
ret = wc_EccPrivateKeyDecode(in, &scratch,
&testKey.ecc, inSz);
switch (wc_ecc_get_curve_id(testKey.ecc.idx)) {
case ECC_SECP256R1:
curveId = ID_ECDSA_SHA2_NISTP256;
break;
case ECC_SECP384R1:
curveId = ID_ECDSA_SHA2_NISTP384;
break;
case ECC_SECP521R1:
curveId = ID_ECDSA_SHA2_NISTP521;
break;
}
wc_ecc_free(&testKey.ecc);
if (ret == 0) {
*outType = (const byte*)IdToName(ID_ECDH_SHA2_NISTP256);
*outType = (const byte*)IdToName(curveId);
*outTypeSz = (word32)WSTRLEN((const char*)*outType);
printf("%s\n", *outType);
}
else
return WS_BAD_FILE_E;