wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 03:07:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

add parsing over optional PKCS8 attributes

Browse Source
This commit is contained in:
JacobBarthelmeh
2024-09-04 15:11:10 -06:00
parent 1c8767b4d3
commit 2a1165460e
4 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
certs/ca-key-pkcs8-attribute.der Normal file
View File

Binary file not shown.

1
certs/include.am
View File

@ -6,6 +6,7 @@ EXTRA_DIST += \
certs/ca-cert-chain.der \ certs/ca-cert-chain.der \
certs/ca-cert.pem \ certs/ca-cert.pem \
certs/ca-key.pem \ certs/ca-key.pem \
certs/ca-key-pkcs8-attribute.der \
certs/client-cert.pem \ certs/client-cert.pem \
certs/client-keyEnc.pem \ certs/client-keyEnc.pem \
certs/client-key.pem \ certs/client-key.pem \

11
tests/api.c
View File

@ -74549,6 +74549,7 @@ static int test_wc_GetPkcs8TraditionalOffset(void)
int derSz = 0; int derSz = 0;
word32 inOutIdx; word32 inOutIdx;
const char* path = "./certs/server-keyPkcs8.der"; const char* path = "./certs/server-keyPkcs8.der";
const char* pathAttributes = "./certs/ca-key-pkcs8-attribute.der";
XFILE file = XBADFILE; XFILE file = XBADFILE;
byte der[2048]; byte der[2048];
@ -74577,6 +74578,16 @@ static int test_wc_GetPkcs8TraditionalOffset(void)
inOutIdx = 0; inOutIdx = 0;
ExpectIntEQ(length = wc_GetPkcs8TraditionalOffset(der, &inOutIdx, (word32)derSz), ExpectIntEQ(length = wc_GetPkcs8TraditionalOffset(der, &inOutIdx, (word32)derSz),
WC_NO_ERR_TRACE(ASN_PARSE_E)); WC_NO_ERR_TRACE(ASN_PARSE_E));
/* test parsing with attributes */
ExpectTrue((file = XFOPEN(pathAttributes, "rb")) != XBADFILE);
ExpectIntGT(derSz = (int)XFREAD(der, 1, sizeof(der), file), 0);
if (file != XBADFILE)
XFCLOSE(file);
inOutIdx = 0;
ExpectIntGT(length = wc_GetPkcs8TraditionalOffset(der, &inOutIdx,
(word32)derSz), 0);
#endif /* NO_ASN */ #endif /* NO_ASN */
return EXPECT_RESULT(); return EXPECT_RESULT();
} }

5
wolfcrypt/src/asn.c
View File

@ -6882,8 +6882,9 @@ static const ASNItem pkcs8KeyASN[] = {
/* PKEY_ALGO_PARAM_SEQ */ { 2, ASN_SEQUENCE, 1, 0, 1 }, /* PKEY_ALGO_PARAM_SEQ */ { 2, ASN_SEQUENCE, 1, 0, 1 },
#endif #endif
/* PKEY_DATA */ { 1, ASN_OCTET_STRING, 0, 0, 0 }, /* PKEY_DATA */ { 1, ASN_OCTET_STRING, 0, 0, 0 },
/* attributes [0] Attributes OPTIONAL */ /* OPTIONAL Attributes IMPLICIT [0] */
/* [[2: publicKey [1] PublicKey OPTIONAL ]] */ { 1, ASN_CONTEXT_SPECIFIC | 0, 1, 0, 1 },
/* [[2: publicKey [1] PublicKey OPTIONAL ]] */
}; };
enum { enum {
PKCS8KEYASN_IDX_SEQ = 0, PKCS8KEYASN_IDX_SEQ = 0,