Skip to content

Commit

Permalink
don't allow LTC_CLEAN_STACK to be enabled until fixed
Browse files Browse the repository at this point in the history
As discussed in issue #486 [1] the current behavior shouldn't be used
anymore.

[1] #486
  • Loading branch information
sjaeckel committed Nov 11, 2020
1 parent 7dce44b commit 90d8d56
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 24 deletions.
24 changes: 0 additions & 24 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,22 +61,6 @@ env:
BUILDNAME="SMALL+NOTABLES"
BUILDOPTIONS="-DLTC_SMALL_CODE -DLTC_NO_TABLES"
BUILDSCRIPT=".ci/run.sh"
- |
BUILDNAME="CLEANSTACK"
BUILDOPTIONS="-DLTC_CLEAN_STACK"
BUILDSCRIPT=".ci/run.sh"
- |
BUILDNAME="CLEANSTACK+SMALL"
BUILDOPTIONS="-DLTC_SMALL_CODE -DLTC_CLEAN_STACK"
BUILDSCRIPT=".ci/run.sh"
- |
BUILDNAME="CLEANSTACK+NOTABLES"
BUILDOPTIONS="-DLTC_NO_TABLES -DLTC_CLEAN_STACK"
BUILDSCRIPT=".ci/run.sh"
- |
BUILDNAME="CLEANSTACK+NOTABLES+SMALL"
BUILDOPTIONS="-DLTC_NO_TABLES -DLTC_CLEAN_STACK -DLTC_SMALL_CODE"
BUILDSCRIPT=".ci/run.sh"
- |
BUILDNAME="NO_FAST"
BUILDOPTIONS="-DLTC_NO_FAST"
Expand All @@ -93,18 +77,10 @@ env:
BUILDNAME="NO_TIMING_RESISTANCE"
BUILDOPTIONS="-DLTC_NO_ECC_TIMING_RESISTANT -DLTC_NO_RSA_BLINDING"
BUILDSCRIPT=".ci/run.sh"
- |
BUILDNAME="CLEANSTACK+NOTABLES+SMALL+NO_ASM+NO_TIMING_RESISTANCE+LTC_FORTUNA_RESEED_RATELIMIT_STATIC"
BUILDOPTIONS="-DLTC_CLEAN_STACK -DLTC_NO_TABLES -DLTC_SMALL_CODE -DLTC_NO_ECC_TIMING_RESISTANT -DLTC_NO_RSA_BLINDING -DLTC_FORTUNA_RESEED_RATELIMIT_STATIC"
BUILDSCRIPT=".ci/run.sh"
- |
BUILDNAME="PTHREAD"
BUILDOPTIONS="-DLTC_PTHREAD"
BUILDSCRIPT=".ci/run.sh"
- |
BUILDNAME="PTHREAD+CLEANSTACK+NOTABLES+SMALL+NO_ASM+NO_TIMING_RESISTANCE+LTC_FORTUNA_RESEED_RATELIMIT_STATIC"
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"
BUILDSCRIPT=".ci/run.sh"
- |
BUILDNAME="STOCK+ARGTYPE=1"
BUILDOPTIONS="-DARGTYPE=1"
Expand Down
5 changes: 5 additions & 0 deletions src/headers/tomcrypt_custom.h
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,11 @@
#define LTC_PBES
#endif

#if defined(LTC_CLEAN_STACK)
/* if you're sure that you want to use it, remove the line below */
#error LTC_CLEAN_STACK is considered as broken
#endif

#if defined(LTC_PBES) && !defined(LTC_PKCS_5)
#error LTC_PBES requires LTC_PKCS_5
#endif
Expand Down

0 comments on commit 90d8d56

Please sign in to comment.