#include <stdlib.h>
#include <string.h>
-#include "../e_os.h"
+#include "internal/nelem.h"
#include <openssl/bio.h>
#include <openssl/bn.h>
#define NUM_BITS (BN_BITS2 * 4)
-#define BN_print_var(v) bn_print_var(#v, v)
-
-static void bn_print_var(const char *var, const BIGNUM *bn)
-{
- fprintf(stderr, "%s (%3d) = ", var, BN_num_bits(bn));
- BN_print_fp(stderr, bn);
- fprintf(stderr, "\n");
-}
+#define BN_print_var(v) test_output_bignum(#v, v)
/*
* Test that r == 0 in test_exp_mod_zero(). Returns one on success,
const BIGNUM *a)
{
if (!BN_is_zero(r)) {
- fprintf(stderr, "%s failed:\n", method);
- fprintf(stderr, "a ** 0 mod 1 = r (should be 0)\n");
+ TEST_error("%s failed: a ** 0 mod 1 = r (should be 0)", method);
BN_print_var(a);
BN_print_var(r);
return 0;
/*
* test_mod_exp_zero tests that x**0 mod 1 == 0. It returns zero on success.
*/
-static int test_mod_exp_zero()
+static int test_mod_exp_zero(void)
{
BIGNUM *a = NULL, *p = NULL, *m = NULL;
BIGNUM *r = NULL;
if (!TEST_true(BN_mod_exp_mont_word(r, one_word, p, m, ctx, NULL)))
goto err;
- if (!TEST_true(BN_is_zero(r))) {
- fprintf(stderr, "BN_mod_exp_mont_word failed:\n");
- fprintf(stderr, "1 ** 0 mod 1 = r (should be 0)\n");
+ if (!TEST_BN_eq_zero(r)) {
+ TEST_error("BN_mod_exp_mont_word failed: "
+ "1 ** 0 mod 1 = r (should be 0)");
BN_print_var(r);
goto err;
}
c = (c % BN_BITS) - BN_BITS2;
BN_rand(m, NUM_BITS + c, BN_RAND_TOP_ONE, BN_RAND_BOTTOM_ODD);
- BN_mod(a, a, m, ctx);
- BN_mod(b, b, m, ctx);
-
- if (!TEST_true(BN_mod_exp_mont(r_mont, a, b, m, ctx, NULL))
+ if (!TEST_true(BN_mod(a, a, m, ctx))
+ || !TEST_true(BN_mod(b, b, m, ctx))
+ || !TEST_true(BN_mod_exp_mont(r_mont, a, b, m, ctx, NULL))
|| !TEST_true(BN_mod_exp_recp(r_recp, a, b, m, ctx))
|| !TEST_true(BN_mod_exp_simple(r_simple, a, b, m, ctx))
|| !TEST_true(BN_mod_exp_mont_consttime(r_mont_const, a, b, m, ctx, NULL)))
goto err;
- if (!TEST_int_eq(BN_cmp(r_simple, r_mont), 0)
- || !TEST_int_eq(BN_cmp(r_simple, r_recp), 0)
- || !TEST_int_eq(BN_cmp(r_simple, r_mont_const), 0)) {
+ if (!TEST_BN_eq(r_simple, r_mont)
+ || !TEST_BN_eq(r_simple, r_recp)
+ || !TEST_BN_eq(r_simple, r_mont_const)) {
if (BN_cmp(r_simple, r_mont) != 0)
- fprintf(stderr, "simple and mont results differ\n");
+ TEST_info("simple and mont results differ");
if (BN_cmp(r_simple, r_mont_const) != 0)
- fprintf(stderr, "simple and mont const time results differ\n");
+ TEST_info("simple and mont const time results differ");
if (BN_cmp(r_simple, r_recp) != 0)
- fprintf(stderr, "simple and recp results differ\n");
+ TEST_info("simple and recp results differ");
BN_print_var(a);
BN_print_var(b);
return ret;
}
-void register_tests(void)
+int setup_tests(void)
{
ADD_TEST(test_mod_exp_zero);
ADD_ALL_TESTS(test_mod_exp, 200);
+ return 1;
}