From: Matt Caswell <matt@openssl.org>
Date: Tue, 30 Jul 2019 17:36:53 +0000 (+0100)
Subject: Properly process the "Availablein" keyword for evp_test
X-Git-Tag: openssl-3.0.0-alpha1~1685
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8453096ebf5308ef766e5e0b9c5682018c915976;p=oweals%2Fopenssl.git

Properly process the "Availablein" keyword for evp_test

The "Availablein" keyword is supposed to indicate which providers are
required in evp_test in order for a particular test to pass. Unfortunately
this didn't work. If the provider was available then the test failed.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9492)
---

diff --git a/test/evp_test.c b/test/evp_test.c
index 5f2bcc623a..2ae2c023a2 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -3055,8 +3055,7 @@ top:
                 t->skip = 1;
                 return 0;
             }
-        }
-        if (strcmp(pp->key, "Result") == 0) {
+        } else if (strcmp(pp->key, "Result") == 0) {
             if (t->expected_err != NULL) {
                 TEST_info("Line %d: multiple result lines", t->s.curr);
                 return 0;