From: Tomas Mraz <tomas@openssl.org>
Date: Thu, 25 Feb 2021 14:08:16 +0000 (+0100)
Subject: evp_pkey_provided_test: Improve diagnostic output
X-Git-Tag: openssl-3.0.0-alpha13~153
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=d2ccfb9caa9f69d4980f8fe49a15a043c91b40c5;p=thirdparty%2Fopenssl.git

evp_pkey_provided_test: Improve diagnostic output

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14316)
---

diff --git a/test/evp_pkey_provided_test.c b/test/evp_pkey_provided_test.c
index fd0dcdd38a4..18b62d4645f 100644
--- a/test/evp_pkey_provided_test.c
+++ b/test/evp_pkey_provided_test.c
@@ -361,15 +361,16 @@ static int test_fromdata_rsa(void)
         || !TEST_false(EVP_PKEY_copy_parameters(copy_pk, pk)))
         goto err;
 
+    ret = test_print_key_using_pem("RSA", pk)
+          && test_print_key_using_encoder("RSA", pk);
+ err:
+    /* for better diagnostics always compare key params */
     for (i = 0; fromdata_params[i].key != NULL; ++i) {
         if (!TEST_true(BN_set_word(bn_from, key_numbers[i]))
             || !TEST_true(EVP_PKEY_get_bn_param(pk, fromdata_params[i].key, &bn))
             || !TEST_BN_eq(bn, bn_from))
-            goto err;
+            ret = 0;
     }
-    ret = test_print_key_using_pem("RSA", pk)
-          && test_print_key_using_encoder("RSA", pk);
- err:
     BN_free(bn_from);
     BN_free(bn);
     EVP_PKEY_free(pk);