From: Richard Levitte <levitte@openssl.org>
Date: Wed, 1 Sep 2021 15:34:38 +0000 (+0200)
Subject: Adjust test/endecoder_test.c
X-Git-Tag: openssl-3.2.0-alpha1~3602
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=602bfb8b98125f6745cd40dbc5fce9614ae5e418;p=thirdparty%2Fopenssl.git

Adjust test/endecoder_test.c

The protected tests need to specify the structure EncryptedPrivateKeyInfo
rather than PrivateKeyInfo, since that's the outermost structure.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16466)
---

diff --git a/test/endecode_test.c b/test/endecode_test.c
index d28ea3c8124..1698867b408 100644
--- a/test/endecode_test.c
+++ b/test/endecode_test.c
@@ -703,7 +703,7 @@ static int test_protected_via_DER(const char *type, EVP_PKEY *key)
     return test_encode_decode(__FILE__, __LINE__, type, key,
                               OSSL_KEYMGMT_SELECT_KEYPAIR
                               | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
-                              "DER", "PrivateKeyInfo",
+                              "DER", "EncryptedPrivateKeyInfo",
                               pass, pass_cipher,
                               encode_EVP_PKEY_prov, decode_EVP_PKEY_prov,
                               test_mem, check_protected_PKCS8_DER,
@@ -726,7 +726,7 @@ static int test_protected_via_PEM(const char *type, EVP_PKEY *key)
     return test_encode_decode(__FILE__, __LINE__, type, key,
                               OSSL_KEYMGMT_SELECT_KEYPAIR
                               | OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS,
-                              "PEM", "PrivateKeyInfo",
+                              "PEM", "EncryptedPrivateKeyInfo",
                               pass, pass_cipher,
                               encode_EVP_PKEY_prov, decode_EVP_PKEY_prov,
                               test_text, check_protected_PKCS8_PEM,