wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 04:04:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5083 from SparkiDev/d2i_ecpriv_der

Browse Source 
d2i_ECPrivateKey() takes DER encoded data
This commit is contained in:
David Garske
2022-04-27 09:32:04 -07:00
committed by GitHub
parent 1d64c735ce f86f4a8ca0
commit 8bf228d346
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/ssl.c
View File

@@ -32594,6 +32594,7 @@ int wolfSSL_i2o_ECPublicKey(const WOLFSSL_EC_KEY *in, unsigned char **out)
WOLFSSL_EC_KEY *wolfSSL_d2i_ECPrivateKey(WOLFSSL_EC_KEY **key, const unsigned char **in, WOLFSSL_EC_KEY *wolfSSL_d2i_ECPrivateKey(WOLFSSL_EC_KEY **key, const unsigned char **in,
long len) long len)
{ {
word32 idx = 0;
WOLFSSL_EC_KEY *eckey = NULL; WOLFSSL_EC_KEY *eckey = NULL;
WOLFSSL_ENTER("wolfSSL_d2i_ECPrivateKey"); WOLFSSL_ENTER("wolfSSL_d2i_ECPrivateKey");
@@ -32607,9 +32608,9 @@ WOLFSSL_EC_KEY *wolfSSL_d2i_ECPrivateKey(WOLFSSL_EC_KEY **key, const unsigned ch
return NULL; return NULL;
} }
if (wc_ecc_import_private_key(*in, (word32)len, NULL, 0, if (wc_EccPrivateKeyDecode(*in, &idx, (ecc_key*)eckey->internal,
(ecc_key*)eckey->internal) != MP_OKAY) { (word32)len) != 0) {
WOLFSSL_MSG("wc_ecc_import_private_key error"); WOLFSSL_MSG("wc_EccPrivateKeyDecode error");
goto error; goto error;
} }
@@ -32634,7 +32635,7 @@ error:
int wolfSSL_i2d_ECPrivateKey(const WOLFSSL_EC_KEY *in, unsigned char **out) int wolfSSL_i2d_ECPrivateKey(const WOLFSSL_EC_KEY *in, unsigned char **out)
{ {
int len; word32 len;
byte* buf = NULL; byte* buf = NULL;
WOLFSSL_ENTER("wolfSSL_i2d_ECPrivateKey"); WOLFSSL_ENTER("wolfSSL_i2d_ECPrivateKey");
@@ -32643,13 +32644,14 @@ int wolfSSL_i2d_ECPrivateKey(const WOLFSSL_EC_KEY *in, unsigned char **out)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
if (!in->inSet && SetECKeyInternal((WOLFSSL_EC_KEY*)in) != WOLFSSL_SUCCESS) { if (!in->inSet && SetECKeyInternal(
(WOLFSSL_EC_KEY*)in) != WOLFSSL_SUCCESS) {
WOLFSSL_MSG("SetECKeyInternal error"); WOLFSSL_MSG("SetECKeyInternal error");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
if ((len = wc_ecc_size((ecc_key*)in->internal)) <= 0) { if ((len = wc_EccKeyDerSize((ecc_key*)in->internal, 0)) <= 0) {
WOLFSSL_MSG("wc_ecc_size error"); WOLFSSL_MSG("wc_EccKeyDerSize error");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@@ -32659,9 +32661,8 @@ int wolfSSL_i2d_ECPrivateKey(const WOLFSSL_EC_KEY *in, unsigned char **out)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
if (wc_ecc_export_private_only((ecc_key*)in->internal, buf, if (wc_EccPrivateKeyToDer((ecc_key*)in->internal, buf, len) < 0) {
(word32*)&len) != MP_OKAY) { WOLFSSL_MSG("wc_EccPrivateKeyToDer error");
WOLFSSL_MSG("wc_ecc_export_private_only error");
XFREE(buf, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(buf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@@ -32675,7 +32676,7 @@ int wolfSSL_i2d_ECPrivateKey(const WOLFSSL_EC_KEY *in, unsigned char **out)
} }
} }
return len; return (int)len;
} }
void wolfSSL_EC_KEY_set_conv_form(WOLFSSL_EC_KEY *eckey, char form) void wolfSSL_EC_KEY_set_conv_form(WOLFSSL_EC_KEY *eckey, char form)