Skip to content

Commit dceb7c0

Browse files
committed
SM2 and SP_MATH: don't enable SM2 with SP_MATH
No implementation of SM2 with SP so can't use SM2 with SP MATH.
1 parent 8065ba1 commit dceb7c0

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

configure.ac

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3460,6 +3460,10 @@ AC_ARG_ENABLE([sm2],
34603460
[ ENABLED_SM2=no ]
34613461
)
34623462

3463+
if test "$ENABLED_SP_MATH" = "yes"
3464+
then
3465+
ENABLED_SM2="no"
3466+
fi
34633467
if test "$ENABLED_SM2" = "yes"
34643468
then
34653469
if test "$ENABLED_ECC" = "no"
@@ -9341,6 +9345,7 @@ echo " * ECC Minimum Bits: $ENABLED_ECCMINSZ"
93419345
echo " * FPECC: $ENABLED_FPECC"
93429346
echo " * ECC_ENCRYPT: $ENABLED_ECC_ENCRYPT"
93439347
echo " * Brainpool: $ENABLED_BRAINPOOL"
9348+
echo " * SM2: $ENABLED_SM2"
93449349
echo " * CURVE25519: $ENABLED_CURVE25519"
93459350
echo " * ED25519: $ENABLED_ED25519"
93469351
echo " * ED25519 streaming: $ENABLED_ED25519_STREAM"

wolfcrypt/src/ecc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ enum {
666666
#endif
667667
#define ecc_oid_brainpoolp256r1_sz CODED_BRAINPOOLP256R1_SZ
668668
#endif /* HAVE_ECC_BRAINPOOL */
669-
#ifdef WOLFSSL_SM2
669+
#if defined(WOLFSSL_SM2) && !defined(WOLFSSL_SP_MATH)
670670
#ifdef HAVE_OID_ENCODING
671671
#define CODED_SM2P256V1 {1,2,156,10197,1,301}
672672
#define CODED_SM2P256V1_SZ 6
@@ -680,7 +680,7 @@ enum {
680680
#define ecc_oid_sm2p256v1 CODED_SM2P256V1
681681
#endif
682682
#define ecc_oid_sm2p256v1_sz CODED_SM2P256V1_SZ
683-
#endif /* WOLFSSL_SM2 */
683+
#endif /* WOLFSSL_SM2 && !WOLFSSL_SP_MATH */
684684
#endif /* ECC256 */
685685
#ifdef ECC320
686686
#ifdef HAVE_ECC_BRAINPOOL
@@ -1161,7 +1161,7 @@ const ecc_set_type ecc_sets[] = {
11611161
1, /* cofactor */
11621162
},
11631163
#endif /* HAVE_ECC_BRAINPOOL */
1164-
#ifdef WOLFSSL_SM2
1164+
#if defined(WOLFSSL_SM2) && !defined(WOLFSSL_SP_MATH)
11651165
{
11661166
32, /* size/bytes */
11671167
ECC_SM2P256V1, /* ID */
@@ -1179,7 +1179,7 @@ const ecc_set_type ecc_sets[] = {
11791179
ECC_SM2P256V1_OID, /* oid sum */
11801180
1, /* cofactor */
11811181
},
1182-
#endif /* WOLFSSL_SM2 */
1182+
#endif /* WOLFSSL_SM2 && !WOLFSSL_SP_MATH */
11831183
#endif /* ECC256 */
11841184
#ifdef ECC320
11851185
#ifdef HAVE_ECC_BRAINPOOL

0 commit comments

Comments
 (0)