From e14d6cf691c9d8ad49df280b580b6836a67c6a19 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 31 May 2018 13:49:47 +0100 Subject: [PATCH 1/1] Improve use of the test framework in the SM2 internal tests Also general clean up of those tests Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/6386) --- crypto/ec/ec_pmeth.c | 16 +- crypto/include/internal/sm2.h | 12 +- crypto/sm2/sm2_crypt.c | 38 +- test/build.info | 12 +- ...sign_internal.t => 03-test_internal_sm2.t} | 4 +- test/recipes/03-test_sm2_crypt_internal.t | 19 - test/sm2_crypt_internal_test.c | 254 ------------ test/sm2_internal_test.c | 364 ++++++++++++++++++ test/sm2_sign_internal_test.c | 238 ------------ 9 files changed, 413 insertions(+), 544 deletions(-) rename test/recipes/{03-test_sm2_sign_internal.t => 03-test_internal_sm2.t} (84%) delete mode 100644 test/recipes/03-test_sm2_crypt_internal.t delete mode 100644 test/sm2_crypt_internal_test.c create mode 100644 test/sm2_internal_test.c delete mode 100644 test/sm2_sign_internal_test.c diff --git a/crypto/ec/ec_pmeth.c b/crypto/ec/ec_pmeth.c index eefe2d0cd5..50331d32c4 100644 --- a/crypto/ec/ec_pmeth.c +++ b/crypto/ec/ec_pmeth.c @@ -223,9 +223,11 @@ static int pkey_ecies_encrypt(EVP_PKEY_CTX *ctx, md_type = NID_sm3; if (out == NULL) { - *outlen = SM2_ciphertext_size(ec, EVP_get_digestbynid(md_type), - inlen); - ret = 1; + if (!SM2_ciphertext_size(ec, EVP_get_digestbynid(md_type), inlen, + outlen)) + ret = -1; + else + ret = 1; } else { ret = SM2_encrypt(ec, EVP_get_digestbynid(md_type), @@ -261,9 +263,11 @@ static int pkey_ecies_decrypt(EVP_PKEY_CTX *ctx, md_type = NID_sm3; if (out == NULL) { - *outlen = SM2_plaintext_size(ec, EVP_get_digestbynid(md_type), - inlen); - ret = 1; + if (!SM2_plaintext_size(ec, EVP_get_digestbynid(md_type), inlen, + outlen)) + ret = -1; + else + ret = 1; } else { ret = SM2_decrypt(ec, EVP_get_digestbynid(md_type), diff --git a/crypto/include/internal/sm2.h b/crypto/include/internal/sm2.h index af24c0146b..91420a520c 100644 --- a/crypto/include/internal/sm2.h +++ b/crypto/include/internal/sm2.h @@ -57,13 +57,11 @@ int SM2_verify(int type, const unsigned char *dgst, int dgstlen, /* * SM2 encryption */ -size_t SM2_ciphertext_size(const EC_KEY *key, - const EVP_MD *digest, - size_t msg_len); +int SM2_ciphertext_size(const EC_KEY *key, const EVP_MD *digest, size_t msg_len, + size_t *ct_size); -size_t SM2_plaintext_size(const EC_KEY *key, - const EVP_MD *digest, - size_t msg_len); +int SM2_plaintext_size(const EC_KEY *key, const EVP_MD *digest, size_t msg_len, + size_t *pt_size); int SM2_encrypt(const EC_KEY *key, const EVP_MD *digest, @@ -76,8 +74,6 @@ int SM2_decrypt(const EC_KEY *key, const uint8_t *ciphertext, size_t ciphertext_len, uint8_t *ptext_buf, size_t *ptext_len); -int ERR_load_SM2_strings(void); - # ifdef __cplusplus } # endif diff --git a/crypto/sm2/sm2_crypt.c b/crypto/sm2/sm2_crypt.c index ab2d18ee2e..2a0fdceea7 100644 --- a/crypto/sm2/sm2_crypt.c +++ b/crypto/sm2/sm2_crypt.c @@ -59,23 +59,43 @@ static size_t EC_field_size(const EC_GROUP *group) return field_size; } -size_t SM2_plaintext_size(const EC_KEY *key, const EVP_MD *digest, size_t msg_len) +int SM2_plaintext_size(const EC_KEY *key, const EVP_MD *digest, size_t msg_len, + size_t *pt_size) { const size_t field_size = EC_field_size(EC_KEY_get0_group(key)); - const size_t md_size = EVP_MD_size(digest); + const int md_size = EVP_MD_size(digest); + size_t overhead; - const size_t overhead = 10 + 2 * field_size + md_size; - if(msg_len <= overhead) - return 0; + if (md_size < 0) { + SM2err(SM2_F_SM2_ENCRYPT, SM2_R_INVALID_DIGEST); + return 0; + } + if (field_size == 0) { + SM2err(SM2_F_SM2_ENCRYPT, SM2_R_INVALID_FIELD); + return 0; + } + + overhead = 10 + 2 * field_size + (size_t)md_size; + if(msg_len <= overhead) { + SM2err(SM2_F_SM2_ENCRYPT, SM2_R_INVALID_ENCODING); + return 0; + } - return msg_len - overhead; + *pt_size = msg_len - overhead; + return 1; } -size_t SM2_ciphertext_size(const EC_KEY *key, const EVP_MD *digest, size_t msg_len) +int SM2_ciphertext_size(const EC_KEY *key, const EVP_MD *digest, size_t msg_len, + size_t *ct_size) { const size_t field_size = EC_field_size(EC_KEY_get0_group(key)); - const size_t md_size = EVP_MD_size(digest); - return 10 + 2 * field_size + md_size + msg_len; + const int md_size = EVP_MD_size(digest); + + if (field_size == 0 || md_size < 0) + return 0; + + *ct_size = 10 + 2 * field_size + (size_t)md_size + msg_len; + return 1; } int SM2_encrypt(const EC_KEY *key, diff --git a/test/build.info b/test/build.info index ee302e233c..9fe511ace1 100644 --- a/test/build.info +++ b/test/build.info @@ -440,7 +440,7 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN PROGRAMS_NO_INST=siphash_internal_test ENDIF IF[{- !$disabled{sm2} -}] - PROGRAMS_NO_INST=sm2_crypt_internal_test sm2_sign_internal_test + PROGRAMS_NO_INST=sm2_internal_test ENDIF IF[{- !$disabled{sm4} -}] PROGRAMS_NO_INST=sm4_internal_test @@ -485,13 +485,9 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN INCLUDE[siphash_internal_test]=.. ../include ../crypto/include DEPEND[siphash_internal_test]=../libcrypto.a libtestutil.a - SOURCE[sm2_sign_internal_test]=sm2_sign_internal_test.c - INCLUDE[sm2_sign_internal_test]=../include ../crypto/include - DEPEND[sm2_sign_internal_test]=../libcrypto.a libtestutil.a - - SOURCE[sm2_crypt_internal_test]=sm2_crypt_internal_test.c - INCLUDE[sm2_crypt_internal_test]=../include ../crypto/include - DEPEND[sm2_crypt_internal_test]=../libcrypto.a libtestutil.a + SOURCE[sm2_internal_test]=sm2_internal_test.c + INCLUDE[sm2_internal_test]=../include ../crypto/include + DEPEND[sm2_internal_test]=../libcrypto.a libtestutil.a SOURCE[sm4_internal_test]=sm4_internal_test.c INCLUDE[sm4_internal_test]=.. ../include ../crypto/include diff --git a/test/recipes/03-test_sm2_sign_internal.t b/test/recipes/03-test_internal_sm2.t similarity index 84% rename from test/recipes/03-test_sm2_sign_internal.t rename to test/recipes/03-test_internal_sm2.t index c3d3d3262f..b93716e4e3 100644 --- a/test/recipes/03-test_sm2_sign_internal.t +++ b/test/recipes/03-test_internal_sm2.t @@ -11,9 +11,9 @@ use OpenSSL::Test; # get 'plan' use OpenSSL::Test::Simple; use OpenSSL::Test::Utils; -setup("test_sm2_sign_internal"); +setup("test_internal_sm2"); plan skip_all => "This test is unsupported in a shared library build on Windows" if $^O eq 'MSWin32' && !disabled("shared"); -simple_test("test_sm2_sign_internal", "sm2_sign_internal_test", "sm2"); +simple_test("test_internal_sm2", "sm2_internal_test", "sm2"); diff --git a/test/recipes/03-test_sm2_crypt_internal.t b/test/recipes/03-test_sm2_crypt_internal.t deleted file mode 100644 index e027a080c4..0000000000 --- a/test/recipes/03-test_sm2_crypt_internal.t +++ /dev/null @@ -1,19 +0,0 @@ -#! /usr/bin/env perl -# Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved. -# -# Licensed under the OpenSSL license (the "License"). You may not use -# this file except in compliance with the License. You can obtain a copy -# in the file LICENSE in the source distribution or at -# https://www.openssl.org/source/license.html - -use strict; -use OpenSSL::Test; # get 'plan' -use OpenSSL::Test::Simple; -use OpenSSL::Test::Utils; - -setup("test_sm2_crypt_internal_sm2"); - -plan skip_all => "This test is unsupported in a shared library build on Windows" - if $^O eq 'MSWin32' && !disabled("shared"); - -simple_test("test_sm2_crypt_internal_sm2", "sm2_crypt_internal_test", "sm2"); diff --git a/test/sm2_crypt_internal_test.c b/test/sm2_crypt_internal_test.c deleted file mode 100644 index 5325fa3fc5..0000000000 --- a/test/sm2_crypt_internal_test.c +++ /dev/null @@ -1,254 +0,0 @@ -/* - * Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved. - * - * Licensed under the OpenSSL license (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy - * in the file LICENSE in the source distribution or at - * https://www.openssl.org/source/license.html - */ - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include "testutil.h" - -#ifndef OPENSSL_NO_SM2 - -# include "internal/sm2.h" - -static RAND_METHOD fake_rand; -static const RAND_METHOD *saved_rand; - -static uint8_t *fake_rand_bytes = NULL; -static size_t fake_rand_bytes_offset = 0; - -static int get_faked_bytes(unsigned char *buf, int num) -{ - int i; - - if (fake_rand_bytes == NULL) - return saved_rand->bytes(buf, num); - - for (i = 0; i != num; ++i) - buf[i] = fake_rand_bytes[fake_rand_bytes_offset + i]; - fake_rand_bytes_offset += num; - return 1; -} - -static int start_fake_rand(const char *hex_bytes) -{ - /* save old rand method */ - if (!TEST_ptr(saved_rand = RAND_get_rand_method())) - return 0; - - fake_rand = *saved_rand; - /* use own random function */ - fake_rand.bytes = get_faked_bytes; - - fake_rand_bytes = OPENSSL_hexstr2buf(hex_bytes, NULL); - fake_rand_bytes_offset = 0; - - /* set new RAND_METHOD */ - if (!TEST_true(RAND_set_rand_method(&fake_rand))) - return 0; - return 1; -} - -static int restore_rand(void) -{ - OPENSSL_free(fake_rand_bytes); - fake_rand_bytes = NULL; - fake_rand_bytes_offset = 0; - if (!TEST_true(RAND_set_rand_method(saved_rand))) - return 0; - return 1; -} - -static EC_GROUP *create_EC_group(const char *p_hex, const char *a_hex, - const char *b_hex, const char *x_hex, - const char *y_hex, const char *order_hex, - const char *cof_hex) -{ - BIGNUM *p = NULL; - BIGNUM *a = NULL; - BIGNUM *b = NULL; - BIGNUM *g_x = NULL; - BIGNUM *g_y = NULL; - BIGNUM *order = NULL; - BIGNUM *cof = NULL; - EC_POINT *generator = NULL; - EC_GROUP *group = NULL; - - BN_hex2bn(&p, p_hex); - BN_hex2bn(&a, a_hex); - BN_hex2bn(&b, b_hex); - - group = EC_GROUP_new_curve_GFp(p, a, b, NULL); - BN_free(p); - BN_free(a); - BN_free(b); - - if (group == NULL) - return NULL; - - generator = EC_POINT_new(group); - if (generator == NULL) - return NULL; - - BN_hex2bn(&g_x, x_hex); - BN_hex2bn(&g_y, y_hex); - - if (EC_POINT_set_affine_coordinates_GFp(group, generator, g_x, g_y, NULL) == - 0) - return NULL; - - BN_free(g_x); - BN_free(g_y); - - BN_hex2bn(&order, order_hex); - BN_hex2bn(&cof, cof_hex); - - if (EC_GROUP_set_generator(group, generator, order, cof) == 0) - return NULL; - - EC_POINT_free(generator); - BN_free(order); - BN_free(cof); - - return group; -} - -static int test_sm2(const EC_GROUP *group, - const EVP_MD *digest, - const char *privkey_hex, - const char *message, - const char *k_hex, const char *ctext_hex) -{ - const size_t msg_len = strlen(message); - - BIGNUM *priv = NULL; - EC_KEY *key = NULL; - EC_POINT *pt = NULL; - unsigned char *expected = OPENSSL_hexstr2buf(ctext_hex, NULL); - - size_t ctext_len = 0; - size_t ptext_len = 0; - uint8_t *ctext = NULL; - uint8_t *recovered = NULL; - size_t recovered_len = msg_len; - - int rc = 0; - - BN_hex2bn(&priv, privkey_hex); - - key = EC_KEY_new(); - EC_KEY_set_group(key, group); - EC_KEY_set_private_key(key, priv); - - pt = EC_POINT_new(group); - EC_POINT_mul(group, pt, priv, NULL, NULL, NULL); - - EC_KEY_set_public_key(key, pt); - BN_free(priv); - EC_POINT_free(pt); - - ctext_len = SM2_ciphertext_size(key, digest, msg_len); - ctext = OPENSSL_zalloc(ctext_len); - if (ctext == NULL) - goto done; - - start_fake_rand(k_hex); - rc = SM2_encrypt(key, digest, - (const uint8_t *)message, msg_len, ctext, &ctext_len); - restore_rand(); - - TEST_mem_eq(ctext, ctext_len, expected, ctext_len); - if (rc == 0) - goto done; - - ptext_len = SM2_plaintext_size(key, digest, ctext_len); - - TEST_int_eq(ptext_len, msg_len); - - recovered = OPENSSL_zalloc(ptext_len); - if (recovered == NULL) - goto done; - rc = SM2_decrypt(key, digest, ctext, ctext_len, recovered, &recovered_len); - - TEST_int_eq(recovered_len, msg_len); - TEST_mem_eq(recovered, recovered_len, message, msg_len); - if (rc == 0) - return 0; - - rc = 1; - done: - - OPENSSL_free(ctext); - OPENSSL_free(recovered); - OPENSSL_free(expected); - EC_KEY_free(key); - return rc; -} - -static int sm2_crypt_test(void) -{ - int rc; - EC_GROUP *test_group = - create_EC_group - ("8542D69E4C044F18E8B92435BF6FF7DE457283915C45517D722EDB8B08F1DFC3", - "787968B4FA32C3FD2417842E73BBFEFF2F3C848B6831D7E0EC65228B3937E498", - "63E4C6D3B23B0C849CF84241484BFE48F61D59A5B16BA06E6E12D1DA27C5249A", - "421DEBD61B62EAB6746434EBC3CC315E32220B3BADD50BDC4C4E6C147FEDD43D", - "0680512BCBB42C07D47349D2153B70C4E5D7FDFCBFA36EA1A85841B9E46E09A2", - "8542D69E4C044F18E8B92435BF6FF7DD297720630485628D5AE74EE7C32E79B7", - "1"); - - if (test_group == NULL) - return 0; - - rc = test_sm2(test_group, - EVP_sm3(), - "1649AB77A00637BD5E2EFE283FBF353534AA7F7CB89463F208DDBC2920BB0DA0", - "encryption standard", - "004C62EEFD6ECFC2B95B92FD6C3D9575148AFA17425546D49018E5388D49DD7B4F", - "307B0220245C26FB68B1DDDDB12C4B6BF9F2B6D5FE60A383B0D18D1C4144ABF1" - "7F6252E7022076CB9264C2A7E88E52B19903FDC47378F605E36811F5C07423A2" - "4B84400F01B804209C3D7360C30156FAB7C80A0276712DA9D8094A634B766D3A" - "285E07480653426D0413650053A89B41C418B0C3AAD00D886C00286467"); - - if (rc == 0) - return 0; - - /* Same test as above except using SHA-256 instead of SM3 */ - rc = test_sm2(test_group, - EVP_sha256(), - "1649AB77A00637BD5E2EFE283FBF353534AA7F7CB89463F208DDBC2920BB0DA0", - "encryption standard", - "004C62EEFD6ECFC2B95B92FD6C3D9575148AFA17425546D49018E5388D49DD7B4F", - "307B0220245C26FB68B1DDDDB12C4B6BF9F2B6D5FE60A383B0D18D1C4144ABF17F6252E7022076CB9264C2A7E88E52B19903FDC47378F605E36811F5C07423A24B84400F01B80420BE89139D07853100EFA763F60CBE30099EA3DF7F8F364F9D10A5E988E3C5AAFC0413229E6C9AEE2BB92CAD649FE2C035689785DA33"); - if (rc == 0) - return 0; - - EC_GROUP_free(test_group); - - return 1; -} - -#endif - -int setup_tests(void) -{ -#ifdef OPENSSL_NO_SM2 - TEST_note("SM2 is disabled."); -#else - ADD_TEST(sm2_crypt_test); -#endif - return 1; -} diff --git a/test/sm2_internal_test.c b/test/sm2_internal_test.c new file mode 100644 index 0000000000..272045fc3a --- /dev/null +++ b/test/sm2_internal_test.c @@ -0,0 +1,364 @@ +/* + * Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include "testutil.h" + +#ifndef OPENSSL_NO_SM2 + +# include "internal/sm2.h" + +static RAND_METHOD fake_rand; +static const RAND_METHOD *saved_rand; + +static uint8_t *fake_rand_bytes = NULL; +static size_t fake_rand_bytes_offset = 0; + +static int get_faked_bytes(unsigned char *buf, int num) +{ + int i; + + if (fake_rand_bytes == NULL) + return saved_rand->bytes(buf, num); + + for (i = 0; i != num; ++i) + buf[i] = fake_rand_bytes[fake_rand_bytes_offset + i]; + fake_rand_bytes_offset += num; + return 1; +} + +static int start_fake_rand(const char *hex_bytes) +{ + /* save old rand method */ + if (!TEST_ptr(saved_rand = RAND_get_rand_method())) + return 0; + + fake_rand = *saved_rand; + /* use own random function */ + fake_rand.bytes = get_faked_bytes; + + fake_rand_bytes = OPENSSL_hexstr2buf(hex_bytes, NULL); + fake_rand_bytes_offset = 0; + + /* set new RAND_METHOD */ + if (!TEST_true(RAND_set_rand_method(&fake_rand))) + return 0; + return 1; +} + +static int restore_rand(void) +{ + OPENSSL_free(fake_rand_bytes); + fake_rand_bytes = NULL; + fake_rand_bytes_offset = 0; + if (!TEST_true(RAND_set_rand_method(saved_rand))) + return 0; + return 1; +} + +static EC_GROUP *create_EC_group(const char *p_hex, const char *a_hex, + const char *b_hex, const char *x_hex, + const char *y_hex, const char *order_hex, + const char *cof_hex) +{ + BIGNUM *p = NULL; + BIGNUM *a = NULL; + BIGNUM *b = NULL; + BIGNUM *g_x = NULL; + BIGNUM *g_y = NULL; + BIGNUM *order = NULL; + BIGNUM *cof = NULL; + EC_POINT *generator = NULL; + EC_GROUP *group = NULL; + int ok = 0; + + if (!TEST_true(BN_hex2bn(&p, p_hex)) + || !TEST_true(BN_hex2bn(&a, a_hex)) + || !TEST_true(BN_hex2bn(&b, b_hex))) + goto done; + + group = EC_GROUP_new_curve_GFp(p, a, b, NULL); + if (!TEST_ptr(group)) + goto done; + + generator = EC_POINT_new(group); + if (!TEST_ptr(generator)) + goto done; + + if (!TEST_true(BN_hex2bn(&g_x, x_hex)) + || !TEST_true(BN_hex2bn(&g_y, y_hex)) + || !TEST_true(EC_POINT_set_affine_coordinates_GFp(group, generator, + g_x, g_y, NULL))) + goto done; + + if (!TEST_true(BN_hex2bn(&order, order_hex)) + || !TEST_true(BN_hex2bn(&cof, cof_hex)) + || !TEST_true(EC_GROUP_set_generator(group, generator, order, cof))) + goto done; + + ok = 1; +done: + BN_free(p); + BN_free(a); + BN_free(b); + BN_free(g_x); + BN_free(g_y); + EC_POINT_free(generator); + BN_free(order); + BN_free(cof); + if (!ok) { + EC_GROUP_free(group); + group = NULL; + } + + return group; +} + +static int test_sm2_crypt(const EC_GROUP *group, + const EVP_MD *digest, + const char *privkey_hex, + const char *message, + const char *k_hex, const char *ctext_hex) +{ + const size_t msg_len = strlen(message); + BIGNUM *priv = NULL; + EC_KEY *key = NULL; + EC_POINT *pt = NULL; + unsigned char *expected = OPENSSL_hexstr2buf(ctext_hex, NULL); + size_t ctext_len = 0; + size_t ptext_len = 0; + uint8_t *ctext = NULL; + uint8_t *recovered = NULL; + size_t recovered_len = msg_len; + int rc = 0; + + if (!TEST_ptr(expected) + || !TEST_true(BN_hex2bn(&priv, privkey_hex))) + goto done; + + key = EC_KEY_new(); + if (!TEST_ptr(key) + || !TEST_true(EC_KEY_set_group(key, group)) + || !TEST_true(EC_KEY_set_private_key(key, priv))) + goto done; + + pt = EC_POINT_new(group); + if (!TEST_ptr(pt) + || !TEST_true(EC_POINT_mul(group, pt, priv, NULL, NULL, NULL)) + || !TEST_true(EC_KEY_set_public_key(key, pt)) + || !TEST_true(SM2_ciphertext_size(key, digest, msg_len, &ctext_len))) + goto done; + + ctext = OPENSSL_zalloc(ctext_len); + if (!TEST_ptr(ctext)) + goto done; + + start_fake_rand(k_hex); + if (!TEST_true(SM2_encrypt(key, digest, (const uint8_t *)message, msg_len, + ctext, &ctext_len))) { + restore_rand(); + goto done; + } + restore_rand(); + + if (!TEST_mem_eq(ctext, ctext_len, expected, ctext_len)) + goto done; + + if (!TEST_true(SM2_plaintext_size(key, digest, ctext_len, &ptext_len)) + || !TEST_int_eq(ptext_len, msg_len)) + goto done; + + recovered = OPENSSL_zalloc(ptext_len); + if (!TEST_ptr(recovered) + || !TEST_true(SM2_decrypt(key, digest, ctext, ctext_len, recovered, &recovered_len)) + || !TEST_int_eq(recovered_len, msg_len) + || !TEST_mem_eq(recovered, recovered_len, message, msg_len)) + goto done; + + rc = 1; + done: + BN_free(priv); + EC_POINT_free(pt); + OPENSSL_free(ctext); + OPENSSL_free(recovered); + OPENSSL_free(expected); + EC_KEY_free(key); + return rc; +} + +static int sm2_crypt_test(void) +{ + int testresult = 1; + EC_GROUP *test_group = + create_EC_group + ("8542D69E4C044F18E8B92435BF6FF7DE457283915C45517D722EDB8B08F1DFC3", + "787968B4FA32C3FD2417842E73BBFEFF2F3C848B6831D7E0EC65228B3937E498", + "63E4C6D3B23B0C849CF84241484BFE48F61D59A5B16BA06E6E12D1DA27C5249A", + "421DEBD61B62EAB6746434EBC3CC315E32220B3BADD50BDC4C4E6C147FEDD43D", + "0680512BCBB42C07D47349D2153B70C4E5D7FDFCBFA36EA1A85841B9E46E09A2", + "8542D69E4C044F18E8B92435BF6FF7DD297720630485628D5AE74EE7C32E79B7", + "1"); + + if (!TEST_ptr(test_group)) + goto done; + + if (!test_sm2_crypt( + test_group, + EVP_sm3(), + "1649AB77A00637BD5E2EFE283FBF353534AA7F7CB89463F208DDBC2920BB0DA0", + "encryption standard", + "004C62EEFD6ECFC2B95B92FD6C3D9575148AFA17425546D49018E5388D49DD7B4F", + "307B0220245C26FB68B1DDDDB12C4B6BF9F2B6D5FE60A383B0D18D1C4144ABF1" + "7F6252E7022076CB9264C2A7E88E52B19903FDC47378F605E36811F5C07423A2" + "4B84400F01B804209C3D7360C30156FAB7C80A0276712DA9D8094A634B766D3A" + "285E07480653426D0413650053A89B41C418B0C3AAD00D886C00286467")) + goto done; + + /* Same test as above except using SHA-256 instead of SM3 */ + if (!test_sm2_crypt( + test_group, + EVP_sha256(), + "1649AB77A00637BD5E2EFE283FBF353534AA7F7CB89463F208DDBC2920BB0DA0", + "encryption standard", + "004C62EEFD6ECFC2B95B92FD6C3D9575148AFA17425546D49018E5388D49DD7B4F", + "307B0220245C26FB68B1DDDDB12C4B6BF9F2B6D5FE60A383B0D18D1C4144ABF17F" + "6252E7022076CB9264C2A7E88E52B19903FDC47378F605E36811F5C07423A24B84" + "400F01B80420BE89139D07853100EFA763F60CBE30099EA3DF7F8F364F9D10A5E9" + "88E3C5AAFC0413229E6C9AEE2BB92CAD649FE2C035689785DA33")) + goto done; + + testresult = 1; + done: + EC_GROUP_free(test_group); + + return testresult; +} + +static int test_sm2_sign(const EC_GROUP *group, + const char *userid, + const char *privkey_hex, + const char *message, + const char *k_hex, + const char *r_hex, + const char *s_hex) +{ + const size_t msg_len = strlen(message); + int ok = 0; + BIGNUM *priv = NULL; + EC_POINT *pt = NULL; + EC_KEY *key = NULL; + ECDSA_SIG *sig = NULL; + const BIGNUM *sig_r = NULL; + const BIGNUM *sig_s = NULL; + BIGNUM *r = NULL; + BIGNUM *s = NULL; + + if (!TEST_true(BN_hex2bn(&priv, privkey_hex))) + goto done; + + key = EC_KEY_new(); + if (!TEST_ptr(key) + || !TEST_true(EC_KEY_set_group(key, group)) + || !TEST_true(EC_KEY_set_private_key(key, priv))) + goto done; + + pt = EC_POINT_new(group); + if (!TEST_ptr(pt) + || !TEST_true(EC_POINT_mul(group, pt, priv, NULL, NULL, NULL)) + || !TEST_true(EC_KEY_set_public_key(key, pt))) + goto done; + + 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)) + goto done; + + ECDSA_SIG_get0(sig, &sig_r, &sig_s); + + if (!TEST_true(BN_hex2bn(&r, r_hex)) + || !TEST_true(BN_hex2bn(&s, s_hex)) + || !TEST_BN_eq(r, sig_r) + || !TEST_BN_eq(s, sig_s)) + goto done; + + ok = SM2_do_verify(key, EVP_sm3(), sig, userid, (const uint8_t *)message, + msg_len); + + /* We goto done whether this passes or fails */ + TEST_true(ok); + + done: + ECDSA_SIG_free(sig); + EC_POINT_free(pt); + EC_KEY_free(key); + BN_free(priv); + BN_free(r); + BN_free(s); + + return ok; +} + +static int sm2_sig_test(void) +{ + int testresult = 0; + /* From draft-shen-sm2-ecdsa-02 */ + EC_GROUP *test_group = + create_EC_group + ("8542D69E4C044F18E8B92435BF6FF7DE457283915C45517D722EDB8B08F1DFC3", + "787968B4FA32C3FD2417842E73BBFEFF2F3C848B6831D7E0EC65228B3937E498", + "63E4C6D3B23B0C849CF84241484BFE48F61D59A5B16BA06E6E12D1DA27C5249A", + "421DEBD61B62EAB6746434EBC3CC315E32220B3BADD50BDC4C4E6C147FEDD43D", + "0680512BCBB42C07D47349D2153B70C4E5D7FDFCBFA36EA1A85841B9E46E09A2", + "8542D69E4C044F18E8B92435BF6FF7DD297720630485628D5AE74EE7C32E79B7", + "1"); + + if (!TEST_ptr(test_group)) + goto done; + + if (!TEST_true(test_sm2_sign( + test_group, + "ALICE123@YAHOO.COM", + "128B2FA8BD433C6C068C8D803DFF79792A519A55171B1B650C23661D15897263", + "message digest", + "006CB28D99385C175C94F94E934817663FC176D925DD72B727260DBAAE1FB2F96F", + "40F1EC59F793D9F49E09DCEF49130D4194F79FB1EED2CAA55BACDB49C4E755D1", + "6FC6DAC32C5D5CF10C77DFB20F7C2EB667A457872FB09EC56327A67EC7DEEBE7"))) + goto done; + + testresult = 1; + + done: + EC_GROUP_free(test_group); + + return testresult; +} + +#endif + +int setup_tests(void) +{ +#ifdef OPENSSL_NO_SM2 + TEST_note("SM2 is disabled."); +#else + ADD_TEST(sm2_crypt_test); + ADD_TEST(sm2_sig_test); +#endif + return 1; +} diff --git a/test/sm2_sign_internal_test.c b/test/sm2_sign_internal_test.c deleted file mode 100644 index 87f0d73382..0000000000 --- a/test/sm2_sign_internal_test.c +++ /dev/null @@ -1,238 +0,0 @@ -/* - * Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved. - * Copyright 2017 Ribose Inc. All Rights Reserved. - * - * Licensed under the OpenSSL license (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy - * in the file LICENSE in the source distribution or at - * https://www.openssl.org/source/license.html - */ - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include "testutil.h" - -#ifndef OPENSSL_NO_SM2 - -# include "internal/sm2.h" - -static RAND_METHOD fake_rand; -static const RAND_METHOD *saved_rand; - -static uint8_t *fake_rand_bytes = NULL; -static size_t fake_rand_bytes_offset = 0; - -static int get_faked_bytes(unsigned char *buf, int num) -{ - int i; - - if (fake_rand_bytes == NULL) - return saved_rand->bytes(buf, num); - - for (i = 0; i != num; ++i) - buf[i] = fake_rand_bytes[fake_rand_bytes_offset + i]; - fake_rand_bytes_offset += num; - return 1; -} - -static int start_fake_rand(const char *hex_bytes) -{ - /* save old rand method */ - if (!TEST_ptr(saved_rand = RAND_get_rand_method())) - return 0; - - fake_rand = *saved_rand; - /* use own random function */ - fake_rand.bytes = get_faked_bytes; - - fake_rand_bytes = OPENSSL_hexstr2buf(hex_bytes, NULL); - fake_rand_bytes_offset = 0; - - /* set new RAND_METHOD */ - if (!TEST_true(RAND_set_rand_method(&fake_rand))) - return 0; - return 1; -} - -static int restore_rand(void) -{ - OPENSSL_free(fake_rand_bytes); - fake_rand_bytes = NULL; - fake_rand_bytes_offset = 0; - if (!TEST_true(RAND_set_rand_method(saved_rand))) - return 0; - return 1; -} - -static EC_GROUP *create_EC_group(const char *p_hex, const char *a_hex, - const char *b_hex, const char *x_hex, - const char *y_hex, const char *order_hex, - const char *cof_hex) -{ - BIGNUM *p = NULL; - BIGNUM *a = NULL; - BIGNUM *b = NULL; - BIGNUM *g_x = NULL; - BIGNUM *g_y = NULL; - BIGNUM *order = NULL; - BIGNUM *cof = NULL; - EC_POINT *generator = NULL; - EC_GROUP *group = NULL; - - BN_hex2bn(&p, p_hex); - BN_hex2bn(&a, a_hex); - BN_hex2bn(&b, b_hex); - - group = EC_GROUP_new_curve_GFp(p, a, b, NULL); - BN_free(p); - BN_free(a); - BN_free(b); - - if (group == NULL) - return NULL; - - generator = EC_POINT_new(group); - if (generator == NULL) - return NULL; - - BN_hex2bn(&g_x, x_hex); - BN_hex2bn(&g_y, y_hex); - - if (EC_POINT_set_affine_coordinates_GFp(group, generator, g_x, g_y, NULL) == - 0) - return NULL; - - BN_free(g_x); - BN_free(g_y); - - BN_hex2bn(&order, order_hex); - BN_hex2bn(&cof, cof_hex); - - if (EC_GROUP_set_generator(group, generator, order, cof) == 0) - return NULL; - - EC_POINT_free(generator); - BN_free(order); - BN_free(cof); - - return group; -} - - -static int test_sm2(const EC_GROUP *group, - const char *userid, - const char *privkey_hex, - const char *message, - const char *k_hex, const char *r_hex, const char *s_hex) -{ - const size_t msg_len = strlen(message); - int ok = -1; - BIGNUM *priv = NULL; - EC_POINT *pt = NULL; - EC_KEY *key = NULL; - ECDSA_SIG *sig = NULL; - const BIGNUM *sig_r = NULL; - const BIGNUM *sig_s = NULL; - BIGNUM *r = NULL; - BIGNUM *s = NULL; - - BN_hex2bn(&priv, privkey_hex); - - key = EC_KEY_new(); - EC_KEY_set_group(key, group); - EC_KEY_set_private_key(key, priv); - - pt = EC_POINT_new(group); - EC_POINT_mul(group, pt, priv, NULL, NULL, NULL); - EC_KEY_set_public_key(key, pt); - - start_fake_rand(k_hex); - sig = SM2_do_sign(key, EVP_sm3(), userid, (const uint8_t *)message, msg_len); - restore_rand(); - - if (sig == NULL) - return 0; - - ECDSA_SIG_get0(sig, &sig_r, &sig_s); - - BN_hex2bn(&r, r_hex); - BN_hex2bn(&s, s_hex); - - if (BN_cmp(r, sig_r) != 0) { - printf("Signature R mismatch: "); - BN_print_fp(stdout, r); - printf(" != "); - BN_print_fp(stdout, sig_r); - printf("\n"); - ok = 0; - } - if (BN_cmp(s, sig_s) != 0) { - printf("Signature S mismatch: "); - BN_print_fp(stdout, s); - printf(" != "); - BN_print_fp(stdout, sig_s); - printf("\n"); - ok = 0; - } - - ok = SM2_do_verify(key, EVP_sm3(), sig, userid, (const uint8_t *)message, msg_len); - - ECDSA_SIG_free(sig); - EC_POINT_free(pt); - EC_KEY_free(key); - BN_free(priv); - BN_free(r); - BN_free(s); - - return ok; -} - -static int sm2_sig_test(void) -{ - int rc = 0; - /* From draft-shen-sm2-ecdsa-02 */ - EC_GROUP *test_group = - create_EC_group - ("8542D69E4C044F18E8B92435BF6FF7DE457283915C45517D722EDB8B08F1DFC3", - "787968B4FA32C3FD2417842E73BBFEFF2F3C848B6831D7E0EC65228B3937E498", - "63E4C6D3B23B0C849CF84241484BFE48F61D59A5B16BA06E6E12D1DA27C5249A", - "421DEBD61B62EAB6746434EBC3CC315E32220B3BADD50BDC4C4E6C147FEDD43D", - "0680512BCBB42C07D47349D2153B70C4E5D7FDFCBFA36EA1A85841B9E46E09A2", - "8542D69E4C044F18E8B92435BF6FF7DD297720630485628D5AE74EE7C32E79B7", - "1"); - - if (test_group == NULL) - return 0; - - rc = test_sm2(test_group, - "ALICE123@YAHOO.COM", - "128B2FA8BD433C6C068C8D803DFF79792A519A55171B1B650C23661D15897263", - "message digest", - "006CB28D99385C175C94F94E934817663FC176D925DD72B727260DBAAE1FB2F96F", - "40F1EC59F793D9F49E09DCEF49130D4194F79FB1EED2CAA55BACDB49C4E755D1", - "6FC6DAC32C5D5CF10C77DFB20F7C2EB667A457872FB09EC56327A67EC7DEEBE7"); - - EC_GROUP_free(test_group); - - return rc; -} - -#endif - -int setup_tests(void) -{ -#ifdef OPENSSL_NO_SM2 - TEST_note("SM2 is disabled."); -#else - ADD_TEST(sm2_sig_test); -#endif - return 1; -} -- 2.34.1