Convert testdsa to accessors for opaque DSA

ok inoguchi jsing

1 files changed, 90 insertions, 30 deletions

diff --git a/src/usr.bin/openssl/testdsa.h b/src/usr.bin/openssl/testdsa.h
index 1bbb09ca70..2845248806 100644
--- a/src/usr.bin/openssl/testdsa.h
+++ b/src/usr.bin/openssl/testdsa.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: testdsa.h,v 1.1 2014/08/26 17:47:25 jsing Exp $ */
+/* $OpenBSD: testdsa.h,v 1.2 2022/01/10 14:47:09 tb Exp $ */
 
 DSA *get_dsa512(void);
 DSA *get_dsa1024(void);
@@ -41,18 +41,38 @@ DSA *
 get_dsa512()
 {
         DSA *dsa;
+        BIGNUM *priv_key = NULL, *pub_key = NULL;
+        BIGNUM *p = NULL, *q = NULL, *g = NULL;
 
         if ((dsa = DSA_new()) == NULL)
-                return (NULL);
-        dsa->priv_key = BN_bin2bn(dsa512_priv, sizeof(dsa512_priv), NULL);
-        dsa->pub_key = BN_bin2bn(dsa512_pub, sizeof(dsa512_pub), NULL);
-        dsa->p = BN_bin2bn(dsa512_p, sizeof(dsa512_p), NULL);
-        dsa->q = BN_bin2bn(dsa512_q, sizeof(dsa512_q), NULL);
-        dsa->g = BN_bin2bn(dsa512_g, sizeof(dsa512_g), NULL);
-        if ((dsa->priv_key == NULL) || (dsa->pub_key == NULL) ||
-            (dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))
-                return (NULL);
-        return (dsa);
+                goto err;
+
+        priv_key = BN_bin2bn(dsa512_priv, sizeof(dsa512_priv), NULL);
+        pub_key = BN_bin2bn(dsa512_pub, sizeof(dsa512_pub), NULL);
+        if (priv_key == NULL || pub_key == NULL)
+                goto err;
+        if (!DSA_set0_key(dsa, pub_key, priv_key))
+                goto err;
+
+        p = BN_bin2bn(dsa512_p, sizeof(dsa512_p), NULL);
+        q = BN_bin2bn(dsa512_q, sizeof(dsa512_q), NULL);
+        g = BN_bin2bn(dsa512_g, sizeof(dsa512_g), NULL);
+        if (p == NULL || q == NULL || g == NULL)
+                goto err;
+        if (!DSA_set0_pqg(dsa, p, q, g))
+                goto err;
+
+        return dsa;
+
+ err:
+        DSA_free(dsa);
+        BN_free(priv_key);
+        BN_free(pub_key);
+        BN_free(p);
+        BN_free(q);
+        BN_free(g);
+
+        return NULL;
 }
 
 static unsigned char dsa1024_priv[] = {
@@ -107,18 +127,39 @@ DSA *
 get_dsa1024()
 {
         DSA *dsa;
+        BIGNUM *priv_key = NULL, *pub_key = NULL;
+        BIGNUM *p = NULL, *q = NULL, *g = NULL;
 
         if ((dsa = DSA_new()) == NULL)
-                return (NULL);
-        dsa->priv_key = BN_bin2bn(dsa1024_priv, sizeof(dsa1024_priv), NULL);
-        dsa->pub_key = BN_bin2bn(dsa1024_pub, sizeof(dsa1024_pub), NULL);
-        dsa->p = BN_bin2bn(dsa1024_p, sizeof(dsa1024_p), NULL);
-        dsa->q = BN_bin2bn(dsa1024_q, sizeof(dsa1024_q), NULL);
-        dsa->g = BN_bin2bn(dsa1024_g, sizeof(dsa1024_g), NULL);
-        if ((dsa->priv_key == NULL) || (dsa->pub_key == NULL) ||
-            (dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))
-                return (NULL);
-        return (dsa);
+                goto err;
+
+        priv_key = BN_bin2bn(dsa1024_priv, sizeof(dsa1024_priv), NULL);
+        pub_key = BN_bin2bn(dsa1024_pub, sizeof(dsa1024_pub), NULL);
+        if (priv_key == NULL || pub_key == NULL)
+                goto err;
+        if (!DSA_set0_key(dsa, pub_key, priv_key))
+                goto err;
+
+        p = BN_bin2bn(dsa1024_p, sizeof(dsa1024_p), NULL);
+        q = BN_bin2bn(dsa1024_q, sizeof(dsa1024_q), NULL);
+        g = BN_bin2bn(dsa1024_g, sizeof(dsa1024_g), NULL);
+        if (p == NULL || q == NULL || g == NULL)
+                goto err;
+
+        if (!DSA_set0_pqg(dsa, p, q, g))
+                goto err;
+
+        return dsa;
+
+ err:
+        DSA_free(dsa);
+        BN_free(priv_key);
+        BN_free(pub_key);
+        BN_free(p);
+        BN_free(q);
+        BN_free(g);
+
+        return NULL;
 }
 
 static unsigned char dsa2048_priv[] = {
@@ -206,16 +247,35 @@ DSA *
 get_dsa2048()
 {
         DSA *dsa;
+        BIGNUM *priv_key = NULL, *pub_key = NULL;
+        BIGNUM *p = NULL, *q = NULL, *g = NULL;
 
         if ((dsa = DSA_new()) == NULL)
                 return (NULL);
-        dsa->priv_key = BN_bin2bn(dsa2048_priv, sizeof(dsa2048_priv), NULL);
-        dsa->pub_key = BN_bin2bn(dsa2048_pub, sizeof(dsa2048_pub), NULL);
-        dsa->p = BN_bin2bn(dsa2048_p, sizeof(dsa2048_p), NULL);
-        dsa->q = BN_bin2bn(dsa2048_q, sizeof(dsa2048_q), NULL);
-        dsa->g = BN_bin2bn(dsa2048_g, sizeof(dsa2048_g), NULL);
-        if ((dsa->priv_key == NULL) || (dsa->pub_key == NULL) ||
-            (dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))
-                return (NULL);
-        return (dsa);
+        priv_key = BN_bin2bn(dsa2048_priv, sizeof(dsa2048_priv), NULL);
+        pub_key = BN_bin2bn(dsa2048_pub, sizeof(dsa2048_pub), NULL);
+        if (priv_key == NULL || pub_key == NULL)
+                goto err;
+        if (!DSA_set0_key(dsa, pub_key, priv_key))
+                goto err;
+
+        p = BN_bin2bn(dsa2048_p, sizeof(dsa2048_p), NULL);
+        q = BN_bin2bn(dsa2048_q, sizeof(dsa2048_q), NULL);
+        g = BN_bin2bn(dsa2048_g, sizeof(dsa2048_g), NULL);
+        if (p == NULL || q == NULL || g == NULL)
+                goto err;
+        if (!DSA_set0_pqg(dsa, p, q, g))
+                goto err;
+
+        return dsa;
+
+ err:
+        DSA_free(dsa);
+        BN_free(priv_key);
+        BN_free(pub_key);
+        BN_free(p);
+        BN_free(q);
+        BN_free(g);
+
+        return NULL;
 }