Skip to content

Commit 327eb23

Browse files
author
Shingo Morimoto
committed
Fixed for sp_c64.c to be available.
1 parent e93fc7f commit 327eb23

File tree

9 files changed

+59
-40
lines changed

9 files changed

+59
-40
lines changed

‎embedded/signature/ecc-sign-verify/Makefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ OBJ_SP_ARM64 := \
2727
$(WOLFROOT)/wolfcrypt/src/sp_int.o\
2828
$(WOLFROOT)/wolfcrypt/src/sp_arm64.o\
2929

30-
3130
OBJ_SP_X86_64 := \
3231
$(WOLFROOT)/wolfcrypt/src/sp_int.o\
3332
$(WOLFROOT)/wolfcrypt/src/cpuid.o\
@@ -55,7 +54,7 @@ else ifeq ($(math), tfm)
5554
CFLAGS += -DTFM_FLAG
5655
OBJ += $(OBJ_TFM)
5756
else
58-
CFLAGS += -DSP_FLAG
57+
CFLAGS += -DSP_C64_FLAG
5958
OBJ += $(OBJ_SP_C64)
6059
endif
6160

‎embedded/signature/ecc-sign-verify/ecc_sign_verify.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
*/
2121

2222
#include <stdio.h>
23-
#include <wolfssl/options.h>
24-
23+
#include <wolfssl/wolfcrypt/settings.h>
2524
#include <wolfssl/ssl.h>
2625
#include <wolfssl/wolfcrypt/ecc.h>
2726
#include <wolfssl/wolfcrypt/signature.h>

‎embedded/signature/ecc-sign-verify/user_settings.h‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,20 @@
3535
#endif
3636

3737

38-
#ifdef SP_FLAG
38+
39+
#ifdef SP_C32_FLAG
3940
#define WOLFSSL_HAVE_SP_ECC
40-
#define WOLFSSL_SP_MATH
41+
#define WOLFSSL_SP_MATH_ALL
4142
#undef USE_FAST_MATH
4243
#endif
4344

44-
#if defined(SP_C32_FLAG)
45-
#define WOLFSSL_HAVE_SP_ECC
46-
#define WOLFSSL_SP_MATH
47-
#define WOLFSSL_SP_MATH_ALL
48-
#undef USE_FAST_MATH
49-
#endif
45+
#ifdef SP_C64_FLAG
46+
#define WOLFSSL_HAVE_SP_ECC
47+
#define WOLFSSL_SP_MATH_ALL
48+
#define SP_WORD_SIZE 64
49+
#define HAVE___UINT128_T
50+
#undef USE_FAST_MATH
5051

51-
#if defined(SP_C64_FLAG)
52-
#define WOLFSSL_HAVE_SP_ECC
53-
#define WOLFSSL_SP_MATH
54-
#define WOLFSSL_SP_MATH_ALL
55-
#define SP_WORD_SIZE 64
56-
#undef USE_FAST_MATH
5752
#endif
5853

5954
#ifdef SP_ARM64_FLAG

‎embedded/signature/rsa_buffer/Makefile‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ OBJ_SP_C32 := \
1717
$(WOLFROOT)/wolfcrypt/src/sp_int.o\
1818
$(WOLFROOT)/wolfcrypt/src/sp_c32.o\
1919

