From f73164ca1e3d221a580b3ea6298432c180075f26 Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Tue, 19 Jun 2018 20:08:59 +0200 Subject: [PATCH] Fix test sm2 test failure with ec blinding [extended tests] Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/6529) --- test/sm2_internal_test.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/test/sm2_internal_test.c b/test/sm2_internal_test.c index 4ae7303329..d4ec01e96e 100644 --- a/test/sm2_internal_test.c +++ b/test/sm2_internal_test.c @@ -28,6 +28,7 @@ static const RAND_METHOD *saved_rand; static uint8_t *fake_rand_bytes = NULL; static size_t fake_rand_bytes_offset = 0; +static size_t fake_rand_size = 0; static int get_faked_bytes(unsigned char *buf, int num) { @@ -36,6 +37,9 @@ static int get_faked_bytes(unsigned char *buf, int num) if (fake_rand_bytes == NULL) return saved_rand->bytes(buf, num); + if (!TEST_size_t_le(fake_rand_bytes_offset + num, fake_rand_size)) + return 0; + for (i = 0; i != num; ++i) buf[i] = fake_rand_bytes[fake_rand_bytes_offset + i]; fake_rand_bytes_offset += num; @@ -54,6 +58,7 @@ static int start_fake_rand(const char *hex_bytes) fake_rand_bytes = OPENSSL_hexstr2buf(hex_bytes, NULL); fake_rand_bytes_offset = 0; + fake_rand_size = strlen(hex_bytes) / 2; /* set new RAND_METHOD */ if (!TEST_true(RAND_set_rand_method(&fake_rand))) @@ -170,7 +175,8 @@ static int test_sm2_crypt(const EC_GROUP *group, start_fake_rand(k_hex); if (!TEST_true(sm2_encrypt(key, digest, (const uint8_t *)message, msg_len, - ctext, &ctext_len))) { + ctext, &ctext_len)) + || !TEST_size_t_eq(fake_rand_bytes_offset, fake_rand_size)) { restore_rand(); goto done; } @@ -222,7 +228,9 @@ static int sm2_crypt_test(void) EVP_sm3(), "1649AB77A00637BD5E2EFE283FBF353534AA7F7CB89463F208DDBC2920BB0DA0", "encryption standard", - "004C62EEFD6ECFC2B95B92FD6C3D9575148AFA17425546D49018E5388D49DD7B4F", + "004C62EEFD6ECFC2B95B92FD6C3D9575148AFA17425546D49018E5388D49DD7B4F" + "0092e8ff62146873c258557548500ab2df2a365e0609ab67640a1f6d57d7b17820" + "008349312695a3e1d2f46905f39a766487f2432e95d6be0cb009fe8c69fd8825a7", "307B0220245C26FB68B1DDDDB12C4B6BF9F2B6D5FE60A383B0D18D1C4144ABF1" "7F6252E7022076CB9264C2A7E88E52B19903FDC47378F605E36811F5C07423A2" "4B84400F01B804209C3D7360C30156FAB7C80A0276712DA9D8094A634B766D3A" @@ -235,7 +243,9 @@ static int sm2_crypt_test(void) EVP_sha256(), "1649AB77A00637BD5E2EFE283FBF353534AA7F7CB89463F208DDBC2920BB0DA0", "encryption standard", - "004C62EEFD6ECFC2B95B92FD6C3D9575148AFA17425546D49018E5388D49DD7B4F", + "004C62EEFD6ECFC2B95B92FD6C3D9575148AFA17425546D49018E5388D49DD7B4F" + "003da18008784352192d70f22c26c243174a447ba272fec64163dd4742bae8bc98" + "00df17605cf304e9dd1dfeb90c015e93b393a6f046792f790a6fa4228af67d9588", "307B0220245C26FB68B1DDDDB12C4B6BF9F2B6D5FE60A383B0D18D1C4144ABF17F" "6252E7022076CB9264C2A7E88E52B19903FDC47378F605E36811F5C07423A24B84" "400F01B80420BE89139D07853100EFA763F60CBE30099EA3DF7F8F364F9D10A5E9" @@ -285,10 +295,12 @@ static int test_sm2_sign(const EC_GROUP *group, start_fake_rand(k_hex); sig = sm2_do_sign(key, EVP_sm3(), userid, (const uint8_t *)message, msg_len); - restore_rand(); - - if (!TEST_ptr(sig)) + if (!TEST_ptr(sig) + || !TEST_size_t_eq(fake_rand_bytes_offset, fake_rand_size)) { + restore_rand(); goto done; + } + restore_rand(); ECDSA_SIG_get0(sig, &sig_r, &sig_s); @@ -337,7 +349,8 @@ static int sm2_sig_test(void) "ALICE123@YAHOO.COM", "128B2FA8BD433C6C068C8D803DFF79792A519A55171B1B650C23661D15897263", "message digest", - "006CB28D99385C175C94F94E934817663FC176D925DD72B727260DBAAE1FB2F96F", + "006CB28D99385C175C94F94E934817663FC176D925DD72B727260DBAAE1FB2F96F" + "007c47811054c6f99613a578eb8453706ccb96384fe7df5c171671e760bfa8be3a", "40F1EC59F793D9F49E09DCEF49130D4194F79FB1EED2CAA55BACDB49C4E755D1", "6FC6DAC32C5D5CF10C77DFB20F7C2EB667A457872FB09EC56327A67EC7DEEBE7"))) goto done; -- 2.25.1