#include <stdlib.h>
#include <string.h>
-#include "../e_os.h"
-
+#include "e_os.h"
#include <openssl/crypto.h>
#include <openssl/bio.h>
#include <openssl/bn.h>
#include <openssl/rand.h>
#include <openssl/err.h>
+#include "testutil.h"
#ifdef OPENSSL_NO_DH
int main(int argc, char *argv[])
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 run_rfc5114_tests(void);
+ "string to make the random number generator think it has randomness";
-int main(int argc, char *argv[])
+static int dh_test(void)
{
BN_GENCB *_cb = NULL;
DH *a = NULL;
DH *b = NULL;
- const BIGNUM *ap = NULL, *ag = NULL, *apub_key = NULL, *priv_key = NULL;
+ const BIGNUM *ap = NULL, *ag = NULL, *apub_key = NULL;
const BIGNUM *bpub_key = NULL;
BIGNUM *bp = NULL, *bg = NULL;
- char buf[12] = {0};
unsigned char *abuf = NULL;
unsigned char *bbuf = NULL;
int i, alen, blen, aout, bout;
- int ret = 1;
- BIO *out = NULL;
-
- CRYPTO_set_mem_debug(1);
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+ int ret = 0;
RAND_seed(rnd_seed, sizeof rnd_seed);
- out = BIO_new(BIO_s_file());
- if (out == NULL)
- EXIT(1);
- BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
-
- _cb = BN_GENCB_new();
- if (_cb == NULL)
+ if (!TEST_ptr(_cb = BN_GENCB_new()))
goto err;
- BN_GENCB_set(_cb, &cb, out);
- if (((a = DH_new()) == NULL)
- || (!DH_generate_parameters_ex(a, 64, DH_GENERATOR_5, _cb)))
+ BN_GENCB_set(_cb, &cb, NULL);
+ if (!TEST_ptr(a = DH_new())
+ || !TEST_true(DH_generate_parameters_ex(a, 64,
+ DH_GENERATOR_5, _cb)))
goto err;
if (!DH_check(a, &i))
goto err;
- if (i & DH_CHECK_P_NOT_PRIME)
- BIO_puts(out, "p value is not prime\n");
- if (i & DH_CHECK_P_NOT_SAFE_PRIME)
- BIO_puts(out, "p value is not a safe prime\n");
- if (i & DH_UNABLE_TO_CHECK_GENERATOR)
- BIO_puts(out, "unable to check the generator value\n");
- if (i & DH_NOT_SUITABLE_GENERATOR)
- BIO_puts(out, "the g value is not a generator\n");
+ 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);
- BIO_puts(out, "\np =");
- BN_print(out, ap);
- BIO_puts(out, "\ng =");
- BN_print(out, ag);
- BIO_puts(out, "\n");
-
- b = DH_new();
- if (b == NULL)
+
+ if (!TEST_ptr(b = DH_new()))
goto err;
- bp = BN_dup(ap);
- bg = BN_dup(ag);
- if ((bp == NULL) || (bg == NULL) || !DH_set0_pqg(b, bp, NULL, bg))
+ if (!TEST_ptr(bp = BN_dup(ap))
+ || !TEST_ptr(bg = BN_dup(ag))
+ || !TEST_true(DH_set0_pqg(b, bp, NULL, bg)))
goto err;
bp = bg = NULL;
if (!DH_generate_key(a))
goto err;
- DH_get0_key(a, &apub_key, &priv_key);
- BIO_puts(out, "pri 1=");
- BN_print(out, priv_key);
- BIO_puts(out, "\npub 1=");
- BN_print(out, apub_key);
- BIO_puts(out, "\n");
+ DH_get0_key(a, &apub_key, NULL);
if (!DH_generate_key(b))
goto err;
- DH_get0_key(b, &bpub_key, &priv_key);
- BIO_puts(out, "pri 2=");
- BN_print(out, priv_key);
- BIO_puts(out, "\npub 2=");
- BN_print(out, bpub_key);
- BIO_puts(out, "\n");
+ DH_get0_key(b, &bpub_key, NULL);
alen = DH_size(a);
- abuf = OPENSSL_malloc(alen);
- if (abuf == NULL)
+ if (!TEST_ptr(abuf = OPENSSL_malloc(alen))
+ || !TEST_true((aout = DH_compute_key(abuf, bpub_key, a)) != -1))
goto err;
- aout = DH_compute_key(abuf, bpub_key, a);
-
- BIO_puts(out, "key1 =");
- for (i = 0; i < aout; i++) {
- sprintf(buf, "%02X", abuf[i]);
- BIO_puts(out, buf);
- }
- BIO_puts(out, "\n");
-
blen = DH_size(b);
- bbuf = OPENSSL_malloc(blen);
- if (bbuf == NULL)
+ if (!TEST_ptr(bbuf = OPENSSL_malloc(blen))
+ || !TEST_true((bout = DH_compute_key(bbuf, apub_key, b)) != -1))
goto err;
- bout = DH_compute_key(bbuf, apub_key, b);
+ if (!TEST_true(aout >= 4)
+ || !TEST_mem_eq(abuf, aout, bbuf, bout))
+ goto err;
- BIO_puts(out, "key2 =");
- for (i = 0; i < bout; i++) {
- sprintf(buf, "%02X", bbuf[i]);
- BIO_puts(out, buf);
- }
- BIO_puts(out, "\n");
- if ((aout < 4) || (bout != aout) || (memcmp(abuf, bbuf, aout) != 0)) {
- fprintf(stderr, "Error in DH routines\n");
- ret = 1;
- } else
- ret = 0;
- if (!run_rfc5114_tests())
- ret = 1;
- err:
- (void)BIO_flush(out);
- ERR_print_errors_fp(stderr);
+ ret = 1;
+ err:
OPENSSL_free(abuf);
OPENSSL_free(bbuf);
DH_free(b);
BN_free(bp);
BN_free(bg);
BN_GENCB_free(_cb);
- BIO_free(out);
-
-#ifndef OPENSSL_NO_CRYPTO_MDEBUG
- if (CRYPTO_mem_leaks_fp(stderr) <= 0)
- ret = 1;
-#endif
-
- EXIT(ret);
+ return ret;
}
static int cb(int p, int n, BN_GENCB *arg)
{
- char c = '*';
-
- if (p == 0)
- c = '.';
- if (p == 1)
- c = '+';
- if (p == 2)
- c = '*';
- if (p == 3)
- c = '\n';
- BIO_write(BN_GENCB_get_arg(arg), &c, 1);
- (void)BIO_flush(BN_GENCB_get_arg(arg));
return 1;
}
make_rfc5114_td(2048_256)
};
-static int run_rfc5114_tests(void)
+static int rfc5114_test(void)
{
int i;
DH *dhA = NULL;
for (i = 0; i < (int)OSSL_NELEM(rfctd); i++) {
td = rfctd + i;
/* Set up DH structures setting key components */
- dhA = td->get_param();
- dhB = td->get_param();
- if ((dhA == NULL) || (dhB == NULL))
+ if (!TEST_ptr(dhA = td->get_param())
+ || !TEST_ptr(dhB = td->get_param()))
goto bad_err;
- priv_key = BN_bin2bn(td->xA, td->xA_len, NULL);
- pub_key = BN_bin2bn(td->yA, td->yA_len, NULL);
- if (priv_key == NULL || pub_key == NULL
- || !DH_set0_key(dhA, pub_key, priv_key))
+ if (!TEST_ptr(priv_key = BN_bin2bn(td->xA, td->xA_len, NULL))
+ || !TEST_ptr(pub_key = BN_bin2bn(td->yA, td->yA_len, NULL))
+ || !TEST_true(DH_set0_key(dhA, pub_key, priv_key)))
goto bad_err;
- priv_key = BN_bin2bn(td->xB, td->xB_len, NULL);
- pub_key = BN_bin2bn(td->yB, td->yB_len, NULL);
-
- if (priv_key == NULL || pub_key == NULL
- || !DH_set0_key(dhB, pub_key, priv_key))
+ if (!TEST_ptr(priv_key = BN_bin2bn(td->xB, td->xB_len, NULL))
+ || !TEST_ptr(pub_key = BN_bin2bn(td->yB, td->yB_len, NULL))
+ || !TEST_true( DH_set0_key(dhB, pub_key, priv_key)))
goto bad_err;
priv_key = pub_key = NULL;
- if ((td->Z_len != (size_t)DH_size(dhA))
- || (td->Z_len != (size_t)DH_size(dhB)))
+ if (!TEST_uint_eq(td->Z_len, (size_t)DH_size(dhA))
+ || !TEST_uint_eq(td->Z_len, (size_t)DH_size(dhB)))
goto err;
- Z1 = OPENSSL_malloc(DH_size(dhA));
- Z2 = OPENSSL_malloc(DH_size(dhB));
- if ((Z1 == NULL) || (Z2 == NULL))
+ if (!TEST_ptr(Z1 = OPENSSL_malloc(DH_size(dhA)))
+ || !TEST_ptr(Z2 = OPENSSL_malloc(DH_size(dhB))))
goto bad_err;
/*
* Work out shared secrets using both sides and compare with expected
* values.
*/
DH_get0_key(dhB, &pub_key_tmp, NULL);
- if (DH_compute_key(Z1, pub_key_tmp, dhA) == -1)
+ if (!TEST_int_ne(DH_compute_key(Z1, pub_key_tmp, dhA), -1))
goto bad_err;
DH_get0_key(dhA, &pub_key_tmp, NULL);
- if (DH_compute_key(Z2, pub_key_tmp, dhB) == -1)
+ if (!TEST_int_ne(DH_compute_key(Z2, pub_key_tmp, dhB), -1))
goto bad_err;
- if (memcmp(Z1, td->Z, td->Z_len))
- goto err;
- if (memcmp(Z2, td->Z, td->Z_len))
+ if (!TEST_mem_eq(Z1, td->Z_len, td->Z, td->Z_len)
+ || !TEST_mem_eq(Z2, td->Z_len, td->Z, td->Z_len))
goto err;
- printf("RFC5114 parameter test %d OK\n", i + 1);
-
DH_free(dhA);
- DH_free(dhB);
- OPENSSL_free(Z1);
- OPENSSL_free(Z2);
dhA = NULL;
+ DH_free(dhB);
dhB = NULL;
+ OPENSSL_free(Z1);
Z1 = NULL;
+ OPENSSL_free(Z2);
Z2 = NULL;
}
/* Now i == OSSL_NELEM(rfctd) */
/* RFC5114 uses unsafe primes, so now test an invalid y value */
- dhA = DH_get_2048_224();
- if (dhA == NULL)
- goto bad_err;
- Z1 = OPENSSL_malloc(DH_size(dhA));
- if (Z1 == NULL)
+ if (!TEST_ptr(dhA = DH_get_2048_224())
+ || !TEST_ptr(Z1 = OPENSSL_malloc(DH_size(dhA))))
goto bad_err;
- bady = BN_bin2bn(dhtest_rfc5114_2048_224_bad_y,
- sizeof(dhtest_rfc5114_2048_224_bad_y), NULL);
- if (bady == NULL)
+ if (!TEST_ptr(bady = BN_bin2bn(dhtest_rfc5114_2048_224_bad_y,
+ sizeof(dhtest_rfc5114_2048_224_bad_y),
+ NULL)))
goto bad_err;
if (!DH_generate_key(dhA))
}
/* We'll have a stale error on the queue from the above test so clear it */
ERR_clear_error();
-
- printf("RFC5114 parameter test %d OK\n", i + 1);
-
BN_free(bady);
DH_free(dhA);
OPENSSL_free(Z1);
-
return 1;
+
bad_err:
BN_free(bady);
DH_free(dhA);
BN_free(priv_key);
OPENSSL_free(Z1);
OPENSSL_free(Z2);
-
- fprintf(stderr, "Initialisation error RFC5114 set %d\n", i + 1);
- ERR_print_errors_fp(stderr);
+ TEST_error("Initialisation error RFC5114 set %d\n", i + 1);
return 0;
+
err:
BN_free(bady);
DH_free(dhA);
DH_free(dhB);
OPENSSL_free(Z1);
OPENSSL_free(Z2);
-
- fprintf(stderr, "Test failed RFC5114 set %d\n", i + 1);
+ TEST_error("Test failed RFC5114 set %d\n", i + 1);
return 0;
}
+
+void register_tests(void)
+{
+ ADD_TEST(dh_test);
+ ADD_TEST(rfc5114_test);
+}
#endif
projects / openssl.git / blobdiff