20+
OBJ_SP_C64 := \
21+
$(WOLFROOT)/wolfcrypt/src/sp_int.o\
22+
$(WOLFROOT)/wolfcrypt/src/sp_c64.o\
23+
2024
OBJ_SP_ARM64 := \
2125
$(WOLFROOT)/wolfcrypt/src/sp_int.o\
2226
$(WOLFROOT)/wolfcrypt/src/sp_arm64.o\
@@ -41,12 +45,18 @@ OBJ += $(OBJ_SP_X86_64)
4145
else ifeq ($(math) $(arch),sp arm64)
4246
CFLAGS += -DSP_ARM64_FLAG
4347
OBJ += $(OBJ_SP_ARM64)
48+
else ifeq ($(math) $(arch),sp c64)
49+
CFLAGS += -DSP_C64_FLAG
50+
OBJ += $(OBJ_SP_C64)
51+
else ifeq ($(math) $(arch),sp c32)
52+
CFLAGS += -DSP_C32_FLAG
53+
OBJ += $(OBJ_SP_C32)
4454
else ifeq ($(math), tfm)
4555
CFLAGS += -DTFM_FLAG
4656
OBJ += $(OBJ_TFM)
4757
else
48-
CFLAGS += -DSP_FLAG
49-
OBJ += $(OBJ_SP_C32)
58+
CFLAGS += -DSP_C64_FLAG
59+
OBJ += $(OBJ_SP_C64)
5060
endif
5161

5262
all: verify sign bench
@@ -63,4 +73,4 @@ bench: $(OBJ)
6373
clean:
6474
rm -f verify sign bench $(WOLFROOT)/wolfcrypt/src/*.o
6575
size :
66-
size $(OBJ)
76+
size $(OBJ) verify sign

‎embedded/signature/rsa_buffer/user_settings.h‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
#define WOLFSSL_NO_ASN_STRICT
2626

2727

28-
29-
30-
3128
#ifdef DEBUG_MEMORY
3229
#define WOLFSSL_TRACK_MEMORY
3330
#define HAVE_STACK_SIZE
@@ -36,16 +33,23 @@
3633
#endif
3734

3835

39-
#ifdef SP_FLAG /* Use multi-platform SP (sp_c32.c) by default*/
36+
#ifdef SP_C32_FLAG /* Use multi-platform SP (sp_c32.c) by default*/
4037
#define WOLFSSL_HAVE_SP_RSA
41-
#define WOLFSSL_SP_MATH
4238
#define WOLFSSL_SP_MATH_ALL
4339
#undef USE_FAST_MATH
4440
#endif
4541

42+
#ifdef SP_C64_FLAG
43+
#define WOLFSSL_HAVE_SP_RSA
44+
#define WOLFSSL_SP_MATH_ALL
45+
#define SP_WORD_SIZE 64
46+
#define HAVE___UINT128_T
47+
#undef USE_FAST_MATH
48+
49+
#endif
50+
4651
#ifdef SP_ARM64_FLAG
4752
#define WOLFSSL_HAVE_SP_RSA
48-
#define WOLFSSL_SP_MATH
4953
#define WOLFSSL_SP_MATH_ALL
5054
#define WOLFSSL_SP_ARM64
5155
#define WOLFSSL_SP_ARM64_ASM
@@ -54,7 +58,6 @@
5458

5559
#ifdef SP_X86_64_FLAG
5660
#define WOLFSSL_HAVE_SP_RSA
57-
#define WOLFSSL_SP_MATH
5861
#define WOLFSSL_SP_MATH_ALL
5962
#define WOLFSSL_SP_X86_64
6063
#define WOLFSSL_SP_X86_64_ASM

‎embedded/signature/rsa_buffer/verify.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
* "signature.h", used by this program, can be generated using "sign.c".
2626
*/
2727

28-
#include <wolfssl/options.h>
29-
#include "user_settings.h"
28+
#include <wolfssl/wolfcrypt/settings.h>
3029
#include <wolfssl/ssl.h>
3130
#include <wolfssl/wolfcrypt/rsa.h>
3231
#include <wolfssl/wolfcrypt/sha256.h>

‎embedded/signature/rsa_vfy_only/Makefile‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ OBJ_SP_C32 := \
1717
$(WOLFROOT)/wolfcrypt/src/sp_int.o\
1818
$(WOLFROOT)/wolfcrypt/src/sp_c32.o\
1919

