dsatest: make this work with opaque BN. Some more fixes will be needed

for opaque DSA. I'll deal with that later. I also lobbed a KNF grenade
in here.

1 files changed, 124 insertions, 114 deletions

diff --git a/src/regress/lib/libcrypto/dsa/dsatest.c b/src/regress/lib/libcrypto/dsa/dsatest.c
index dd3e3166f7..004bd3c33e 100644
--- a/src/regress/lib/libcrypto/dsa/dsatest.c
+++ b/src/regress/lib/libcrypto/dsa/dsatest.c
@@ -1,25 +1,25 @@
-/*      $OpenBSD: dsatest.c,v 1.5 2018/07/17 17:06:49 tb Exp $  */
+/*      $OpenBSD: dsatest.c,v 1.6 2021/11/18 15:11:17 tb Exp $  */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -62,6 +62,7 @@
 #undef OPENSSL_NO_DEPRECATED
 #endif
 
+#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -79,146 +80,155 @@ static int dsa_cb(int p, int n, BN_GENCB *arg);
 
 /* seed, out_p, out_q, out_g are taken from the updated Appendix 5 to
  * FIPS PUB 186 and also appear in Appendix 5 to FIPS PIB 186-1 */
-static unsigned char seed[20]={
-        0xd5,0x01,0x4e,0x4b,0x60,0xef,0x2b,0xa8,0xb6,0x21,0x1b,0x40,
-        0x62,0xba,0x32,0x24,0xe0,0x42,0x7d,0xd3,
-        };
-
-static unsigned char out_p[]={
-        0x8d,0xf2,0xa4,0x94,0x49,0x22,0x76,0xaa,
-        0x3d,0x25,0x75,0x9b,0xb0,0x68,0x69,0xcb,
-        0xea,0xc0,0xd8,0x3a,0xfb,0x8d,0x0c,0xf7,
-        0xcb,0xb8,0x32,0x4f,0x0d,0x78,0x82,0xe5,
-        0xd0,0x76,0x2f,0xc5,0xb7,0x21,0x0e,0xaf,
-        0xc2,0xe9,0xad,0xac,0x32,0xab,0x7a,0xac,
-        0x49,0x69,0x3d,0xfb,0xf8,0x37,0x24,0xc2,
-        0xec,0x07,0x36,0xee,0x31,0xc8,0x02,0x91,
-        };
-
-static unsigned char out_q[]={
-        0xc7,0x73,0x21,0x8c,0x73,0x7e,0xc8,0xee,
-        0x99,0x3b,0x4f,0x2d,0xed,0x30,0xf4,0x8e,
-        0xda,0xce,0x91,0x5f,
-        };
-
-static unsigned char out_g[]={
-        0x62,0x6d,0x02,0x78,0x39,0xea,0x0a,0x13,
-        0x41,0x31,0x63,0xa5,0x5b,0x4c,0xb5,0x00,
-        0x29,0x9d,0x55,0x22,0x95,0x6c,0xef,0xcb,
-        0x3b,0xff,0x10,0xf3,0x99,0xce,0x2c,0x2e,
-        0x71,0xcb,0x9d,0xe5,0xfa,0x24,0xba,0xbf,
-        0x58,0xe5,0xb7,0x95,0x21,0x92,0x5c,0x9c,
-        0xc4,0x2e,0x9f,0x6f,0x46,0x4b,0x08,0x8c,
-        0xc5,0x72,0xaf,0x53,0xe6,0xd7,0x88,0x02,
-        };
-
-static const unsigned char str1[]="12345678901234567890";
-
-static BIO *bio_err=NULL;
-
-int main(int argc, char **argv)
-        {
-        BN_GENCB cb;
-        DSA *dsa=NULL;
-        int counter,ret=0,i,j;
+static unsigned char seed[20] = {
+        0xd5, 0x01, 0x4e, 0x4b, 0x60, 0xef, 0x2b, 0xa8, 0xb6, 0x21, 0x1b, 0x40,
+        0x62, 0xba, 0x32, 0x24, 0xe0, 0x42, 0x7d, 0xd3,
+};
+
+static unsigned char out_p[] = {
+        0x8d, 0xf2, 0xa4, 0x94, 0x49, 0x22, 0x76, 0xaa,
+        0x3d, 0x25, 0x75, 0x9b, 0xb0, 0x68, 0x69, 0xcb,
+        0xea, 0xc0, 0xd8, 0x3a, 0xfb, 0x8d, 0x0c, 0xf7,
+        0xcb, 0xb8, 0x32, 0x4f, 0x0d, 0x78, 0x82, 0xe5,
+        0xd0, 0x76, 0x2f, 0xc5, 0xb7, 0x21, 0x0e, 0xaf,
+        0xc2, 0xe9, 0xad, 0xac, 0x32, 0xab, 0x7a, 0xac,
+        0x49, 0x69, 0x3d, 0xfb, 0xf8, 0x37, 0x24, 0xc2,
+        0xec, 0x07, 0x36, 0xee, 0x31, 0xc8, 0x02, 0x91,
+};
+
+static unsigned char out_q[] = {
+        0xc7, 0x73, 0x21, 0x8c, 0x73, 0x7e, 0xc8, 0xee,
+        0x99, 0x3b, 0x4f, 0x2d, 0xed, 0x30, 0xf4, 0x8e,
+        0xda, 0xce, 0x91, 0x5f,
+};
+
+static unsigned char out_g[] = {
+        0x62, 0x6d, 0x02, 0x78, 0x39, 0xea, 0x0a, 0x13,
+        0x41, 0x31, 0x63, 0xa5, 0x5b, 0x4c, 0xb5, 0x00,
+        0x29, 0x9d, 0x55, 0x22, 0x95, 0x6c, 0xef, 0xcb,
+        0x3b, 0xff, 0x10, 0xf3, 0x99, 0xce, 0x2c, 0x2e,
+        0x71, 0xcb, 0x9d, 0xe5, 0xfa, 0x24, 0xba, 0xbf,
+        0x58, 0xe5, 0xb7, 0x95, 0x21, 0x92, 0x5c, 0x9c,
+        0xc4, 0x2e, 0x9f, 0x6f, 0x46, 0x4b, 0x08, 0x8c,
+        0xc5, 0x72, 0xaf, 0x53, 0xe6, 0xd7, 0x88, 0x02,
+};
+
+static const unsigned char str1[] = "12345678901234567890";
+
+static BIO *bio_err = NULL;
+
+int
+main(int argc, char **argv)
+{
+        BN_GENCB *cb;
+        DSA *dsa = NULL;
+        int counter, i, j;
         unsigned char buf[256];
         unsigned long h;
         unsigned char sig[256];
         unsigned int siglen;
+        int ret = 0;
 
         if (bio_err == NULL)
-                bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
+                bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
         ERR_load_crypto_strings();
 
-        BIO_printf(bio_err,"test generation of DSA parameters\n");
+        BIO_printf(bio_err, "test generation of DSA parameters\n");
 
-        BN_GENCB_set(&cb, dsa_cb, bio_err);
-        if(((dsa = DSA_new()) == NULL) || !DSA_generate_parameters_ex(dsa, 512,
-                                seed, 20, &counter, &h, &cb))
+        if ((cb = BN_GENCB_new()) == NULL)
                 goto end;
 
-        BIO_printf(bio_err,"seed\n");
-        for (i=0; i<20; i+=4)
-                {
-                BIO_printf(bio_err,"%02X%02X%02X%02X ",
-                        seed[i],seed[i+1],seed[i+2],seed[i+3]);
-                }
-        BIO_printf(bio_err,"\ncounter=%d h=%ld\n",counter,h);
-                
-        DSA_print(bio_err,dsa,0);
-        if (counter != 105) 
-                {
-                BIO_printf(bio_err,"counter should be 105\n");
+        BN_GENCB_set(cb, dsa_cb, bio_err);
+        if ((dsa = DSA_new()) == NULL)
                 goto end;
-                }
-        if (h != 2)
-                {
-                BIO_printf(bio_err,"h should be 2\n");
+
+        if (!DSA_generate_parameters_ex(dsa, 512, seed, 20, &counter, &h, cb))
                 goto end;
-                }
 
-        i=BN_bn2bin(dsa->q,buf);
-        j=sizeof(out_q);
-        if ((i != j) || (memcmp(buf,out_q,i) != 0))
-                {
-                BIO_printf(bio_err,"q value is wrong\n");
+        BIO_printf(bio_err, "seed\n");
+        for (i = 0; i < 20; i += 4) {
+                BIO_printf(bio_err, "%02X%02X%02X%02X ",
+                        seed[i], seed[i + 1], seed[i + 2], seed[i + 3]);
+        }
+        BIO_printf(bio_err, "\ncounter=%d h=%ld\n", counter, h);
+
+        DSA_print(bio_err, dsa, 0);
+        if (counter != 105) {
+                BIO_printf(bio_err, "counter should be 105\n");
+                goto end;
+        }
+        if (h != 2) {
+                BIO_printf(bio_err, "h should be 2\n");
                 goto end;
-                }
+        }
 
-        i=BN_bn2bin(dsa->p,buf);
-        j=sizeof(out_p);
-        if ((i != j) || (memcmp(buf,out_p,i) != 0))
-                {
-                BIO_printf(bio_err,"p value is wrong\n");
+        i = BN_bn2bin(dsa->q, buf);
+        j = sizeof(out_q);
+        if ((i != j) || (memcmp(buf, out_q, i) != 0)) {
+                BIO_printf(bio_err, "q value is wrong\n");
                 goto end;
-                }
+        }
 
-        i=BN_bn2bin(dsa->g,buf);
-        j=sizeof(out_g);
-        if ((i != j) || (memcmp(buf,out_g,i) != 0))
-                {
-                BIO_printf(bio_err,"g value is wrong\n");
+        i = BN_bn2bin(dsa->p, buf);
+        j = sizeof(out_p);
+        if ((i != j) || (memcmp(buf, out_p, i) != 0)) {
+                BIO_printf(bio_err, "p value is wrong\n");
                 goto end;
-                }
+        }
+
+        i = BN_bn2bin(dsa->g, buf);
+        j = sizeof(out_g);
+        if ((i != j) || (memcmp(buf, out_g, i) != 0)) {
+                BIO_printf(bio_err, "g value is wrong\n");
+                goto end;
+        }
 
         DSA_generate_key(dsa);
         DSA_sign(0, str1, 20, sig, &siglen, dsa);
         if (DSA_verify(0, str1, 20, sig, siglen, dsa) == 1)
-                ret=1;
+                ret = 1;
 
 end:
+        BN_GENCB_free(cb);
         if (!ret)
                 ERR_print_errors(bio_err);
-        if (dsa != NULL) DSA_free(dsa);
+        DSA_free(dsa);
         CRYPTO_cleanup_all_ex_data();
         ERR_remove_thread_state(NULL);
         ERR_free_strings();
         CRYPTO_mem_leaks(bio_err);
-        if (bio_err != NULL)
-                {
-                BIO_free(bio_err);
-                bio_err = NULL;
-                }
-        exit(!ret);
+        BIO_free(bio_err);
+        bio_err = NULL;
+
+        return !ret;
+}
+
+static int
+dsa_cb(int p, int n, BN_GENCB *arg)
+{
+        char c = '*';
+        static int ok = 0, num = 0;
+
+        if (p == 0) {
+                c = '.';
+                num++;
+        }
+        if (p == 1)
+                c = '+';
+        if (p == 2) {
+                c = '*';
+                ok++;
         }
 
-static int dsa_cb(int p, int n, BN_GENCB *arg)
-        {
-        char c='*';
-        static int ok=0,num=0;
-
-        if (p == 0) { c='.'; num++; };
-        if (p == 1) c='+';
-        if (p == 2) { c='*'; ok++; }
-        if (p == 3) c='\n';
-        BIO_write(arg->arg,&c,1);
-        (void)BIO_flush(arg->arg);
-
-        if (!ok && (p == 0) && (num > 1))
-                {
-                BIO_printf((BIO *)arg,"error in dsatest\n");
+        if (p == 3)
+                c = '\n';
+        BIO_write(BN_GENCB_get_arg(arg), &c, 1);
+        (void)BIO_flush(BN_GENCB_get_arg(arg));
+
+        if (!ok && (p == 0) && (num > 1)) {
+                BIO_printf((BIO *)arg, "error in dsatest\n");
                 return 0;
-                }
-        return 1;
         }
+        return 1;
+}