diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-05-07 10:56:52 +0300 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-05-14 13:17:13 +0300 |
| commit | d59b7a54a5332303c42c3d097db5764dc809ecc9 (patch) | |
| tree | b009bda1b6c9ae9567680f57045c349cb78bc9e6 | |
| parent | 106ec30bc74d5cd3086a3b959a11d73e46d7b9d8 (diff) | |
test/evp_pkey_provided_test.c: Display first, compare after
To make it easier to check the generated key manually, display it
before comparing diverse other serializations.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11710)
| -rw-r--r-- | test/evp_pkey_provided_test.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/test/evp_pkey_provided_test.c b/test/evp_pkey_provided_test.c index 2c07ed0282..c5ef7241db 100644 --- a/test/evp_pkey_provided_test.c +++ b/test/evp_pkey_provided_test.c @@ -130,7 +130,12 @@ static int test_print_key_using_pem(const char *alg, const EVP_PKEY *pk) if (!TEST_ptr(membio)) goto err; - if (!TEST_true(EVP_PKEY_print_private(membio, pk, 0, NULL)) + if (/* Output Encrypted private key in PEM form */ + !TEST_true(PEM_write_bio_PrivateKey(bio_out, pk, EVP_aes_256_cbc(), + (unsigned char *)"pass", 4, + NULL, NULL)) + /* Private key in text form */ + || !TEST_true(EVP_PKEY_print_private(membio, pk, 0, NULL)) || !TEST_true(compare_with_file(alg, PRIV_TEXT, membio)) /* Public key in PEM form */ || !TEST_true(PEM_write_bio_PUBKEY(membio, pk)) @@ -138,11 +143,7 @@ static int test_print_key_using_pem(const char *alg, const EVP_PKEY *pk) /* Unencrypted private key in PEM form */ || !TEST_true(PEM_write_bio_PrivateKey(membio, pk, NULL, NULL, 0, NULL, NULL)) - || !TEST_true(compare_with_file(alg, PRIV_PEM, membio)) - /* Encrypted private key in PEM form */ - || !TEST_true(PEM_write_bio_PrivateKey(bio_out, pk, EVP_aes_256_cbc(), - (unsigned char *)"pass", 4, - NULL, NULL))) + || !TEST_true(compare_with_file(alg, PRIV_PEM, membio))) goto err; ret = 1; |