coffee/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-10-28 18:07:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix pkcs8 unencrypted private key parsing with Attributes field

Browse Source 
Signed-off-by: Bhanu Prakash <35184675+BhanuPrakash-P@users.noreply.github.com>
Signed-off-by: Bhanu Prakash Pathi <bpathi@crestron.com>
This commit is contained in:
Bhanu Prakash 2024-07-25 13:25:12 +05:30 committed by Bhanu Prakash Pathi
parent 1ec69067fa
commit 4d7b40aacb
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
library/pkparse.c
View File

@ -1417,7 +1417,18 @@ static int pk_parse_key_pkcs8_unencrypted_der(
#endif /* MBEDTLS_PK_HAVE_ECC_KEYS */
return MBEDTLS_ERR_PK_UNKNOWN_PK_ALG;
end = p + len;
p = p+len;
if (p != end) {
/*
* Is 'attributes' present?
*/
if ((ret = mbedtls_asn1_get_tag(&p, end, &len,
MBEDTLS_ASN1_CONTEXT_SPECIFIC | MBEDTLS_ASN1_CONSTRUCTED |
0)) != 0) {
return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PK_KEY_INVALID_FORMAT, ret);
}
}
if (end != (key + keylen)) {
return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_PK_KEY_INVALID_FORMAT,
MBEDTLS_ERR_ASN1_LENGTH_MISMATCH);