Skip to content

Commit c29227d

Browse files
Merge pull request #6694 from kareem-wolfssl/gh6689
Change enum ecc_curve_load_mask into defines
2 parents 65401cf + 1bb0199 commit c29227d

1 file changed

Lines changed: 11 additions & 14 deletions

File tree

wolfcrypt/src/ecc.c

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,25 +1380,22 @@ typedef struct ecc_curve_spec {
13801380
byte load_mask;
13811381
} ecc_curve_spec;
13821382

1383-
enum ecc_curve_load_mask {
1384-
ECC_CURVE_FIELD_NONE = 0x00,
1385-
ECC_CURVE_FIELD_PRIME = 0x01,
1386-
ECC_CURVE_FIELD_AF = 0x02,
1383+
#define ECC_CURVE_FIELD_NONE 0x00
1384+
#define ECC_CURVE_FIELD_PRIME 0x01
1385+
#define ECC_CURVE_FIELD_AF 0x02
13871386
#ifdef USE_ECC_B_PARAM
1388-
ECC_CURVE_FIELD_BF = 0x04,
1387+
#define ECC_CURVE_FIELD_BF 0x04
13891388
#endif
1390-
ECC_CURVE_FIELD_ORDER = 0x08,
1391-
ECC_CURVE_FIELD_GX = 0x10,
1392-
ECC_CURVE_FIELD_GY = 0x20,
1389+
#define ECC_CURVE_FIELD_ORDER 0x08
1390+
#define ECC_CURVE_FIELD_GX 0x10
1391+
#define ECC_CURVE_FIELD_GY 0x20
13931392
#ifdef USE_ECC_B_PARAM
1394-
ECC_CURVE_FIELD_ALL = 0x3F,
1395-
ECC_CURVE_FIELD_COUNT = 6,
1393+
#define ECC_CURVE_FIELD_ALL 0x3F
1394+
#define ECC_CURVE_FIELD_COUNT 6
13961395
#else
1397-
ECC_CURVE_FIELD_ALL = 0x3B,
1398-
ECC_CURVE_FIELD_COUNT = 5,
1396+
#define ECC_CURVE_FIELD_ALL 0x3B
1397+
#define ECC_CURVE_FIELD_COUNT 5
13991398
#endif
1400-
WOLF_ENUM_DUMMY_LAST_ELEMENT(ecc_curve_load_mask)
1401-
};
14021399

14031400
#if defined(WOLFSSL_XILINX_CRYPT_VERSAL)
14041401
static const u32 xil_curve_type[ECC_CURVE_MAX] = {

0 commit comments

Comments
 (0)