X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=test%2Fdhtest.c;h=956d081f0427de40592129e77f9ea621a4cf2a75;hp=196535b43e2ed58dbcb7cae6695ee25041a04d70;hb=7d79d13a564d5c065318aa47f4cd511eece449e8;hpb=93d02986656bf4a3ae145f65afc1ca52d2810950 diff --git a/test/dhtest.c b/test/dhtest.c index 196535b43e..956d081f04 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-2018 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,44 +11,111 @@ #include #include -#include "e_os.h" +#include "internal/nelem.h" #include #include #include #include #include -#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 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) { + DH *dh; + BIGNUM *p, *q, *g; + const BIGNUM *p2, *q2, *g2; + BIGNUM *priv_key; + const BIGNUM *pub_key2, *priv_key2; 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; + unsigned char *cbuf = NULL; + int i, alen, blen, clen, aout, bout, cout; + int ret = 0; + + if (!TEST_ptr(dh = DH_new()) + || !TEST_ptr(p = BN_new()) + || !TEST_ptr(q = BN_new()) + || !TEST_ptr(g = BN_new()) + || !TEST_ptr(priv_key = BN_new())) + goto err; + + /* + * I) basic tests + */ + + /* using a small predefined Sophie Germain DH group with generator 3 */ + if (!TEST_true(BN_set_word(p, 4079L)) + || !TEST_true(BN_set_word(q, 2039L)) + || !TEST_true(BN_set_word(g, 3L)) + || !TEST_true(DH_set0_pqg(dh, p, q, g))) + goto err; + + /* test the combined getter for p, q, and g */ + DH_get0_pqg(dh, &p2, &q2, &g2); + if (!TEST_ptr_eq(p2, p) + || !TEST_ptr_eq(q2, q) + || !TEST_ptr_eq(g2, g)) + goto err; + + /* test the simple getters for p, q, and g */ + if (!TEST_ptr_eq(DH_get0_p(dh), p2) + || !TEST_ptr_eq(DH_get0_q(dh), q2) + || !TEST_ptr_eq(DH_get0_g(dh), g2)) + goto err; + + /* set the private key only*/ + if (!TEST_true(BN_set_word(priv_key, 1234L)) + || !TEST_true(DH_set0_key(dh, NULL, priv_key))) + goto err; + + /* test the combined getter for pub_key and priv_key */ + DH_get0_key(dh, &pub_key2, &priv_key2); + if (!TEST_ptr_eq(pub_key2, NULL) + || !TEST_ptr_eq(priv_key2, priv_key)) + goto err; + + /* test the simple getters for pub_key and priv_key */ + if (!TEST_ptr_eq(DH_get0_pub_key(dh), pub_key2) + || !TEST_ptr_eq(DH_get0_priv_key(dh), priv_key2)) + goto err; + + /* now generate a key pair ... */ + if (!DH_generate_key(dh)) + goto err; - RAND_seed(rnd_seed, sizeof rnd_seed); + /* ... and check whether the private key was reused: */ + /* test it with the combined getter for pub_key and priv_key */ + DH_get0_key(dh, &pub_key2, &priv_key2); + if (!TEST_ptr(pub_key2) + || !TEST_ptr_eq(priv_key2, priv_key)) + goto err; + + /* test it the simple getters for pub_key and priv_key */ + if (!TEST_ptr_eq(DH_get0_pub_key(dh), pub_key2) + || !TEST_ptr_eq(DH_get0_priv_key(dh), priv_key2)) + goto err; + + /* check whether the public key was calculated correclty */ + TEST_uint_eq(BN_get_word(pub_key2), 3331L); + + /* + * II) key generation + */ + + /* generate a DH group ... */ if (!TEST_ptr(_cb = BN_GENCB_new())) goto err; BN_GENCB_set(_cb, &cb, NULL); @@ -57,14 +124,18 @@ static int dh_test(void) DH_GENERATOR_5, _cb))) goto err; + /* ... and check whether it is valid */ 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); + + /* now create another copy of the DH group for the peer */ if (!TEST_ptr(b = DH_new())) goto err; @@ -74,35 +145,60 @@ static int dh_test(void) goto err; bp = bg = NULL; + /* + * III) simulate a key exchange + */ + 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); + DH_free(dh); + return ret; } @@ -503,11 +599,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; +}