X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=test%2Fdhtest.c;h=96d7027cc60066afc510ed6c964cff5837717887;hp=196535b43e2ed58dbcb7cae6695ee25041a04d70;hb=c6d38183d6754b0a7b90527d085a500680e7d2ea;hpb=93d02986656bf4a3ae145f65afc1ca52d2810950;ds=sidebyside

diff --git a/test/dhtest.c b/test/dhtest.c
index 196535b43e..96d7027cc6 100644
--- a/test/dhtest.c
+++ b/test/dhtest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -11,43 +11,33 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "e_os.h"
+#include "internal/nelem.h"
 #include <openssl/crypto.h>
 #include <openssl/bio.h>
 #include <openssl/bn.h>
 #include <openssl/rand.h>
 #include <openssl/err.h>
-#include "test_main.h"
 #include "testutil.h"
 
-#ifdef OPENSSL_NO_DH
-int main(int argc, char *argv[])
-{
-    printf("No DH support\n");
-    return (0);
-}
-#else
+#ifndef OPENSSL_NO_DH
 # include <openssl/dh.h>
 
 static int cb(int p, int n, BN_GENCB *arg);
 
-static const char rnd_seed[] =
-    "string to make the random number generator think it has entropy";
-
 static int dh_test(void)
 {
     BN_GENCB *_cb = NULL;
     DH *a = NULL;
     DH *b = NULL;
+    DH *c = NULL;
     const BIGNUM *ap = NULL, *ag = NULL, *apub_key = NULL;
-    const BIGNUM *bpub_key = NULL;
-    BIGNUM *bp = NULL, *bg = NULL;
+    const BIGNUM *bpub_key = NULL, *bpriv_key = NULL;
+    BIGNUM *bp = NULL, *bg = NULL, *cpriv_key = NULL;
     unsigned char *abuf = NULL;
     unsigned char *bbuf = NULL;
-    int i, alen, blen, aout, bout;
-    int ret = 1;
-
-    RAND_seed(rnd_seed, sizeof rnd_seed);
+    unsigned char *cbuf = NULL;
+    int i, alen, blen, clen, aout, bout, cout;
+    int ret = 0;
 
     if (!TEST_ptr(_cb = BN_GENCB_new()))
         goto err;
@@ -59,12 +49,14 @@ static int dh_test(void)
 
     if (!DH_check(a, &i))
         goto err;
-    if (TEST_false(i & DH_CHECK_P_NOT_PRIME)
-            || TEST_false(i & DH_CHECK_P_NOT_SAFE_PRIME)
-            || TEST_false(i & DH_UNABLE_TO_CHECK_GENERATOR)
-            || TEST_false(i & DH_NOT_SUITABLE_GENERATOR))
+    if (!TEST_false(i & DH_CHECK_P_NOT_PRIME)
+            || !TEST_false(i & DH_CHECK_P_NOT_SAFE_PRIME)
+            || !TEST_false(i & DH_UNABLE_TO_CHECK_GENERATOR)
+            || !TEST_false(i & DH_NOT_SUITABLE_GENERATOR))
         goto err;
 
+    DH_get0_pqg(a, &ap, NULL, &ag);
+
     if (!TEST_ptr(b = DH_new()))
         goto err;
 
@@ -76,32 +68,51 @@ static int dh_test(void)
 
     if (!DH_generate_key(a))
         goto err;
+    DH_get0_key(a, &apub_key, NULL);
 
     if (!DH_generate_key(b))
         goto err;
+    DH_get0_key(b, &bpub_key, &bpriv_key);
+
+    /* Also test with a private-key-only copy of |b|. */
+    if (!TEST_ptr(c = DHparams_dup(b))
+            || !TEST_ptr(cpriv_key = BN_dup(bpriv_key))
+            || !TEST_true(DH_set0_key(c, NULL, cpriv_key)))
+        goto err;
+    cpriv_key = NULL;
 
     alen = DH_size(a);
     if (!TEST_ptr(abuf = OPENSSL_malloc(alen))
-            || !TEST_true(aout = DH_compute_key(abuf, bpub_key, a)))
+            || !TEST_true((aout = DH_compute_key(abuf, bpub_key, a)) != -1))
         goto err;
 
     blen = DH_size(b);
     if (!TEST_ptr(bbuf = OPENSSL_malloc(blen))
-            || !TEST_true(bout = DH_compute_key(bbuf, apub_key, b)))
+            || !TEST_true((bout = DH_compute_key(bbuf, apub_key, b)) != -1))
         goto err;
-    if (!TEST_true(aout < 4)
-            || !TEST_mem_eq(abuf, aout, bbuf, bout))
+
+    clen = DH_size(c);
+    if (!TEST_ptr(cbuf = OPENSSL_malloc(clen))
+            || !TEST_true((cout = DH_compute_key(cbuf, apub_key, c)) != -1))
         goto err;
-        ret = 0;
+
+    if (!TEST_true(aout >= 4)
+            || !TEST_mem_eq(abuf, aout, bbuf, bout)
+            || !TEST_mem_eq(abuf, aout, cbuf, cout))
+        goto err;
+
     ret = 1;
 
  err:
     OPENSSL_free(abuf);
     OPENSSL_free(bbuf);
+    OPENSSL_free(cbuf);
     DH_free(b);
     DH_free(a);
+    DH_free(c);
     BN_free(bp);
     BN_free(bg);
+    BN_free(cpriv_key);
     BN_GENCB_free(_cb);
     return ret;
 }
@@ -503,11 +514,16 @@ static int rfc5114_test(void)
     TEST_error("Test failed RFC5114 set %d\n", i + 1);
     return 0;
 }
+#endif
 
 
-void register_tests(void)
+int setup_tests(void)
 {
+#ifdef OPENSSL_NO_DH
+    TEST_note("No DH support");
+#else
     ADD_TEST(dh_test);
     ADD_TEST(rfc5114_test);
-}
 #endif
+    return 1;
+}