diff options
| author | Jack Lloyd <jack.lloyd@ribose.com> | 2018-04-06 15:45:41 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-06-04 12:59:40 +0200 |
| commit | e425f90fffd33786b6d45b46b67dc8bb61baecc7 (patch) | |
| tree | ccfa1b6a799a793a86ca0fd8dfe277c8a5641a90 /test | |
| parent | sha/asm/sha512p8-ppc.pl: improve POWER9 performance by ~10%. (diff) | |
| download | openssl-e425f90fffd33786b6d45b46b67dc8bb61baecc7.tar.xz openssl-e425f90fffd33786b6d45b46b67dc8bb61baecc7.zip | |
Make SM2 functions private
Address issue #5670
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6386)
Diffstat (limited to 'test')
| -rw-r--r-- | test/build.info | 20 | ||||
| -rw-r--r-- | test/sm2_crypt_internal_test.c (renamed from test/sm2crypttest.c) | 2 | ||||
| -rw-r--r-- | test/sm2_sign_internal_test.c (renamed from test/sm2sigtest.c) | 2 |
3 files changed, 13 insertions, 11 deletions
diff --git a/test/build.info b/test/build.info index 000153d510..ee302e233c 100644 --- a/test/build.info +++ b/test/build.info @@ -28,7 +28,6 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN aborttest test_test \ sanitytest exdatatest bntest \ ectest ecstresstest ecdsatest gmdifftest pbelutest ideatest \ - sm2sigtest sm2crypttest \ md2test \ hmactest \ rc2test rc4test rc5test \ @@ -89,14 +88,6 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN INCLUDE[ecdsatest]=../include DEPEND[ecdsatest]=../libcrypto libtestutil.a - SOURCE[sm2sigtest]=sm2sigtest.c - INCLUDE[sm2sigtest]=../include - DEPEND[sm2sigtest]=../libcrypto libtestutil.a - - SOURCE[sm2crypttest]=sm2crypttest.c - INCLUDE[sm2crypttest]=../include - DEPEND[sm2crypttest]=../libcrypto libtestutil.a - SOURCE[gmdifftest]=gmdifftest.c INCLUDE[gmdifftest]=../include DEPEND[gmdifftest]=../libcrypto libtestutil.a @@ -448,6 +439,9 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN IF[{- !$disabled{siphash} -}] PROGRAMS_NO_INST=siphash_internal_test ENDIF + IF[{- !$disabled{sm2} -}] + PROGRAMS_NO_INST=sm2_crypt_internal_test sm2_sign_internal_test + ENDIF IF[{- !$disabled{sm4} -}] PROGRAMS_NO_INST=sm4_internal_test ENDIF @@ -491,6 +485,14 @@ 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[sm4_internal_test]=sm4_internal_test.c INCLUDE[sm4_internal_test]=.. ../include ../crypto/include DEPEND[sm4_internal_test]=../libcrypto.a libtestutil.a diff --git a/test/sm2crypttest.c b/test/sm2_crypt_internal_test.c index cd72cb0938..5325fa3fc5 100644 --- a/test/sm2crypttest.c +++ b/test/sm2_crypt_internal_test.c @@ -21,7 +21,7 @@ #ifndef OPENSSL_NO_SM2 -# include <openssl/sm2.h> +# include "internal/sm2.h" static RAND_METHOD fake_rand; static const RAND_METHOD *saved_rand; diff --git a/test/sm2sigtest.c b/test/sm2_sign_internal_test.c index 33be78315b..87f0d73382 100644 --- a/test/sm2sigtest.c +++ b/test/sm2_sign_internal_test.c @@ -22,7 +22,7 @@ #ifndef OPENSSL_NO_SM2 -# include <openssl/sm2.h> +# include "internal/sm2.h" static RAND_METHOD fake_rand; static const RAND_METHOD *saved_rand; |