20+
OBJ_SP_C64 := \
21+
$(WOLFROOT)/wolfcrypt/src/sp_int.o\
22+
$(WOLFROOT)/wolfcrypt/src/sp_c64.o\
23+
2024
OBJ_SP_ARM64 := \
2125
$(WOLFROOT)/wolfcrypt/src/sp_int.o\
2226
$(WOLFROOT)/wolfcrypt/src/sp_arm64.o\
@@ -42,12 +46,18 @@ OBJ += $(OBJ_SP_X86_64)
4246
else ifeq ($(math) $(arch),sp arm64)
4347
CFLAGS += -DSP_ARM64_FLAG
4448
OBJ += $(OBJ_SP_ARM64)
49+
else ifeq ($(math) $(arch),sp c64)
50+
CFLAGS += -DSP_C64_FLAG
51+
OBJ += $(OBJ_SP_C64)
52+
else ifeq ($(math) $(arch),sp c32)
53+
CFLAGS += -DSP_C32_FLAG
54+
OBJ += $(OBJ_SP_C32)
4555
else ifeq ($(math), tfm)
4656
CFLAGS += -DTFM_FLAG
4757
OBJ += $(OBJ_TFM)
4858
else
49-
CFLAGS += -DSP_FLAG
50-
OBJ += $(OBJ_SP_C32)
59+
CFLAGS += -DSP_C64_FLAG
60+
OBJ += $(OBJ_SP_C64)
5161
endif
5262

5363
all: verify bench
@@ -62,4 +72,4 @@ bench: $(OBJ)
6272
clean:
6373
rm -f verify bench $(WOLFROOT)/wolfcrypt/src/*.o
6474
size :
65-
size $(OBJ)
75+
size $(OBJ) verify

‎embedded/signature/rsa_vfy_only/user_settings.h‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
#define WOLFSSL_NO_ASN_STRICT
2626

2727

28-
29-
30-
3128
#ifdef DEBUG_MEMORY
3229
#define WOLFSSL_TRACK_MEMORY
3330
#define HAVE_STACK_SIZE
@@ -36,16 +33,23 @@
3633
#endif
3734

3835

39-
#ifdef SP_FLAG
36+
#ifdef SP_C32_FLAG
4037
#define WOLFSSL_HAVE_SP_RSA
41-
#define WOLFSSL_SP_MATH
4238
#define WOLFSSL_SP_MATH_ALL
4339
#undef USE_FAST_MATH
4440
#endif /*SP_FLAG*/
4541

42+
#ifdef SP_C64_FLAG
43+
#define WOLFSSL_HAVE_SP_RSA
44+
#define WOLFSSL_SP_MATH_ALL
45+
#define SP_WORD_SIZE 64
46+
#define HAVE___UINT128_T
47+
#undef USE_FAST_MATH
48+
49+
#endif
50+
4651
#ifdef SP_ARM64_FLAG
4752
#define WOLFSSL_HAVE_SP_RSA
48-
#define WOLFSSL_SP_MATH
4953
#define WOLFSSL_SP_MATH_ALL
5054
#define WOLFSSL_SP_ARM64
5155
#define WOLFSSL_SP_ARM64_ASM
@@ -54,7 +58,6 @@
5458

5559
#ifdef SP_X86_64_FLAG
5660
#define WOLFSSL_HAVE_SP_RSA
57-
#define WOLFSSL_SP_MATH
5861
#define WOLFSSL_SP_MATH_ALL
5962
#define WOLFSSL_SP_X86_64
6063
#define WOLFSSL_SP_X86_64_ASM

‎embedded/signature/rsa_vfy_only/verify.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
*/
2121

2222
#include <stdio.h>
23+
#include<wolfssl/wolfcrypt/settings.h>
2324
#include <wolfssl/wolfcrypt/settings.h>
2425
#include <wolfssl/wolfcrypt/rsa.h>
2526
#include <wolfssl/wolfcrypt/sha256.h>

0 commit comments

Comments
 (0)