diff options
-rwxr-xr-x | configure.py | 9 | ||||
-rw-r--r-- | src/lib/block/aes/aes_ni/aes_ni.cpp (renamed from src/lib/block/aes_ni/aes_ni.cpp) | 0 | ||||
-rw-r--r-- | src/lib/block/aes/aes_ni/info.txt (renamed from src/lib/block/aes_ni/info.txt) | 0 | ||||
-rw-r--r-- | src/lib/block/aes/aes_ssse3/aes_ssse3.cpp (renamed from src/lib/block/aes_ssse3/aes_ssse3.cpp) | 0 | ||||
-rw-r--r-- | src/lib/block/aes/aes_ssse3/info.txt (renamed from src/lib/block/aes_ssse3/info.txt) | 0 | ||||
-rw-r--r-- | src/lib/block/idea/idea_sse2/idea_sse2.cpp (renamed from src/lib/block/idea_sse2/idea_sse2.cpp) | 0 | ||||
-rw-r--r-- | src/lib/block/idea/idea_sse2/info.txt (renamed from src/lib/block/idea_sse2/info.txt) | 3 | ||||
-rw-r--r-- | src/lib/block/noekeon/noekeon_simd/info.txt (renamed from src/lib/block/noekeon_simd/info.txt) | 0 | ||||
-rw-r--r-- | src/lib/block/noekeon/noekeon_simd/noekeon_simd.cpp (renamed from src/lib/block/noekeon_simd/noekeon_simd.cpp) | 0 | ||||
-rw-r--r-- | src/lib/block/serpent/serpent_simd/info.txt (renamed from src/lib/block/serpent_simd/info.txt) | 1 | ||||
-rw-r--r-- | src/lib/block/serpent/serpent_simd/serp_simd.cpp (renamed from src/lib/block/serpent_simd/serp_simd.cpp) | 0 | ||||
-rw-r--r-- | src/lib/block/threefish/threefish_avx2/info.txt (renamed from src/lib/block/threefish_avx2/info.txt) | 4 | ||||
-rw-r--r-- | src/lib/block/threefish/threefish_avx2/threefish_avx2.cpp (renamed from src/lib/block/threefish_avx2/threefish_avx2.cpp) | 0 | ||||
-rw-r--r-- | src/lib/hash/sha1/sha1_sse2/info.txt (renamed from src/lib/hash/sha1_sse2/info.txt) | 4 | ||||
-rw-r--r-- | src/lib/hash/sha1/sha1_sse2/sha1_sse2.cpp (renamed from src/lib/hash/sha1_sse2/sha1_sse2.cpp) | 0 |
15 files changed, 5 insertions, 16 deletions
diff --git a/configure.py b/configure.py index dc5ceca60..57f24c8f3 100755 --- a/configure.py +++ b/configure.py @@ -3,7 +3,7 @@ """ Configuration program for botan -(C) 2009,2010,2011,2012,2013,2014,2015 Jack Lloyd +(C) 2009,2010,2011,2012,2013,2014,2015,2016 Jack Lloyd (C) 2015,2016 Simon Warta (Kullo GmbH) Botan is released under the Simplified BSD License (see license.txt) @@ -1592,9 +1592,10 @@ def choose_modules_to_use(modules, module_policy, archinfo, ccinfo, options): if modname in options.disabled_modules: cannot_use_because(modname, 'disabled by user') - elif modname in options.enabled_modules: - to_load.append(modname) # trust the user elif usable: + if modname in options.enabled_modules: + to_load.append(modname) # trust the user + if module.load_on == 'never': cannot_use_because(modname, 'disabled as buggy') elif module.load_on == 'request': @@ -1619,7 +1620,7 @@ def choose_modules_to_use(modules, module_policy, archinfo, ccinfo, options): else: to_load.append(modname) else: - logging.warning('Unknown load_on %s in %s' % ( + logging.error('Unknown load_on %s in %s' % ( module.load_on, modname)) dependency_failure = True diff --git a/src/lib/block/aes_ni/aes_ni.cpp b/src/lib/block/aes/aes_ni/aes_ni.cpp index 7518a6cf2..7518a6cf2 100644 --- a/src/lib/block/aes_ni/aes_ni.cpp +++ b/src/lib/block/aes/aes_ni/aes_ni.cpp diff --git a/src/lib/block/aes_ni/info.txt b/src/lib/block/aes/aes_ni/info.txt index 11bf90390..11bf90390 100644 --- a/src/lib/block/aes_ni/info.txt +++ b/src/lib/block/aes/aes_ni/info.txt diff --git a/src/lib/block/aes_ssse3/aes_ssse3.cpp b/src/lib/block/aes/aes_ssse3/aes_ssse3.cpp index ef24795bb..ef24795bb 100644 --- a/src/lib/block/aes_ssse3/aes_ssse3.cpp +++ b/src/lib/block/aes/aes_ssse3/aes_ssse3.cpp diff --git a/src/lib/block/aes_ssse3/info.txt b/src/lib/block/aes/aes_ssse3/info.txt index 9e27801e6..9e27801e6 100644 --- a/src/lib/block/aes_ssse3/info.txt +++ b/src/lib/block/aes/aes_ssse3/info.txt diff --git a/src/lib/block/idea_sse2/idea_sse2.cpp b/src/lib/block/idea/idea_sse2/idea_sse2.cpp index 1e63a8332..1e63a8332 100644 --- a/src/lib/block/idea_sse2/idea_sse2.cpp +++ b/src/lib/block/idea/idea_sse2/idea_sse2.cpp diff --git a/src/lib/block/idea_sse2/info.txt b/src/lib/block/idea/idea_sse2/info.txt index cfaaa374a..78f365b93 100644 --- a/src/lib/block/idea_sse2/info.txt +++ b/src/lib/block/idea/idea_sse2/info.txt @@ -2,6 +2,3 @@ define IDEA_SSE2 20131128 need_isa sse2 -<requires> -idea -</requires> diff --git a/src/lib/block/noekeon_simd/info.txt b/src/lib/block/noekeon/noekeon_simd/info.txt index 45ff93467..45ff93467 100644 --- a/src/lib/block/noekeon_simd/info.txt +++ b/src/lib/block/noekeon/noekeon_simd/info.txt diff --git a/src/lib/block/noekeon_simd/noekeon_simd.cpp b/src/lib/block/noekeon/noekeon_simd/noekeon_simd.cpp index e37412b5f..e37412b5f 100644 --- a/src/lib/block/noekeon_simd/noekeon_simd.cpp +++ b/src/lib/block/noekeon/noekeon_simd/noekeon_simd.cpp diff --git a/src/lib/block/serpent_simd/info.txt b/src/lib/block/serpent/serpent_simd/info.txt index eedc92757..a719ba388 100644 --- a/src/lib/block/serpent_simd/info.txt +++ b/src/lib/block/serpent/serpent_simd/info.txt @@ -1,6 +1,5 @@ define SERPENT_SIMD 20160903 <requires> -serpent simd </requires> diff --git a/src/lib/block/serpent_simd/serp_simd.cpp b/src/lib/block/serpent/serpent_simd/serp_simd.cpp index 7571e5511..7571e5511 100644 --- a/src/lib/block/serpent_simd/serp_simd.cpp +++ b/src/lib/block/serpent/serpent_simd/serp_simd.cpp diff --git a/src/lib/block/threefish_avx2/info.txt b/src/lib/block/threefish/threefish_avx2/info.txt index 907253c64..1612ce390 100644 --- a/src/lib/block/threefish_avx2/info.txt +++ b/src/lib/block/threefish/threefish_avx2/info.txt @@ -1,7 +1,3 @@ define THREEFISH_512_AVX2 20160903 need_isa avx2 - -<requires> -threefish -</requires> diff --git a/src/lib/block/threefish_avx2/threefish_avx2.cpp b/src/lib/block/threefish/threefish_avx2/threefish_avx2.cpp index e4a46e3de..e4a46e3de 100644 --- a/src/lib/block/threefish_avx2/threefish_avx2.cpp +++ b/src/lib/block/threefish/threefish_avx2/threefish_avx2.cpp diff --git a/src/lib/hash/sha1_sse2/info.txt b/src/lib/hash/sha1/sha1_sse2/info.txt index e352364ec..cc1179014 100644 --- a/src/lib/hash/sha1_sse2/info.txt +++ b/src/lib/hash/sha1/sha1_sse2/info.txt @@ -1,7 +1,3 @@ define SHA1_SSE2 20160803 need_isa sse2 - -<requires> -sha1 -</requires> diff --git a/src/lib/hash/sha1_sse2/sha1_sse2.cpp b/src/lib/hash/sha1/sha1_sse2/sha1_sse2.cpp index 0f88bb4c2..0f88bb4c2 100644 --- a/src/lib/hash/sha1_sse2/sha1_sse2.cpp +++ b/src/lib/hash/sha1/sha1_sse2/sha1_sse2.cpp |