wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-01-27 06:52:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1331 from JacobBarthelmeh/Compatibility-Layer

Browse Source 
add comments and better error checking for PKCS8 strip
This commit is contained in:
toddouska
2018-02-02 10:50:29 -08:00
committed by GitHub
parent c66ebb6748 1428934ad5
commit d63373066b
3 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ssl.c
View File

@@ -7132,6 +7132,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_d2i_PrivateKey(int type, WOLFSSL_EVP_PKEY** out,
{
WOLFSSL_EVP_PKEY* local;
word32 idx = 0;
int ret;
WOLFSSL_ENTER("wolfSSL_d2i_PrivateKey");
@@ -7140,9 +7141,18 @@ WOLFSSL_EVP_PKEY* wolfSSL_d2i_PrivateKey(int type, WOLFSSL_EVP_PKEY** out,
return NULL;
}
if (ToTraditionalInline((const byte*)(*in), &idx, (word32)inSz) > 0) {
/* Check if input buffer has PKCS8 header. In the case that it does not
* have a PKCS8 header then do not error out. */
if ((ret = ToTraditionalInline((const byte*)(*in), &idx, (word32)inSz))
> 0) {
WOLFSSL_MSG("Found and removed PKCS8 header");
}
else {
if (ret != ASN_PARSE_E) {
WOLFSSL_MSG("Unexpected error with trying to remove PKCS8 header");
return NULL;
}
}
if (out != NULL && *out != NULL) {
wolfSSL_EVP_PKEY_free(*out);