feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #7279 from SparkiDev/ssl_priv_load_fail

Browse Source 
SSL: Loading bad private key
This commit is contained in:
Daniel Pouzzner
2024-03-01 01:35:50 -05:00
committed by GitHub
parent 6500444b26 9addb3e45d
commit 03f9b210d7
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/ssl.c
View File

@ -6543,7 +6543,10 @@ static int ProcessBufferTryDecodeRsa(WOLFSSL_CTX* ctx, WOLFSSL* ssl,
"not enabled to try"); "not enabled to try");
ret = WOLFSSL_BAD_FILE; ret = WOLFSSL_BAD_FILE;
#else #else
ret = 0; /* continue trying other algorithms */ if (*keyFormat == 0) {
/* Format unknown so keep trying. */
ret = 0; /* continue trying other algorithms */
}
#endif #endif
} }
else { else {
@ -6616,7 +6619,10 @@ static int ProcessBufferTryDecodeRsa(WOLFSSL_CTX* ctx, WOLFSSL* ssl,
"not enabled to try"); "not enabled to try");
ret = WOLFSSL_BAD_FILE; ret = WOLFSSL_BAD_FILE;
#else #else
ret = 0; /* continue trying other algorithms */ if (*keyFormat == 0) {
/* Format unknown so keep trying. */
ret = 0; /* continue trying other algorithms */
}
#endif #endif
} }
else { else {
@ -6728,7 +6734,7 @@ static int ProcessBufferTryDecodeEcc(WOLFSSL_CTX* ctx, WOLFSSL* ssl,
*resetSuites = 1; *resetSuites = 1;
} }
} }
else { else if (*keyFormat == 0) {
ret = 0; /* continue trying other algorithms */ ret = 0; /* continue trying other algorithms */
} }
@ -6809,7 +6815,7 @@ static int ProcessBufferTryDecodeEd25519(WOLFSSL_CTX* ctx, WOLFSSL* ssl,
} }
} }
} }
else { else if (*keyFormat == 0) {
ret = 0; /* continue trying other algorithms */ ret = 0; /* continue trying other algorithms */
} }
@ -6887,6 +6893,9 @@ static int ProcessBufferTryDecodeEd448(WOLFSSL_CTX* ctx, WOLFSSL* ssl,
} }
} }
} }
else if (*keyFormat == 0) {
ret = 0; /* continue trying other algorithms */
}
wc_ed448_free(key); wc_ed448_free(key);
} }
@ -6991,6 +7000,10 @@ static int ProcessBufferTryDecodeFalcon(WOLFSSL_CTX* ctx, WOLFSSL* ssl,
*resetSuites = 1; *resetSuites = 1;
} }
} }
else if (*keyFormat == 0) {
ret = 0; /* continue trying other algorithms */
}
wc_falcon_free(key); wc_falcon_free(key);
} }
XFREE(key, heap, DYNAMIC_TYPE_FALCON); XFREE(key, heap, DYNAMIC_TYPE_FALCON);
@ -7105,6 +7118,10 @@ static int ProcessBufferTryDecodeDilithium(WOLFSSL_CTX* ctx, WOLFSSL* ssl,
*resetSuites = 1; *resetSuites = 1;
} }
} }
else if (*keyFormat == 0) {
ret = 0; /* continue trying other algorithms */
}
wc_dilithium_free(key); wc_dilithium_free(key);
} }
XFREE(key, heap, DYNAMIC_TYPE_DILITHIUM); XFREE(key, heap, DYNAMIC_TYPE_DILITHIUM);