dhtest: fix this to work with opaque BN. This will need more fixes to

work with opaque DH, but one step at a time. While here, add a bunch of
missing spaces to reduce the eyebleed.

1 files changed, 61 insertions, 48 deletions

diff --git a/src/regress/lib/libcrypto/dh/dhtest.c b/src/regress/lib/libcrypto/dh/dhtest.c
index 599c51d5ed..0b2cb741fc 100644
--- a/src/regress/lib/libcrypto/dh/dhtest.c
+++ b/src/regress/lib/libcrypto/dh/dhtest.c
@@ -1,25 +1,25 @@
-/*      $OpenBSD: dhtest.c,v 1.5 2018/07/17 17:06:49 tb Exp $   */
+/*      $OpenBSD: dhtest.c,v 1.6 2021/11/18 15:07:28 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>
@@ -73,39 +74,47 @@
 
 #include <openssl/dh.h>
 
-static int cb(int p, int n, BN_GENCB *arg)
+static int
+cb(int p, int n, BN_GENCB *arg)
 {
-        char c='*';
+        char c = '*';
 
         if (p == 0)
-                c='.';
+                c = '.';
         if (p == 1)
-                c='+';
+                c = '+';
         if (p == 2)
-                c='*';
+                c = '*';
         if (p == 3)
-                c='\n';
-        BIO_write(arg->arg,&c,1);
-        (void)BIO_flush(arg->arg);
+                c = '\n';
+        BIO_write(BN_GENCB_get_arg(arg), &c, 1);
+        (void)BIO_flush(BN_GENCB_get_arg(arg));
         return 1;
 }
 
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
-        BN_GENCB _cb;
+        BN_GENCB *_cb;
         DH *a;
         char buf[12];
         unsigned char *abuf=NULL;
-        int i,alen,aout,ret=1;
+        int i, alen, aout;
         BIO *out;
+        int ret = 1;
+
+        if ((out = BIO_new(BIO_s_file())) == NULL)
+                err(1, "BIO_new");
+        BIO_set_fp(out, stdout, BIO_NOCLOSE);
+
+        if ((_cb = BN_GENCB_new()) == NULL)
+                err(1, "BN_GENCB_new");
 
-        out=BIO_new(BIO_s_file());
-        if (out == NULL) exit(1);
-        BIO_set_fp(out,stdout,BIO_NOCLOSE);
+        BN_GENCB_set(_cb, &cb, out);
+        if ((a = DH_new()) == NULL)
+                goto err;
 
-        BN_GENCB_set(&_cb, &cb, out);
-        if (((a = DH_new()) == NULL) ||
-            !DH_generate_parameters_ex(a, 64, DH_GENERATOR_5, &_cb))
+        if (!DH_generate_parameters_ex(a, 64, DH_GENERATOR_5, _cb))
                 goto err;
 
         if (!DH_check(a, &i))
@@ -119,36 +128,38 @@ int main(int argc, char *argv[])
         if (i & DH_NOT_SUITABLE_GENERATOR)
                 BIO_puts(out, "the g value is not a generator\n");
 
-        BIO_puts(out,"\np    =");
-        BN_print(out,a->p);
-        BIO_puts(out,"\ng    =");
-        BN_print(out,a->g);
-        BIO_puts(out,"\n");
+        BIO_puts(out, "\np    =");
+        BN_print(out, a->p);
+        BIO_puts(out, "\ng    =");
+        BN_print(out, a->g);
+        BIO_puts(out, "\n");
 
         if (!DH_generate_key(a))
                 goto err;
-        BIO_puts(out,"pri 1=");
-        BN_print(out,a->priv_key);
-        BIO_puts(out,"\npub 1=");
-        BN_print(out,a->pub_key);
-        BIO_puts(out,"\n");
-
-        alen=DH_size(a);
-        abuf=malloc(alen);
-        aout=DH_compute_key(abuf,a->pub_key,a);
-
-        BIO_puts(out,"key1 =");
+        BIO_puts(out, "pri 1=");
+        BN_print(out, a->priv_key);
+        BIO_puts(out, "\npub 1=");
+        BN_print(out, a->pub_key);
+        BIO_puts(out, "\n");
+
+        alen = DH_size(a);
+        if ((abuf = malloc(alen)) == NULL)
+                err(1, "malloc");
+        aout = DH_compute_key(abuf, a->pub_key, a);
+
+        BIO_puts(out, "key1 =");
         for (i=0; i<aout; i++) {
-                snprintf(buf,sizeof buf,"%02X",abuf[i]);
-                BIO_puts(out,buf);
+                snprintf(buf, sizeof buf, "%02X", abuf[i]);
+                BIO_puts(out, buf);
         }
-        BIO_puts(out,"\n");
+        BIO_puts(out, "\n");
 
         if (aout < 4) {
-                fprintf(stderr,"Error in DH routines\n");
-                ret=1;
-        } else
-                ret=0;
+                fprintf(stderr, "Error in DH routines\n");
+                goto err;
+        }
+
+        ret = 0;
 err:
         ERR_print_errors_fp(stderr);
 
@@ -156,5 +167,7 @@ err:
         if (a != NULL)
                 DH_free(a);
         BIO_free(out);
-        exit(ret);
+        BN_GENCB_free(_cb);
+
+        return (ret);
 }