Skip to content

Commit bbeca92

Browse files
sjaeckelkarel-m
sjaeckel
authored and
karel-m
committed
don't use deprecated LTC_ECCxxx defines anymore
1 parent 2393dc4 commit bbeca92

File tree

5 files changed

+74
-49
lines changed

5 files changed

+74
-49
lines changed

‎demos/timing.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -947,28 +947,28 @@ static void time_ecc(void)
947947
unsigned long i, w, x, y, z;
948948
int err, stat;
949949
static unsigned long sizes[] = {
950-
#ifdef LTC_ECC112
950+
#ifdef LTC_ECC_SECP112R1
951951
112/8,
952952
#endif
953-
#ifdef LTC_ECC128
953+
#ifdef LTC_ECC_SECP128R1
954954
128/8,
955955
#endif
956-
#ifdef LTC_ECC160
956+
#ifdef LTC_ECC_SECP160R1
957957
160/8,
958958
#endif
959-
#ifdef LTC_ECC192
959+
#ifdef LTC_ECC_SECP192R1
960960
192/8,
961961
#endif
962-
#ifdef LTC_ECC224
962+
#ifdef LTC_ECC_SECP224R1
963963
224/8,
964964
#endif
965-
#ifdef LTC_ECC256
965+
#ifdef LTC_ECC_SECP256R1
966966
256/8,
967967
#endif
968-
#ifdef LTC_ECC384
968+
#ifdef LTC_ECC_SECP384R1
969969
384/8,
970970
#endif
971-
#ifdef LTC_ECC521
971+
#ifdef LTC_ECC_SECP512R1
972972
521/8,
973973
#endif
974974
100000};

‎src/headers/tomcrypt_custom.h‎

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -528,15 +528,6 @@
528528
#define LTC_ECC_SECP256R1
529529
#define LTC_ECC_SECP384R1
530530
#define LTC_ECC_SECP521R1
531-
/* OLD deprecated (but still working) defines */
532-
#define LTC_ECC112
533-
#define LTC_ECC128
534-
#define LTC_ECC160
535-
#define LTC_ECC192
536-
#define LTC_ECC224
537-
#define LTC_ECC256
538-
#define LTC_ECC384
539-
#define LTC_ECC521
540531
#endif
541532
#endif
542533

@@ -653,6 +644,40 @@
653644
#endif
654645
#endif
655646

647+
/* ECC backwards compatibility */
648+
#if !defined(LTC_ECC_SECP112R1) && defined(LTC_ECC112)
649+
#define LTC_ECC_SECP112R1
650+
#undef LTC_ECC112
651+
#endif
652+
#if !defined(LTC_ECC_SECP128R1) && defined(LTC_ECC128)
653+
#define LTC_ECC_SECP128R1
654+
#undef LTC_ECC128
655+
#endif
656+
#if !defined(LTC_ECC_SECP160R1) && defined(LTC_ECC160)
657+
#define LTC_ECC_SECP160R1
658+
#undef LTC_ECC160
659+
#endif
660+
#if !defined(LTC_ECC_SECP192R1) && defined(LTC_ECC192)
661+
#define LTC_ECC_SECP192R1
662+
#undef LTC_ECC192
663+
#endif
664+
#if !defined(LTC_ECC_SECP224R1) && defined(LTC_ECC224)
665+
#define LTC_ECC_SECP224R1
666+
#undef LTC_ECC224
667+
#endif
668+
#if !defined(LTC_ECC_SECP256R1) && defined(LTC_ECC256)
669+
#define LTC_ECC_SECP256R1
670+
#undef LTC_ECC256
671+
#endif
672+
#if !defined(LTC_ECC_SECP384R1) && defined(LTC_ECC384)
673+
#define LTC_ECC_SECP384R1
674+
#undef LTC_ECC384
675+
#endif
676+
#if !defined(LTC_ECC_SECP512R1) && defined(LTC_ECC521)
677+
#define LTC_ECC_SECP521R1
678+
#undef LTC_ECC521
679+
#endif
680+
656681
/* ref: $Format:%D$ */
657682
/* git commit: $Format:%H$ */
658683
/* commit time: $Format:%ai$ */

