From 88d1ed7393b7ec42eb610d672f3e8e4e4ea89169 Mon Sep 17 00:00:00 2001 From: Colton Willey Date: Wed, 11 Sep 2024 15:55:05 -0700 Subject: [PATCH 1/2] Modify pkcs8 pbe encryption to use indefinite length encoding, making it consistent with both old ASN code and openssl --- wolfcrypt/src/asn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c index c9c30d0240..80ad853cbb 100644 --- a/wolfcrypt/src/asn.c +++ b/wolfcrypt/src/asn.c @@ -9156,7 +9156,7 @@ static const ASNItem p8EncPbes1ASN[] = { /* ENCALGO_PBEPARAM_SALT */ { 3, ASN_OCTET_STRING, 0, 0, 0 }, /* Iteration Count */ /* ENCALGO_PBEPARAM_ITER */ { 3, ASN_INTEGER, 0, 0, 0 }, -/* ENCDATA */ { 1, ASN_OCTET_STRING, 0, 0, 0 }, +/* ENCDATA */ { 1, ASN_INDEF_LENGTH, 0, 0, 0 }, }; enum { P8ENCPBES1ASN_IDX_SEQ = 0, From b0ddccc8026e4e6820500f9aa29c558fa2b8e83d Mon Sep 17 00:00:00 2001 From: Colton Willey Date: Thu, 12 Sep 2024 16:46:35 -0700 Subject: [PATCH 2/2] Change PKCS7 encrypted content encoding to use ASN_CONTEXT_SPECIFIC --- wolfcrypt/src/asn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c index 80ad853cbb..3d11a64755 100644 --- a/wolfcrypt/src/asn.c +++ b/wolfcrypt/src/asn.c @@ -9156,7 +9156,7 @@ static const ASNItem p8EncPbes1ASN[] = { /* ENCALGO_PBEPARAM_SALT */ { 3, ASN_OCTET_STRING, 0, 0, 0 }, /* Iteration Count */ /* ENCALGO_PBEPARAM_ITER */ { 3, ASN_INTEGER, 0, 0, 0 }, -/* ENCDATA */ { 1, ASN_INDEF_LENGTH, 0, 0, 0 }, +/* ENCDATA */ { 1, (ASN_CONTEXT_SPECIFIC | 0), 0, 0, 0 }, }; enum { P8ENCPBES1ASN_IDX_SEQ = 0,