Skip to content

Commit 6b12bc5

Browse files
committed
don't allow LTC_CLEAN_STACK to be enabled until fixed
As discussed in issue #486 [1] the current behavior shouldn't be used anymore. [1] #486
1 parent 53b0f1e commit 6b12bc5

File tree

2 files changed

+5
-24
lines changed

2 files changed

+5
-24
lines changed

.travis.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,6 @@ env:
6161
BUILDNAME="SMALL+NOTABLES"
6262
BUILDOPTIONS="-DLTC_SMALL_CODE -DLTC_NO_TABLES"
6363
BUILDSCRIPT=".ci/run.sh"
64-
- |
65-
BUILDNAME="CLEANSTACK"
66-
BUILDOPTIONS="-DLTC_CLEAN_STACK"
67-
BUILDSCRIPT=".ci/run.sh"
68-
- |
69-
BUILDNAME="CLEANSTACK+SMALL"
70-
BUILDOPTIONS="-DLTC_SMALL_CODE -DLTC_CLEAN_STACK"
71-
BUILDSCRIPT=".ci/run.sh"
72-
- |
73-
BUILDNAME="CLEANSTACK+NOTABLES"
74-
BUILDOPTIONS="-DLTC_NO_TABLES -DLTC_CLEAN_STACK"
75-
BUILDSCRIPT=".ci/run.sh"
76-
- |
77-
BUILDNAME="CLEANSTACK+NOTABLES+SMALL"
78-
BUILDOPTIONS="-DLTC_NO_TABLES -DLTC_CLEAN_STACK -DLTC_SMALL_CODE"
79-
BUILDSCRIPT=".ci/run.sh"
8064
- |
8165
BUILDNAME="NO_FAST"
8266
BUILDOPTIONS="-DLTC_NO_FAST"
@@ -93,18 +77,10 @@ env:
9377
BUILDNAME="NO_TIMING_RESISTANCE"
9478
BUILDOPTIONS="-DLTC_NO_ECC_TIMING_RESISTANT -DLTC_NO_RSA_BLINDING"
9579
BUILDSCRIPT=".ci/run.sh"
96-
- |
97-
BUILDNAME="CLEANSTACK+NOTABLES+SMALL+NO_ASM+NO_TIMING_RESISTANCE+LTC_FORTUNA_RESEED_RATELIMIT_STATIC"
98-
BUILDOPTIONS="-DLTC_CLEAN_STACK -DLTC_NO_TABLES -DLTC_SMALL_CODE -DLTC_NO_ECC_TIMING_RESISTANT -DLTC_NO_RSA_BLINDING -DLTC_FORTUNA_RESEED_RATELIMIT_STATIC"
99-
BUILDSCRIPT=".ci/run.sh"
10080
- |
10181
BUILDNAME="PTHREAD"
10282
BUILDOPTIONS="-DLTC_PTHREAD"
10383
BUILDSCRIPT=".ci/run.sh"
104-
- |
105-
BUILDNAME="PTHREAD+CLEANSTACK+NOTABLES+SMALL+NO_ASM+NO_TIMING_RESISTANCE+LTC_FORTUNA_RESEED_RATELIMIT_STATIC"
106-
BUILDOPTIONS="-DLTC_CLEAN_STACK -DLTC_NO_TABLES -DLTC_SMALL_CODE -DLTC_NO_ECC_TIMING_RESISTANT -DLTC_NO_RSA_BLINDING -DLTC_FORTUNA_RESEED_RATELIMIT_STATIC -DLTC_PTHREAD"
107-
BUILDSCRIPT=".ci/run.sh"
10884
- |
10985
BUILDNAME="STOCK+ARGTYPE=1"
11086
BUILDOPTIONS="-DARGTYPE=1"

src/headers/tomcrypt_custom.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,11 @@
585585
#define LTC_PBES
586586
#endif
587587

588+
#if defined(LTC_CLEAN_STACK)
589+
/* if you're sure that you want to use it, remove the line below */
590+
#error LTC_CLEAN_STACK is considered as broken
591+
#endif
592+
588593
#if defined(LTC_PBES) && !defined(LTC_PKCS_5)
589594
#error LTC_PBES requires LTC_PKCS_5
590595
#endif

0 commit comments

Comments
 (0)