feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

SM2 and SP_MATH: don't enable SM2 with SP_MATH

Browse Source 
No implementation of SM2 with SP so can't use SM2 with SP MATH.
This commit is contained in:
Sean Parkinson
2023-07-19 10:56:46 +10:00
parent 8065ba18f9
commit dceb7c0122
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -3460,6 +3460,10 @@ AC_ARG_ENABLE([sm2],
[ ENABLED_SM2=no ] [ ENABLED_SM2=no ]
) )
if test "$ENABLED_SP_MATH" = "yes"
then
ENABLED_SM2="no"
fi
if test "$ENABLED_SM2" = "yes" if test "$ENABLED_SM2" = "yes"
then then
if test "$ENABLED_ECC" = "no" if test "$ENABLED_ECC" = "no"
@ -9341,6 +9345,7 @@ echo " * ECC Minimum Bits: $ENABLED_ECCMINSZ"
echo " * FPECC: $ENABLED_FPECC" echo " * FPECC: $ENABLED_FPECC"
echo " * ECC_ENCRYPT: $ENABLED_ECC_ENCRYPT" echo " * ECC_ENCRYPT: $ENABLED_ECC_ENCRYPT"
echo " * Brainpool: $ENABLED_BRAINPOOL" echo " * Brainpool: $ENABLED_BRAINPOOL"
echo " * SM2: $ENABLED_SM2"
echo " * CURVE25519: $ENABLED_CURVE25519" echo " * CURVE25519: $ENABLED_CURVE25519"
echo " * ED25519: $ENABLED_ED25519" echo " * ED25519: $ENABLED_ED25519"
echo " * ED25519 streaming: $ENABLED_ED25519_STREAM" echo " * ED25519 streaming: $ENABLED_ED25519_STREAM"

8
wolfcrypt/src/ecc.c
View File

@ -666,7 +666,7 @@ enum {
#endif #endif
#define ecc_oid_brainpoolp256r1_sz CODED_BRAINPOOLP256R1_SZ #define ecc_oid_brainpoolp256r1_sz CODED_BRAINPOOLP256R1_SZ
#endif /* HAVE_ECC_BRAINPOOL */ #endif /* HAVE_ECC_BRAINPOOL */
#ifdef WOLFSSL_SM2 #if defined(WOLFSSL_SM2) && !defined(WOLFSSL_SP_MATH)
#ifdef HAVE_OID_ENCODING #ifdef HAVE_OID_ENCODING
#define CODED_SM2P256V1 {1,2,156,10197,1,301} #define CODED_SM2P256V1 {1,2,156,10197,1,301}
#define CODED_SM2P256V1_SZ 6 #define CODED_SM2P256V1_SZ 6
@ -680,7 +680,7 @@ enum {
#define ecc_oid_sm2p256v1 CODED_SM2P256V1 #define ecc_oid_sm2p256v1 CODED_SM2P256V1
#endif #endif
#define ecc_oid_sm2p256v1_sz CODED_SM2P256V1_SZ #define ecc_oid_sm2p256v1_sz CODED_SM2P256V1_SZ
#endif /* WOLFSSL_SM2 */ #endif /* WOLFSSL_SM2 && !WOLFSSL_SP_MATH */
#endif /* ECC256 */ #endif /* ECC256 */
#ifdef ECC320 #ifdef ECC320
#ifdef HAVE_ECC_BRAINPOOL #ifdef HAVE_ECC_BRAINPOOL
@ -1161,7 +1161,7 @@ const ecc_set_type ecc_sets[] = {
1, /* cofactor */ 1, /* cofactor */
}, },
#endif /* HAVE_ECC_BRAINPOOL */ #endif /* HAVE_ECC_BRAINPOOL */
#ifdef WOLFSSL_SM2 #if defined(WOLFSSL_SM2) && !defined(WOLFSSL_SP_MATH)
{ {
32, /* size/bytes */ 32, /* size/bytes */
ECC_SM2P256V1, /* ID */ ECC_SM2P256V1, /* ID */
@ -1179,7 +1179,7 @@ const ecc_set_type ecc_sets[] = {
ECC_SM2P256V1_OID, /* oid sum */ ECC_SM2P256V1_OID, /* oid sum */
1, /* cofactor */ 1, /* cofactor */
}, },
#endif /* WOLFSSL_SM2 */ #endif /* WOLFSSL_SM2 && !WOLFSSL_SP_MATH */
#endif /* ECC256 */ #endif /* ECC256 */
#ifdef ECC320 #ifdef ECC320
#ifdef HAVE_ECC_BRAINPOOL #ifdef HAVE_ECC_BRAINPOOL