]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
DSA: fix the DSA parameter logic in test.
authorPauli <paul.dale@oracle.com>
Mon, 3 Feb 2020 01:41:31 +0000 (11:41 +1000)
committerPauli <paul.dale@oracle.com>
Tue, 11 Feb 2020 22:52:41 +0000 (08:52 +1000)
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10977)

test/evp_extra_test.c

index 024ef6ad171e778ab9e8e4384541552f581e73a5..5d3847e92f0bef4b10237baeb5b2572eb85e210f 100644 (file)
@@ -1263,11 +1263,14 @@ static int test_EVP_PKEY_CTX_get_set_params(void)
             || !TEST_ptr(p)
             || !TEST_ptr(q)
             || !TEST_ptr(g)
-            || !TEST_ptr(pub)
-            || !DSA_set0_pqg(dsa, p, q, g)
-        || !DSA_set0_key(dsa, pub, priv))
+            || !DSA_set0_pqg(dsa, p, q, g))
         goto err;
-    p = q = g = pub = priv = NULL;
+    p = q = g = NULL;
+    if (!TEST_ptr(pub)
+            || !TEST_ptr(priv)
+            || !DSA_set0_key(dsa, pub, priv))
+        goto err;
+    pub = priv = NULL;
 
     pkey = EVP_PKEY_new();
     if (!TEST_ptr(pkey)