‎src/pk/ecc/ecc.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* - http://www.ecc-brainpool.org/download/Domain-parameters.pdf (named: BRAINPOOLP*)
2525
*/
2626
const ltc_ecc_curve ltc_ecc_curves[] = {
27-
#if defined(LTC_ECC_SECP112R1) || defined(LTC_ECC112)
27+
#ifdef LTC_ECC_SECP112R1
2828
{
2929
/* prime */ "DB7C2ABF62E35E668076BEAD208B",
3030
/* A */ "DB7C2ABF62E35E668076BEAD2088",
@@ -48,7 +48,7 @@ const ltc_ecc_curve ltc_ecc_curves[] = {
4848
/* OID */ "1.3.132.0.7"
4949
},
5050
#endif
51-
#if defined(LTC_ECC_SECP128R1) || defined(LTC_ECC128)
51+
#ifdef LTC_ECC_SECP128R1
5252
{
5353
/* prime */ "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
5454
/* A */ "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC",
@@ -72,7 +72,7 @@ const ltc_ecc_curve ltc_ecc_curves[] = {
7272
/* OID */ "1.3.132.0.29"
7373
},
7474
#endif
75-
#if defined(LTC_ECC_SECP160R1) || defined(LTC_ECC160)
75+
#ifdef LTC_ECC_SECP160R1
7676
{
7777
/* prime */ "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF",
7878
/* A */ "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC",
@@ -108,7 +108,7 @@ const ltc_ecc_curve ltc_ecc_curves[] = {
108108
/* OID */ "1.3.132.0.9"
109109
},
110110
#endif
111-
#if defined(LTC_ECC_SECP192R1) || defined(LTC_ECC192)
111+
#ifdef LTC_ECC_SECP192R1
112112
{
113113
/* prime */ "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
114114
/* A */ "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
@@ -156,7 +156,7 @@ const ltc_ecc_curve ltc_ecc_curves[] = {
156156
/* OID */ "1.3.132.0.31"
157157
},
158158
#endif
159-
#if defined(LTC_ECC_SECP224R1) || defined(LTC_ECC224)
159+
#ifdef LTC_ECC_SECP224R1
160160
{
161161
/* prime */ "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001",
162162
/* A */ "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE",
@@ -180,7 +180,7 @@ const ltc_ecc_curve ltc_ecc_curves[] = {
180180
/* OID */ "1.3.132.0.32"
181181
},
182182
#endif
183-
#if defined(LTC_ECC_SECP256R1) || defined(LTC_ECC256)
183+
#ifdef LTC_ECC_SECP256R1
184184
{
185185
/* prime */ "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF",
186186
/* A */ "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC",
@@ -204,7 +204,7 @@ const ltc_ecc_curve ltc_ecc_curves[] = {
204204
/* OID */ "1.3.132.0.10"
205205
},
206206
#endif
207-
#if defined(LTC_ECC_SECP384R1) || defined(LTC_ECC384)
207+
#ifdef LTC_ECC_SECP384R1
208208
{
209209
/* prime */ "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFF",
210210
/* A */ "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFC",
@@ -216,7 +216,7 @@ const ltc_ecc_curve ltc_ecc_curves[] = {
216216
/* OID */ "1.3.132.0.34"
217217
},
218218
#endif
219-
#if defined(LTC_ECC_SECP521R1) || defined(LTC_ECC521)
219+
#ifdef LTC_ECC_SECP521R1
220220
{
221221
/* prime */ "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
222222
/* A */ "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC",

‎src/pk/ecc/ecc_get_curve.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ static const struct {
1515
const char *OID;
1616
const char *names[6];
1717
} _curve_names[] = {
18-
#if defined(LTC_ECC_SECP112R1) || defined(LTC_ECC112)
18+
#ifdef LTC_ECC_SECP112R1
1919
{
2020
"1.3.132.0.6", { "SECP112R1", "ECC-112", NULL }
2121
},
@@ -25,7 +25,7 @@ static const struct {
2525
"1.3.132.0.7", { "SECP112R2", NULL }
2626
},
2727
#endif
28-
#if defined(LTC_ECC_SECP128R1) || defined(LTC_ECC128)
28+
#ifdef LTC_ECC_SECP128R1
2929
{
3030
"1.3.132.0.28", { "SECP128R1", "ECC-128", NULL }
3131
},
@@ -35,7 +35,7 @@ static const struct {
3535
"1.3.132.0.29", { "SECP128R2", NULL }
3636
},
3737
#endif
38-
#if defined(LTC_ECC_SECP160R1) || defined(LTC_ECC160)
38+
#ifdef LTC_ECC_SECP160R1
3939
{
4040
"1.3.132.0.8", { "SECP160R1", "ECC-160", NULL }
4141
},
@@ -50,7 +50,7 @@ static const struct {
5050
"1.3.132.0.9", { "SECP160K1", NULL }
5151
},
5252
#endif
53-
#if defined(LTC_ECC_SECP192R1) || defined(LTC_ECC192)
53+
#ifdef LTC_ECC_SECP192R1
5454
{
5555
"1.2.840.10045.3.1.1", { "SECP192R1", "NISTP192", "PRIME192V1", "ECC-192", "P-192", NULL }
5656
},
@@ -70,7 +70,7 @@ static const struct {
7070
"1.3.132.0.31", { "SECP192K1", NULL }
7171
},
7272
#endif
73-
#if defined(LTC_ECC_SECP224R1) || defined(LTC_ECC224)
73+
#ifdef LTC_ECC_SECP224R1
7474
{
7575
"1.3.132.0.33", { "SECP224R1", "NISTP224", "ECC-224", "P-224", NULL }
7676
},
@@ -80,7 +80,7 @@ static const struct {
8080
"1.3.132.0.32", { "SECP224K1", NULL }
8181
},
8282
#endif
83-
#if defined(LTC_ECC_SECP256R1) || defined(LTC_ECC256)
83+
#ifdef LTC_ECC_SECP256R1
8484
{
8585
"1.2.840.10045.3.1.7", { "SECP256R1", "NISTP256", "PRIME256V1", "ECC-256", "P-256", NULL }
8686
},
@@ -90,12 +90,12 @@ static const struct {
9090
"1.3.132.0.10", { "SECP256K1", NULL }
9191
},
9292
#endif
93-
#if defined(LTC_ECC_SECP384R1) || defined(LTC_ECC384)
93+
#ifdef LTC_ECC_SECP384R1
9494
{
9595
"1.3.132.0.34", { "SECP384R1", "NISTP384", "ECC-384", "P-384", NULL }
9696
},
9797
#endif
98-
#if defined(LTC_ECC_SECP521R1) || defined(LTC_ECC521)
98+
#ifdef LTC_ECC_SECP521R1
9999
{
100100
"1.3.132.0.35", { "SECP521R1", "NISTP521", "ECC-521", "P-521", NULL }
101101
},

‎tests/ecc_test.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,28 @@
1111
#if defined(LTC_MECC)
1212

1313
static unsigned int sizes[] = {
14-
#ifdef LTC_ECC112
14+
#ifdef LTC_ECC_SECP112R1
1515
14,
1616
#endif
17-
#ifdef LTC_ECC128
17+
#ifdef LTC_ECC_SECP128R1
1818
16,
1919
#endif
20-
#ifdef LTC_ECC160
20+
#ifdef LTC_ECC_SECP160R1
2121
20,
2222
#endif
23-
#ifdef LTC_ECC192
23+
#ifdef LTC_ECC_SECP192R1
2424
24,
2525
#endif
26-
#ifdef LTC_ECC224
26+
#ifdef LTC_ECC_SECP224R1
2727
28,
2828
#endif
29-
#ifdef LTC_ECC256
29+
#ifdef LTC_ECC_SECP256R1
3030
32,
3131
#endif
32-
#ifdef LTC_ECC384
32+
#ifdef LTC_ECC_SECP384R1
3333
48,
3434
#endif
35-
#ifdef LTC_ECC521
35+
#ifdef LTC_ECC_SECP512R1
3636
66
3737
#endif
3838
};
@@ -353,21 +353,21 @@ int _ecc_old_api(void)
353353
int _ecc_new_api(void)
354354
{
355355
const char* names[] = {
356-
#if defined(LTC_ECC_SECP112R1) || defined(LTC_ECC112)
356+
#ifdef LTC_ECC_SECP112R1
357357
"SECP112R1", "ECC-112",
358358
"secp112r1", /* name is case-insensitive */
359359
"S E C-P-1_1_2r1", /* should pass fuzzy matching */
360360
#endif
361361
#ifdef LTC_ECC_SECP112R2
362362
"SECP112R2",
363363
#endif
364-
#if defined(LTC_ECC_SECP128R1) || defined(LTC_ECC128)
364+
#ifdef LTC_ECC_SECP128R1
365365
"SECP128R1", "ECC-128",
366366
#endif
367367
#ifdef LTC_ECC_SECP128R2
368368
"SECP128R2",
369369
#endif
370-
#if defined(LTC_ECC_SECP160R1) || defined(LTC_ECC160)
370+
#ifdef LTC_ECC_SECP160R1
371371
"SECP160R1", "ECC-160",
372372
#endif
373373
#ifdef LTC_ECC_SECP160R2
@@ -379,7 +379,7 @@ int _ecc_new_api(void)
379379
#ifdef LTC_ECC_BRAINPOOLP160R1
380380
"BRAINPOOLP160R1",
381381
#endif
382-
#if defined(LTC_ECC_SECP192R1) || defined(LTC_ECC192)
382+
#ifdef LTC_ECC_SECP192R1
383383
"SECP192R1", "NISTP192", "PRIME192V1", "ECC-192", "P-192",
384384
#endif
385385
#ifdef LTC_ECC_PRIME192V2
@@ -394,7 +394,7 @@ int _ecc_new_api(void)
394394
#ifdef LTC_ECC_BRAINPOOLP192R1
395395
"BRAINPOOLP192R1",
396396
#endif
397-
#if defined(LTC_ECC_SECP224R1) || defined(LTC_ECC224)
397+
#ifdef LTC_ECC_SECP224R1
398398
"SECP224R1", "NISTP224", "ECC-224", "P-224",
399399
#endif
400400
#ifdef LTC_ECC_SECP224K1
@@ -412,7 +412,7 @@ int _ecc_new_api(void)
412412
#ifdef LTC_ECC_PRIME239V3
413413
"PRIME239V3",
414414
#endif
415-
#if defined(LTC_ECC_SECP256R1) || defined(LTC_ECC256)
415+
#ifdef LTC_ECC_SECP256R1
416416
"SECP256R1", "NISTP256", "PRIME256V1", "ECC-256", "P-256",
417417
#endif
418418
#ifdef LTC_ECC_SECP256K1
@@ -424,7 +424,7 @@ int _ecc_new_api(void)
424424
#ifdef LTC_ECC_BRAINPOOLP320R1
425425
"BRAINPOOLP320R1",
426426
#endif
427-
#if defined(LTC_ECC_SECP384R1) || defined(LTC_ECC384)
427+
#ifdef LTC_ECC_SECP384R1
428428
"SECP384R1", "NISTP384", "ECC-384", "P-384",
429429
#endif
430430
#ifdef LTC_ECC_BRAINPOOLP384R1
@@ -433,7 +433,7 @@ int _ecc_new_api(void)
433433
#ifdef LTC_ECC_BRAINPOOLP512R1
434434
"BRAINPOOLP512R1",
435435
#endif
436-
#if defined(LTC_ECC_SECP521R1) || defined(LTC_ECC521)
436+
#ifdef LTC_ECC_SECP521R1
437437
"SECP521R1", "NISTP521", "ECC-521", "P-521",
438438
#endif
439439
};

0 commit comments

Comments
 (0)