Add BN support to the test infrastructure. (dc352c19) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

test/bntest.c

+129 −90

Original line number	Original line	Diff line number	Diff line
	@@ -142,28 +142,11 @@ err:

	static int equalBN(const char op, const BIGNUM expected, const BIGNUM *actual)		static int equalBN(const char op, const BIGNUM expected, const BIGNUM *actual)
	{		{
	char *exstr = NULL;
	char *actstr = NULL;

	if (BN_cmp(expected, actual) == 0)		if (BN_cmp(expected, actual) == 0)
	return 1;		return 1;

	if (BN_is_zero(expected) && BN_is_negative(expected))		TEST_error("unexpected %s value", op);
	exstr = OPENSSL_strdup("-0");		TEST_BN_eq(expected, actual);
	else
	exstr = BN_bn2hex(expected);
	if (BN_is_zero(actual) && BN_is_negative(actual))
	actstr = OPENSSL_strdup("-0");
	else
	actstr = BN_bn2hex(actual);
	if (!TEST_ptr(exstr) \|\| !TEST_ptr(actstr))
	goto err;

	TEST_error("Got %s =\n\t%s\nwanted:\n\t%s", op, actstr, exstr);

	err:
	OPENSSL_free(exstr);
	OPENSSL_free(actstr);
	return 0;		return 0;
	}		}

	@@ -205,7 +188,7 @@ static int test_sub()
	BN_sub(c, a, b);		BN_sub(c, a, b);
	BN_add(c, c, b);		BN_add(c, c, b);
	BN_sub(c, c, a);		BN_sub(c, c, a);
	if (!TEST_true(BN_is_zero(c)))		if (!TEST_BN_eq_zero(c))
	goto err;		goto err;
	}		}
	st = 1;		st = 1;
	@@ -246,7 +229,7 @@ static int test_div_recip()
	BN_mul(e, d, b, ctx);		BN_mul(e, d, b, ctx);
	BN_add(d, e, c);		BN_add(d, e, c);
	BN_sub(d, d, a);		BN_sub(d, d, a);
	if (!TEST_true(BN_is_zero(d)))		if (!TEST_BN_eq_zero(d))
	goto err;		goto err;
	}		}
	st = 1;		st = 1;
	@@ -281,7 +264,7 @@ static int test_mod()
	BN_mod(c, a, b, ctx);		BN_mod(c, a, b, ctx);
	BN_div(d, e, a, b, ctx);		BN_div(d, e, a, b, ctx);
	BN_sub(e, e, c);		BN_sub(e, e, c);
	if (!TEST_true(BN_is_zero(e)))		if (!TEST_BN_eq_zero(e))
	goto err;		goto err;
	}		}
	st = 1;		st = 1;
	@@ -378,7 +361,7 @@ static int test_modexp_mont5()
	BN_zero(p);		BN_zero(p);
	if (!TEST_true(BN_mod_exp_mont_consttime(d, a, p, m, ctx, NULL)))		if (!TEST_true(BN_mod_exp_mont_consttime(d, a, p, m, ctx, NULL)))
	goto err;		goto err;
	if (!TEST_true(BN_is_one(d)))		if (!TEST_BN_eq_one(d))
	goto err;		goto err;

	/* Regression test for carry bug in mulx4x_mont */		/* Regression test for carry bug in mulx4x_mont */
	@@ -400,7 +383,7 @@ static int test_modexp_mont5()
	BN_MONT_CTX_set(mont, n, ctx);		BN_MONT_CTX_set(mont, n, ctx);
	BN_mod_mul_montgomery(c, a, b, mont, ctx);		BN_mod_mul_montgomery(c, a, b, mont, ctx);
	BN_mod_mul_montgomery(d, b, a, mont, ctx);		BN_mod_mul_montgomery(d, b, a, mont, ctx);
	if (!TEST_int_eq(BN_cmp(c, d), 0))		if (!TEST_BN_eq(c, d))
	goto err;		goto err;

	/* Regression test for carry bug in sqr[x]8x_mont */		/* Regression test for carry bug in sqr[x]8x_mont */
	@@ -415,14 +398,14 @@ static int test_modexp_mont5()
	BN_MONT_CTX_set(mont, n, ctx);		BN_MONT_CTX_set(mont, n, ctx);
	BN_mod_mul_montgomery(c, a, a, mont, ctx);		BN_mod_mul_montgomery(c, a, a, mont, ctx);
	BN_mod_mul_montgomery(d, a, b, mont, ctx);		BN_mod_mul_montgomery(d, a, b, mont, ctx);
	if (!TEST_int_eq(BN_cmp(c, d), 0))		if (!TEST_BN_eq(c, d))
	goto err;		goto err;

	/* Zero input */		/* Zero input */
	BN_bntest_rand(p, 1024, 0, 0);		BN_bntest_rand(p, 1024, 0, 0);
	BN_zero(a);		BN_zero(a);
	if (!TEST_true(BN_mod_exp_mont_consttime(d, a, p, m, ctx, NULL))		if (!TEST_true(BN_mod_exp_mont_consttime(d, a, p, m, ctx, NULL))
	\|\| !TEST_true(BN_is_zero(d)))		\|\| !TEST_BN_eq_zero(d))
	goto err;		goto err;

	/*		/*
	@@ -435,14 +418,14 @@ static int test_modexp_mont5()
	if (!TEST_true(BN_from_montgomery(e, a, mont, ctx))		if (!TEST_true(BN_from_montgomery(e, a, mont, ctx))
	\|\| !TEST_true(BN_mod_exp_mont_consttime(d, e, p, m, ctx, NULL))		\|\| !TEST_true(BN_mod_exp_mont_consttime(d, e, p, m, ctx, NULL))
	\|\| !TEST_true(BN_mod_exp_simple(a, e, p, m, ctx))		\|\| !TEST_true(BN_mod_exp_simple(a, e, p, m, ctx))
	\|\| !TEST_int_eq(BN_cmp(a, d), 0))		\|\| !TEST_BN_eq(a, d))
	goto err;		goto err;

	/* Finally, some regular test vectors. */		/* Finally, some regular test vectors. */
	BN_bntest_rand(e, 1024, 0, 0);		BN_bntest_rand(e, 1024, 0, 0);
	if (!TEST_true(BN_mod_exp_mont_consttime(d, e, p, m, ctx, NULL))		if (!TEST_true(BN_mod_exp_mont_consttime(d, e, p, m, ctx, NULL))
	\|\| !TEST_true(BN_mod_exp_simple(a, e, p, m, ctx))		\|\| !TEST_true(BN_mod_exp_simple(a, e, p, m, ctx))
	\|\| !TEST_int_eq(BN_cmp(a, d), 0))		\|\| !TEST_BN_eq(a, d))
	goto err;		goto err;

	st = 1;		st = 1;
	@@ -483,7 +466,7 @@ static int test_gf2m_add()
	goto err;		goto err;
	BN_GF2m_add(c, c, c);		BN_GF2m_add(c, c, c);
	/* Test that c + c = 0. */		/* Test that c + c = 0. */
	if (!TEST_true(BN_is_zero(c)))		if (!TEST_BN_eq_zero(c))
	goto err;		goto err;
	}		}
	st = 1;		st = 1;
	@@ -517,7 +500,7 @@ static int test_gf2m_mod()
	BN_GF2m_add(d, a, c);		BN_GF2m_add(d, a, c);
	BN_GF2m_mod(e, d, b[j]);		BN_GF2m_mod(e, d, b[j]);
	/* Test that a + (a mod p) mod p == 0. */		/* Test that a + (a mod p) mod p == 0. */
	if (!TEST_true(BN_is_zero(e)))		if (!TEST_BN_eq_zero(e))
	goto err;		goto err;
	}		}
	}		}
	@@ -564,7 +547,7 @@ static int test_gf2m_mul()
	BN_GF2m_add(f, e, g);		BN_GF2m_add(f, e, g);
	BN_GF2m_add(f, f, h);		BN_GF2m_add(f, f, h);
	/* Test that (a+d)c = ac + dc. /		/* Test that (a+d)c = ac + dc. /
	if (!TEST_true(BN_is_zero(f)))		if (!TEST_BN_eq_zero(f))
	goto err;		goto err;
	}		}
	}		}
	@@ -606,7 +589,7 @@ static int test_gf2m_sqr()
	BN_GF2m_mod_mul(d, a, d, b[j], ctx);		BN_GF2m_mod_mul(d, a, d, b[j], ctx);
	BN_GF2m_add(d, c, d);		BN_GF2m_add(d, c, d);
	/* Test that aa = a^2. /		/* Test that aa = a^2. /
	if (!TEST_true(BN_is_zero(d)))		if (!TEST_BN_eq_zero(d))
	goto err;		goto err;
	}		}
	}		}
	@@ -641,7 +624,7 @@ static int test_gf2m_modinv()
	BN_GF2m_mod_inv(c, a, b[j], ctx);		BN_GF2m_mod_inv(c, a, b[j], ctx);
	BN_GF2m_mod_mul(d, a, c, b[j], ctx);		BN_GF2m_mod_mul(d, a, c, b[j], ctx);
	/* Test that ((1/a)a) = 1. /		/* Test that ((1/a)a) = 1. /
	if (!TEST_true(BN_is_one(d)))		if (!TEST_BN_eq_one(d))
	goto err;		goto err;
	}		}
	}		}
	@@ -681,7 +664,7 @@ static int test_gf2m_moddiv()
	BN_GF2m_mod_mul(e, d, c, b[j], ctx);		BN_GF2m_mod_mul(e, d, c, b[j], ctx);
	BN_GF2m_mod_div(f, a, e, b[j], ctx);		BN_GF2m_mod_div(f, a, e, b[j], ctx);
	/* Test that ((a/c)c)/a = 1. /		/* Test that ((a/c)c)/a = 1. /
	if (!TEST_true(BN_is_one(f)))		if (!TEST_BN_eq_one(f))
	goto err;		goto err;
	}		}
	}		}
	@@ -727,7 +710,7 @@ static int test_gf2m_modexp()
	BN_GF2m_mod_exp(f, a, f, b[j], ctx);		BN_GF2m_mod_exp(f, a, f, b[j], ctx);
	BN_GF2m_add(f, e, f);		BN_GF2m_add(f, e, f);
	/* Test that a^(c+d)=a^ca^d. /		/* Test that a^(c+d)=a^ca^d. /
	if (!TEST_true(BN_is_zero(f)))		if (!TEST_BN_eq_zero(f))
	goto err;		goto err;
	}		}
	}		}
	@@ -769,7 +752,7 @@ static int test_gf2m_modsqrt()
	BN_GF2m_mod_sqr(e, d, b[j], ctx);		BN_GF2m_mod_sqr(e, d, b[j], ctx);
	BN_GF2m_add(f, c, e);		BN_GF2m_add(f, c, e);
	/* Test that d^2 = a, where d = sqrt(a). */		/* Test that d^2 = a, where d = sqrt(a). */
	if (!TEST_true(BN_is_zero(f)))		if (!TEST_BN_eq_zero(f))
	goto err;		goto err;
	}		}
	}		}
	@@ -815,7 +798,7 @@ static int test_gf2m_modsolvequad()
	/*		/*
	* Test that solution of quadratic c satisfies c^2 + c = a.		* Test that solution of quadratic c satisfies c^2 + c = a.
	*/		*/
	if (!TEST_true(BN_is_zero(e)))		if (!TEST_BN_eq_zero(e))
	goto err;		goto err;
	}		}
	}		}
	@@ -1158,8 +1141,9 @@ static int file_square(STANZA *s)
	goto err;		goto err;

	/* BN_sqrt should fail on non-squares and negative numbers. */		/* BN_sqrt should fail on non-squares and negative numbers. */
	if (!TEST_true(BN_is_zero(square))) {		if (!TEST_BN_eq_zero(square)) {
	if (!TEST_ptr(tmp = BN_new()) \|\| !TEST_true(BN_copy(tmp, square)))		if (!TEST_ptr(tmp = BN_new())
			\|\| !TEST_true(BN_copy(tmp, square)))
	goto err;		goto err;
	BN_set_negative(tmp, 1);		BN_set_negative(tmp, 1);

	@@ -1399,7 +1383,7 @@ static int file_modexp(STANZA *s)
	"0000000000000000000000000000000000000000000000000000000001");		"0000000000000000000000000000000000000000000000000000000001");
	BN_mod_exp(d, a, b, c, ctx);		BN_mod_exp(d, a, b, c, ctx);
	BN_mul(e, a, a, ctx);		BN_mul(e, a, a, ctx);
	if (!TEST_int_eq(BN_cmp(d, e), 0))		if (!TEST_BN_eq(d, e))
	goto err;		goto err;

	st = 1;		st = 1;
	@@ -1538,32 +1522,61 @@ static int test_dec2bn()
	int st = 0;		int st = 0;

	if (!TEST_int_eq(parsedecBN(&bn, "0"), 1)		if (!TEST_int_eq(parsedecBN(&bn, "0"), 1)
	\|\| !TEST_true(BN_is_zero(bn))		\|\| !TEST_BN_eq_word(bn, 0)
	\|\| !TEST_false(BN_is_negative(bn)))		\|\| !TEST_BN_eq_zero(bn)
			\|\| !TEST_BN_le_zero(bn)
			\|\| !TEST_BN_ge_zero(bn)
			\|\| !TEST_BN_even(bn))
	goto err;		goto err;
	BN_free(bn);		BN_free(bn);
			bn = NULL;

	if (!TEST_int_eq(parsedecBN(&bn, "256"), 3)		if (!TEST_int_eq(parsedecBN(&bn, "256"), 3)
	\|\| !TEST_true(BN_is_word(bn, 256))		\|\| !TEST_BN_eq_word(bn, 256)
	\|\| !TEST_false(BN_is_negative(bn)))		\|\| !TEST_BN_ge_zero(bn)
			\|\| !TEST_BN_gt_zero(bn)
			\|\| !TEST_BN_ne_zero(bn)
			\|\| !TEST_BN_even(bn))
	goto err;		goto err;
	BN_free(bn);		BN_free(bn);
			bn = NULL;

	if (!TEST_int_eq(parsedecBN(&bn, "-42"), 3)		if (!TEST_int_eq(parsedecBN(&bn, "-42"), 3)
	\|\| !TEST_true(BN_abs_is_word(bn, 42))		\|\| !TEST_BN_abs_eq_word(bn, 42)
	\|\| !TEST_true(BN_is_negative(bn)))		\|\| !TEST_BN_lt_zero(bn)
			\|\| !TEST_BN_le_zero(bn)
			\|\| !TEST_BN_ne_zero(bn)
			\|\| !TEST_BN_even(bn))
	goto err;		goto err;
	BN_free(bn);		BN_free(bn);
			bn = NULL;

			if (!TEST_int_eq(parsedecBN(&bn, "1"), 1)
			\|\| !TEST_BN_eq_word(bn, 1)
			\|\| !TEST_BN_ne_zero(bn)
			\|\| !TEST_BN_gt_zero(bn)
			\|\| !TEST_BN_ge_zero(bn)
			\|\| !TEST_BN_eq_one(bn)
			\|\| !TEST_BN_odd(bn))
			goto err;
			BN_free(bn);
			bn = NULL;

	if (!TEST_int_eq(parsedecBN(&bn, "-0"), 2)		if (!TEST_int_eq(parsedecBN(&bn, "-0"), 2)
	\|\| !TEST_true(BN_is_zero(bn))		\|\| !TEST_BN_eq_zero(bn)
	\|\| !TEST_false(BN_is_negative(bn)))		\|\| !TEST_BN_ge_zero(bn)
			\|\| !TEST_BN_le_zero(bn)
			\|\| !TEST_BN_even(bn))
	goto err;		goto err;
	BN_free(bn);		BN_free(bn);
			bn = NULL;

	if (!TEST_int_eq(parsedecBN(&bn, "42trailing garbage is ignored"), 2)		if (!TEST_int_eq(parsedecBN(&bn, "42trailing garbage is ignored"), 2)
	\|\| !TEST_true(BN_abs_is_word(bn, 42))		\|\| !TEST_BN_abs_eq_word(bn, 42)
	\|\| !TEST_false(BN_is_negative(bn)))		\|\| !TEST_BN_ge_zero(bn)
			\|\| !TEST_BN_gt_zero(bn)
			\|\| !TEST_BN_ne_zero(bn)
			\|\| !TEST_BN_even(bn))
	goto err;		goto err;

	st = 1;		st = 1;
	@@ -1578,32 +1591,58 @@ static int test_hex2bn()
	int st = 0;		int st = 0;

	if (!TEST_int_eq(parseBN(&bn, "0"), 1)		if (!TEST_int_eq(parseBN(&bn, "0"), 1)
	\|\| !TEST_true(BN_is_zero(bn))		\|\| !TEST_BN_eq_zero(bn)
	\|\| !TEST_false(BN_is_negative(bn)))		\|\| !TEST_BN_ge_zero(bn)
			\|\| !TEST_BN_even(bn))
	goto err;		goto err;
	BN_free(bn);		BN_free(bn);
			bn = NULL;

	if (!TEST_int_eq(parseBN(&bn, "256"), 3)		if (!TEST_int_eq(parseBN(&bn, "256"), 3)
	\|\| !TEST_true(BN_is_word(bn, 0x256))		\|\| !TEST_BN_eq_word(bn, 0x256)
	\|\| !TEST_false(BN_is_negative(bn)))		\|\| !TEST_BN_ge_zero(bn)
			\|\| !TEST_BN_gt_zero(bn)
			\|\| !TEST_BN_ne_zero(bn)
			\|\| !TEST_BN_even(bn))
	goto err;		goto err;
	BN_free(bn);		BN_free(bn);
			bn = NULL;

	if (!TEST_int_eq(parseBN(&bn, "-42"), 3)		if (!TEST_int_eq(parseBN(&bn, "-42"), 3)
	\|\| !TEST_true(BN_abs_is_word(bn, 0x42))		\|\| !TEST_BN_abs_eq_word(bn, 0x42)
	\|\| !TEST_true(BN_is_negative(bn)))		\|\| !TEST_BN_lt_zero(bn)
			\|\| !TEST_BN_le_zero(bn)
			\|\| !TEST_BN_ne_zero(bn)
			\|\| !TEST_BN_even(bn))
			goto err;
			BN_free(bn);
			bn = NULL;

			if (!TEST_int_eq(parseBN(&bn, "cb"), 2)
			\|\| !TEST_BN_eq_word(bn, 0xCB)
			\|\| !TEST_BN_ge_zero(bn)
			\|\| !TEST_BN_gt_zero(bn)
			\|\| !TEST_BN_ne_zero(bn)
			\|\| !TEST_BN_odd(bn))
	goto err;		goto err;
	BN_free(bn);		BN_free(bn);
			bn = NULL;

	if (!TEST_int_eq(parseBN(&bn, "-0"), 2)		if (!TEST_int_eq(parseBN(&bn, "-0"), 2)
	\|\| !TEST_true(BN_is_zero(bn))		\|\| !TEST_BN_eq_zero(bn)
	\|\| !TEST_false(BN_is_negative(bn)))		\|\| !TEST_BN_ge_zero(bn)
			\|\| !TEST_BN_le_zero(bn)
			\|\| !TEST_BN_even(bn))
	goto err;		goto err;
	BN_free(bn);		BN_free(bn);
			bn = NULL;

	if (!TEST_int_eq(parseBN(&bn, "abctrailing garbage is ignored"), 3)		if (!TEST_int_eq(parseBN(&bn, "abctrailing garbage is ignored"), 3)
	\|\| !TEST_true(BN_is_word(bn, 0xabc))		\|\| !TEST_BN_eq_word(bn, 0xabc)
	\|\| !TEST_false(BN_is_negative(bn)))		\|\| !TEST_BN_ge_zero(bn)
			\|\| !TEST_BN_gt_zero(bn)
			\|\| !TEST_BN_ne_zero(bn)
			\|\| !TEST_BN_even(bn))
	goto err;		goto err;
	st = 1;		st = 1;

	@@ -1621,43 +1660,43 @@ static int test_asc2bn()
	goto err;		goto err;

	if (!TEST_true(BN_asc2bn(&bn, "0"))		if (!TEST_true(BN_asc2bn(&bn, "0"))
	\|\| !TEST_true(BN_is_zero(bn))		\|\| !TEST_BN_eq_zero(bn)
	\|\| !TEST_false(BN_is_negative(bn)))		\|\| !TEST_BN_ge_zero(bn))
	goto err;		goto err;

	if (!TEST_true(BN_asc2bn(&bn, "256"))		if (!TEST_true(BN_asc2bn(&bn, "256"))
	\|\| !TEST_true(BN_is_word(bn, 256))		\|\| !TEST_BN_eq_word(bn, 256)
	\|\| !TEST_false(BN_is_negative(bn)))		\|\| !TEST_BN_ge_zero(bn))
	goto err;		goto err;

	if (!TEST_true(BN_asc2bn(&bn, "-42"))		if (!TEST_true(BN_asc2bn(&bn, "-42"))
	\|\| !TEST_true(BN_abs_is_word(bn, 42))		\|\| !TEST_BN_abs_eq_word(bn, 42)
	\|\| !TEST_true(BN_is_negative(bn)))		\|\| !TEST_BN_lt_zero(bn))
	goto err;		goto err;

	if (!TEST_true(BN_asc2bn(&bn, "0x1234"))		if (!TEST_true(BN_asc2bn(&bn, "0x1234"))
	\|\| !TEST_true(BN_is_word(bn, 0x1234))		\|\| !TEST_BN_eq_word(bn, 0x1234)
	\|\| !TEST_false(BN_is_negative(bn)))		\|\| !TEST_BN_ge_zero(bn))
	goto err;		goto err;

	if (!TEST_true(BN_asc2bn(&bn, "0X1234"))		if (!TEST_true(BN_asc2bn(&bn, "0X1234"))
	\|\| !TEST_true(BN_is_word(bn, 0x1234))		\|\| !TEST_BN_eq_word(bn, 0x1234)
	\|\| !TEST_false(BN_is_negative(bn)))		\|\| !TEST_BN_ge_zero(bn))
	goto err;		goto err;

	if (!TEST_true(BN_asc2bn(&bn, "-0xabcd"))		if (!TEST_true(BN_asc2bn(&bn, "-0xabcd"))
	\|\| !TEST_true(BN_abs_is_word(bn, 0xabcd))		\|\| !TEST_BN_abs_eq_word(bn, 0xabcd)
	\|\| !TEST_true(BN_is_negative(bn)))		\|\| !TEST_BN_lt_zero(bn))
	goto err;		goto err;

	if (!TEST_true(BN_asc2bn(&bn, "-0"))		if (!TEST_true(BN_asc2bn(&bn, "-0"))
	\|\| !TEST_true(BN_is_zero(bn))		\|\| !TEST_BN_eq_zero(bn)
	\|\| !TEST_false(BN_is_negative(bn)))		\|\| !TEST_BN_ge_zero(bn))
	goto err;		goto err;

	if (!TEST_true(BN_asc2bn(&bn, "123trailing garbage is ignored"))		if (!TEST_true(BN_asc2bn(&bn, "123trailing garbage is ignored"))
	\|\| !TEST_true(BN_is_word(bn, 123))		\|\| !TEST_BN_eq_word(bn, 123)
	\|\| !TEST_false(BN_is_negative(bn)))		\|\| !TEST_BN_ge_zero(bn))
	goto err;		goto err;

	st = 1;		st = 1;
	@@ -1698,7 +1737,7 @@ static int test_mpi(int i)
	if (!TEST_ptr(bn2 = BN_mpi2bn(scratch, mpi_len, NULL)))		if (!TEST_ptr(bn2 = BN_mpi2bn(scratch, mpi_len, NULL)))
	goto err;		goto err;

	if (!TEST_int_eq(BN_cmp(bn, bn2), 0)) {		if (!TEST_BN_eq(bn, bn2)) {
	BN_free(bn2);		BN_free(bn2);
	goto err;		goto err;
	}		}
	@@ -1722,12 +1761,12 @@ static int test_rand()
	if (!TEST_false(BN_rand(bn, 0, 0 /* top / , 0 / bottom */ ))		if (!TEST_false(BN_rand(bn, 0, 0 /* top / , 0 / bottom */ ))
	\|\| !TEST_false(BN_rand(bn, 0, 1 /* top / , 1 / bottom */ ))		\|\| !TEST_false(BN_rand(bn, 0, 1 /* top / , 1 / bottom */ ))
	\|\| !TEST_true(BN_rand(bn, 1, 0 /* top / , 0 / bottom */ ))		\|\| !TEST_true(BN_rand(bn, 1, 0 /* top / , 0 / bottom */ ))
	\|\| !TEST_true(BN_is_word(bn, 1))		\|\| !TEST_BN_eq_one(bn)
	\|\| !TEST_false(BN_rand(bn, 1, 1 /* top / , 0 / bottom */ ))		\|\| !TEST_false(BN_rand(bn, 1, 1 /* top / , 0 / bottom */ ))
	\|\| !TEST_true(BN_rand(bn, 1, -1 /* top / , 1 / bottom */ ))		\|\| !TEST_true(BN_rand(bn, 1, -1 /* top / , 1 / bottom */ ))
	\|\| !TEST_true(BN_is_word(bn, 1))		\|\| !TEST_BN_eq_one(bn)
	\|\| !TEST_true(BN_rand(bn, 2, 1 /* top / , 0 / bottom */ ))		\|\| !TEST_true(BN_rand(bn, 2, 1 /* top / , 0 / bottom */ ))
	\|\| !TEST_true(BN_is_word(bn, 3)))		\|\| !TEST_BN_eq_word(bn, 3))
	goto err;		goto err;

	st = 1;		st = 1;
	@@ -1755,8 +1794,8 @@ static int test_negzero()
	BN_zero(b);		BN_zero(b);
	if (!TEST_true(BN_mul(c, a, b, ctx)))		if (!TEST_true(BN_mul(c, a, b, ctx)))
	goto err;		goto err;
	if (!TEST_true(BN_is_zero(c))		if (!TEST_BN_eq_zero(c)
	\|\| !TEST_false(BN_is_negative(c)))		\|\| !TEST_BN_ge_zero(c))
	goto err;		goto err;

	for (consttime = 0; consttime < 2; consttime++) {		for (consttime = 0; consttime < 2; consttime++) {
	@@ -1773,15 +1812,15 @@ static int test_negzero()
	goto err;		goto err;
	BN_set_negative(numerator, 1);		BN_set_negative(numerator, 1);
	if (!TEST_true(BN_div(a, b, numerator, denominator, ctx))		if (!TEST_true(BN_div(a, b, numerator, denominator, ctx))
	\|\| !TEST_true(BN_is_zero(a))		\|\| !TEST_BN_eq_zero(a)
	\|\| !TEST_false(BN_is_negative(a)))		\|\| !TEST_BN_ge_zero(a))
	goto err;		goto err;

	/* Test that BN_div never gives negative zero in the remainder. */		/* Test that BN_div never gives negative zero in the remainder. */
	if (!TEST_true(BN_set_word(denominator, 1))		if (!TEST_true(BN_set_word(denominator, 1))
	\|\| !TEST_true(BN_div(a, b, numerator, denominator, ctx))		\|\| !TEST_true(BN_div(a, b, numerator, denominator, ctx))
	\|\| !TEST_true(BN_is_zero(b))		\|\| !TEST_BN_eq_zero(b)
	\|\| !TEST_false(BN_is_negative(b)))		\|\| !TEST_BN_ge_zero(b))
	goto err;		goto err;
	BN_free(numerator);		BN_free(numerator);
	BN_free(denominator);		BN_free(denominator);
	@@ -1883,17 +1922,17 @@ static int test_expmodzero()
	BN_zero(zero);		BN_zero(zero);

	if (!TEST_true(BN_mod_exp(r, a, zero, BN_value_one(), NULL))		if (!TEST_true(BN_mod_exp(r, a, zero, BN_value_one(), NULL))
	\|\| !TEST_true(BN_is_zero(r))		\|\| !TEST_BN_eq_zero(r)
	\|\| !TEST_true(BN_mod_exp_mont(r, a, zero, BN_value_one(),		\|\| !TEST_true(BN_mod_exp_mont(r, a, zero, BN_value_one(),
	NULL, NULL))		NULL, NULL))
	\|\| !TEST_true(BN_is_zero(r))		\|\| !TEST_BN_eq_zero(r)
	\|\| !TEST_true(BN_mod_exp_mont_consttime(r, a, zero,		\|\| !TEST_true(BN_mod_exp_mont_consttime(r, a, zero,
	BN_value_one(),		BN_value_one(),
	NULL, NULL))		NULL, NULL))
	\|\| !TEST_true(BN_is_zero(r))		\|\| !TEST_BN_eq_zero(r)
	\|\| !TEST_true(BN_mod_exp_mont_word(r, 42, zero,		\|\| !TEST_true(BN_mod_exp_mont_word(r, 42, zero,
	BN_value_one(), NULL, NULL))		BN_value_one(), NULL, NULL))
	\|\| !TEST_true(BN_is_zero(r)))		\|\| !TEST_BN_eq_zero(r))
	goto err;		goto err;

	st = 1;		st = 1;

test/ecdsatest.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -167,8 +167,8 @@ static int x9_62_test_internal(int nid, const char r_in, const char s_in)
	if (!TEST_true(BN_dec2bn(&r, r_in)) \|\| !TEST_true(BN_dec2bn(&s, s_in)))		if (!TEST_true(BN_dec2bn(&r, r_in)) \|\| !TEST_true(BN_dec2bn(&s, s_in)))
	goto x962_int_err;		goto x962_int_err;
	ECDSA_SIG_get0(signature, &sig_r, &sig_s);		ECDSA_SIG_get0(signature, &sig_r, &sig_s);
	if (!TEST_int_eq(BN_cmp(sig_r, r), 0)		if (!TEST_BN_eq(sig_r, r)
	\|\| !TEST_int_eq(BN_cmp(sig_s, s), 0))		\|\| !TEST_BN_eq(sig_s, s))
	goto x962_int_err;		goto x962_int_err;

	/* verify the signature */		/* verify the signature */

test/ectest.c

+9 −9

test/exptest.c

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -109,7 +109,7 @@ static int test_mod_exp_zero()
	if (!TEST_true(BN_mod_exp_mont_word(r, one_word, p, m, ctx, NULL)))		if (!TEST_true(BN_mod_exp_mont_word(r, one_word, p, m, ctx, NULL)))
	goto err;		goto err;

	if (!TEST_true(BN_is_zero(r))) {		if (!TEST_BN_eq_zero(r)) {
	fprintf(stderr, "BN_mod_exp_mont_word failed:\n");		fprintf(stderr, "BN_mod_exp_mont_word failed:\n");
	fprintf(stderr, "1 ** 0 mod 1 = r (should be 0)\n");		fprintf(stderr, "1 ** 0 mod 1 = r (should be 0)\n");
	BN_print_var(r);		BN_print_var(r);
	@@ -173,15 +173,15 @@ static int test_mod_exp(int round)
	\|\| !TEST_true(BN_mod_exp_mont_consttime(r_mont_const, a, b, m, ctx, NULL)))		\|\| !TEST_true(BN_mod_exp_mont_consttime(r_mont_const, a, b, m, ctx, NULL)))
	goto err;		goto err;

	if (!TEST_int_eq(BN_cmp(r_simple, r_mont), 0)		if (!TEST_BN_eq(r_simple, r_mont)
	\|\| !TEST_int_eq(BN_cmp(r_simple, r_recp), 0)		\|\| !TEST_BN_eq(r_simple, r_recp)
	\|\| !TEST_int_eq(BN_cmp(r_simple, r_mont_const), 0)) {		\|\| !TEST_BN_eq(r_simple, r_mont_const)) {
	if (BN_cmp(r_simple, r_mont) != 0)		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)		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)		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(a);
	BN_print_var(b);		BN_print_var(b);

test/srptest.c

+8 −11

Original line number	Original line	Diff line number	Diff line
	@@ -70,7 +70,7 @@ static int run_srp(const char username, const char client_pass,
	/* Server random */		/* Server random */
	RAND_bytes(rand_tmp, sizeof(rand_tmp));		RAND_bytes(rand_tmp, sizeof(rand_tmp));
	b = BN_bin2bn(rand_tmp, sizeof(rand_tmp), NULL);		b = BN_bin2bn(rand_tmp, sizeof(rand_tmp), NULL);
	if (!TEST_false(BN_is_zero(b)))		if (!TEST_BN_ne_zero(b))
	goto end;		goto end;
	showbn("b", b);		showbn("b", b);

	@@ -84,7 +84,7 @@ static int run_srp(const char username, const char client_pass,
	/* Client random */		/* Client random */
	RAND_bytes(rand_tmp, sizeof(rand_tmp));		RAND_bytes(rand_tmp, sizeof(rand_tmp));
	a = BN_bin2bn(rand_tmp, sizeof(rand_tmp), NULL);		a = BN_bin2bn(rand_tmp, sizeof(rand_tmp), NULL);
	if (!TEST_false(BN_is_zero(a)))		if (!TEST_BN_ne_zero(a))
	goto end;		goto end;
	showbn("a", a);		showbn("a", a);

	@@ -107,7 +107,7 @@ static int run_srp(const char username, const char client_pass,
	Kserver = SRP_Calc_server_key(Apub, v, u, b, GN->N);		Kserver = SRP_Calc_server_key(Apub, v, u, b, GN->N);
	showbn("Server's key", Kserver);		showbn("Server's key", Kserver);

	if (!TEST_int_eq(BN_cmp(Kclient, Kserver), 0))		if (!TEST_BN_eq(Kclient, Kserver))
	goto end;		goto end;

	ret = 1;		ret = 1;
	@@ -130,19 +130,16 @@ end:
	static int check_bn(const char name, const BIGNUM bn, const char *hexbn)		static int check_bn(const char name, const BIGNUM bn, const char *hexbn)
	{		{
	BIGNUM *tmp = NULL;		BIGNUM *tmp = NULL;
			int r;

	if (!TEST_true(BN_hex2bn(&tmp, hexbn)))		if (!TEST_true(BN_hex2bn(&tmp, hexbn)))
	return 0;		return 0;

	if (!TEST_int_eq(BN_cmp(bn, tmp), 0)) {		if (BN_cmp(bn, tmp) != 0)
	TEST_info("Unexpected %s value", name);		TEST_error("unexpected %s value", name);
	showbn("expecting", tmp);		r = TEST_BN_eq(bn, tmp);
	showbn("received", bn);
	BN_free(tmp);		BN_free(tmp);
	return 0;		return r;
	}
	BN_free(tmp);
	return 1;
	}		}

	/* SRP test vectors from RFC5054 */		/* SRP test vectors from RFC5054 */

Original line number	Original line	Diff line number	Diff line
	@@ -345,7 +345,7 @@ static int prime_field_tests(void)
	/* G_y value taken from the standard: */		/* G_y value taken from the standard: */
	if (!TEST_true(BN_hex2bn(&z, "23a62855"		if (!TEST_true(BN_hex2bn(&z, "23a62855"
	"3168947d59dcc912042351377ac5fb32"))		"3168947d59dcc912042351377ac5fb32"))
	\|\| !TEST_int_eq(0, BN_cmp(y, z))		\|\| !TEST_BN_eq(y, z)
	\|\| !TEST_int_eq(EC_GROUP_get_degree(group), 160)		\|\| !TEST_int_eq(EC_GROUP_get_degree(group), 160)
	\|\| !group_order_tests(group)		\|\| !group_order_tests(group)
	\|\| !TEST_ptr(P_160 = EC_GROUP_new(EC_GROUP_method_of(group)))		\|\| !TEST_ptr(P_160 = EC_GROUP_new(EC_GROUP_method_of(group)))
	@@ -380,7 +380,7 @@ static int prime_field_tests(void)
	/* G_y value taken from the standard: */		/* G_y value taken from the standard: */
	if (!TEST_true(BN_hex2bn(&z, "07192B95FFC8DA78"		if (!TEST_true(BN_hex2bn(&z, "07192B95FFC8DA78"
	"631011ED6B24CDD573F977A11E794811"))		"631011ED6B24CDD573F977A11E794811"))
	\|\| !TEST_int_eq(0, BN_cmp(y, z))		\|\| !TEST_BN_eq(y, z)
	\|\| !TEST_true(BN_add(yplusone, y, BN_value_one()))		\|\| !TEST_true(BN_add(yplusone, y, BN_value_one()))
	/*		/*
	* When (x, y) is on the curve, (x, y + 1) is, as it happens, not,		* When (x, y) is on the curve, (x, y + 1) is, as it happens, not,
	@@ -422,7 +422,7 @@ static int prime_field_tests(void)
	/* G_y value taken from the standard: */		/* G_y value taken from the standard: */
	if (!TEST_true(BN_hex2bn(&z, "BD376388B5F723FB4C22DFE6"		if (!TEST_true(BN_hex2bn(&z, "BD376388B5F723FB4C22DFE6"
	"CD4375A05A07476444D5819985007E34"))		"CD4375A05A07476444D5819985007E34"))
	\|\| !TEST_int_eq(0, BN_cmp(y, z))		\|\| !TEST_BN_eq(y, z)
	\|\| !TEST_true(BN_add(yplusone, y, BN_value_one()))		\|\| !TEST_true(BN_add(yplusone, y, BN_value_one()))
	/*		/*
	* When (x, y) is on the curve, (x, y + 1) is, as it happens, not,		* When (x, y) is on the curve, (x, y + 1) is, as it happens, not,
	@@ -465,7 +465,7 @@ static int prime_field_tests(void)
	/* G_y value taken from the standard: */		/* G_y value taken from the standard: */
	if (!TEST_true(BN_hex2bn(&z, "4FE342E2FE1A7F9B8EE7EB4A7C0F9E16"		if (!TEST_true(BN_hex2bn(&z, "4FE342E2FE1A7F9B8EE7EB4A7C0F9E16"
	"2BCE33576B315ECECBB6406837BF51F5"))		"2BCE33576B315ECECBB6406837BF51F5"))
	\|\| !TEST_int_eq(0, BN_cmp(y, z))		\|\| !TEST_BN_eq(y, z)
	\|\| !TEST_true(BN_add(yplusone, y, BN_value_one()))		\|\| !TEST_true(BN_add(yplusone, y, BN_value_one()))
	/*		/*
	* When (x, y) is on the curve, (x, y + 1) is, as it happens, not,		* When (x, y) is on the curve, (x, y + 1) is, as it happens, not,
	@@ -514,7 +514,7 @@ static int prime_field_tests(void)
	if (!TEST_true(BN_hex2bn(&z, "3617DE4A96262C6F5D9E98BF9292DC29"		if (!TEST_true(BN_hex2bn(&z, "3617DE4A96262C6F5D9E98BF9292DC29"
	"F8F41DBD289A147CE9DA3113B5F0B8C0"		"F8F41DBD289A147CE9DA3113B5F0B8C0"
	"0A60B1CE1D7E819D7A431D7C90EA0E5F"))		"0A60B1CE1D7E819D7A431D7C90EA0E5F"))
	\|\| !TEST_int_eq(0, BN_cmp(y, z))		\|\| !TEST_BN_eq(y, z)
	\|\| !TEST_true(BN_add(yplusone, y, BN_value_one()))		\|\| !TEST_true(BN_add(yplusone, y, BN_value_one()))
	/*		/*
	* When (x, y) is on the curve, (x, y + 1) is, as it happens, not,		* When (x, y) is on the curve, (x, y + 1) is, as it happens, not,

Admin message