kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle malloc failures better in bn_test.cc.

Browse Source 
Those EXPECTs should be ASSERTs to ensure bn is not null.

Change-Id: Icb54c242ffbde5f8eaa67f19f214c9eef13705ea
Reviewed-on: https://boringssl-review.googlesource.com/22366
Reviewed-by: Steven Valdez <svaldez@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
David Benjamin 2017-10-30 14:11:43 -04:00 committed by CQ bot account: commit-bot@chromium.org
parent 4f94a8381a
commit 8f06074a91
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crypto/fipsmodule/bn/bn_test.cc
View File

@ -778,27 +778,27 @@ static int DecimalToBIGNUM(bssl::UniquePtr<BIGNUM> *out, const char *in) {
TEST_F(BNTest, Dec2BN) { TEST_F(BNTest, Dec2BN) {
bssl::UniquePtr<BIGNUM> bn; bssl::UniquePtr<BIGNUM> bn;
int ret = DecimalToBIGNUM(&bn, "0"); int ret = DecimalToBIGNUM(&bn, "0");
EXPECT_EQ(1, ret); ASSERT_EQ(1, ret);
EXPECT_TRUE(BN_is_zero(bn.get())); EXPECT_TRUE(BN_is_zero(bn.get()));
EXPECT_FALSE(BN_is_negative(bn.get())); EXPECT_FALSE(BN_is_negative(bn.get()));
ret = DecimalToBIGNUM(&bn, "256"); ret = DecimalToBIGNUM(&bn, "256");
EXPECT_EQ(3, ret); ASSERT_EQ(3, ret);
EXPECT_TRUE(BN_is_word(bn.get(), 256)); EXPECT_TRUE(BN_is_word(bn.get(), 256));
EXPECT_FALSE(BN_is_negative(bn.get())); EXPECT_FALSE(BN_is_negative(bn.get()));
ret = DecimalToBIGNUM(&bn, "-42"); ret = DecimalToBIGNUM(&bn, "-42");
EXPECT_EQ(3, ret); ASSERT_EQ(3, ret);
EXPECT_TRUE(BN_abs_is_word(bn.get(), 42)); EXPECT_TRUE(BN_abs_is_word(bn.get(), 42));
EXPECT_TRUE(BN_is_negative(bn.get())); EXPECT_TRUE(BN_is_negative(bn.get()));
ret = DecimalToBIGNUM(&bn, "-0"); ret = DecimalToBIGNUM(&bn, "-0");
EXPECT_EQ(2, ret); ASSERT_EQ(2, ret);
EXPECT_TRUE(BN_is_zero(bn.get())); EXPECT_TRUE(BN_is_zero(bn.get()));
EXPECT_FALSE(BN_is_negative(bn.get())); EXPECT_FALSE(BN_is_negative(bn.get()));
ret = DecimalToBIGNUM(&bn, "42trailing garbage is ignored"); ret = DecimalToBIGNUM(&bn, "42trailing garbage is ignored");
EXPECT_EQ(2, ret); ASSERT_EQ(2, ret);
EXPECT_TRUE(BN_abs_is_word(bn.get(), 42)); EXPECT_TRUE(BN_abs_is_word(bn.get(), 42));
EXPECT_FALSE(BN_is_negative(bn.get())); EXPECT_FALSE(BN_is_negative(bn.get()));
} }
@ -806,27 +806,27 @@ TEST_F(BNTest, Dec2BN) {
TEST_F(BNTest, Hex2BN) { TEST_F(BNTest, Hex2BN) {
bssl::UniquePtr<BIGNUM> bn; bssl::UniquePtr<BIGNUM> bn;
int ret = HexToBIGNUM(&bn, "0"); int ret = HexToBIGNUM(&bn, "0");
EXPECT_EQ(1, ret); ASSERT_EQ(1, ret);
EXPECT_TRUE(BN_is_zero(bn.get())); EXPECT_TRUE(BN_is_zero(bn.get()));
EXPECT_FALSE(BN_is_negative(bn.get())); EXPECT_FALSE(BN_is_negative(bn.get()));
ret = HexToBIGNUM(&bn, "256"); ret = HexToBIGNUM(&bn, "256");
EXPECT_EQ(3, ret); ASSERT_EQ(3, ret);
EXPECT_TRUE(BN_is_word(bn.get(), 0x256)); EXPECT_TRUE(BN_is_word(bn.get(), 0x256));
EXPECT_FALSE(BN_is_negative(bn.get())); EXPECT_FALSE(BN_is_negative(bn.get()));
ret = HexToBIGNUM(&bn, "-42"); ret = HexToBIGNUM(&bn, "-42");
EXPECT_EQ(3, ret); ASSERT_EQ(3, ret);
EXPECT_TRUE(BN_abs_is_word(bn.get(), 0x42)); EXPECT_TRUE(BN_abs_is_word(bn.get(), 0x42));
EXPECT_TRUE(BN_is_negative(bn.get())); EXPECT_TRUE(BN_is_negative(bn.get()));
ret = HexToBIGNUM(&bn, "-0"); ret = HexToBIGNUM(&bn, "-0");
EXPECT_EQ(2, ret); ASSERT_EQ(2, ret);
EXPECT_TRUE(BN_is_zero(bn.get())); EXPECT_TRUE(BN_is_zero(bn.get()));
EXPECT_FALSE(BN_is_negative(bn.get())); EXPECT_FALSE(BN_is_negative(bn.get()));
ret = HexToBIGNUM(&bn, "abctrailing garbage is ignored"); ret = HexToBIGNUM(&bn, "abctrailing garbage is ignored");
EXPECT_EQ(3, ret); ASSERT_EQ(3, ret);
EXPECT_TRUE(BN_is_word(bn.get(), 0xabc)); EXPECT_TRUE(BN_is_word(bn.get(), 0xabc));
EXPECT_FALSE(BN_is_negative(bn.get())); EXPECT_FALSE(BN_is_negative(bn.get()));
} }