Remove "Dirty hack" for multiple defines in lex_me_harder()

24 files changed, 72 insertions, 25 deletions

diff --git a/src/lib/block/aes/aes_ni/info.txt b/src/lib/block/aes/aes_ni/info.txt
index 11bf90390..d5d359348 100644
--- a/src/lib/block/aes/aes_ni/info.txt
+++ b/src/lib/block/aes/aes_ni/info.txt
@@ -1,4 +1,6 @@
-define AES_NI 20131128
+<defines>
+AES_NI -> 20131128
+</defines>
 
 load_on auto
 
diff --git a/src/lib/block/aes/aes_ssse3/info.txt b/src/lib/block/aes/aes_ssse3/info.txt
index 9e27801e6..8457eed56 100644
--- a/src/lib/block/aes/aes_ssse3/info.txt
+++ b/src/lib/block/aes/aes_ssse3/info.txt
@@ -1,4 +1,6 @@
-define AES_SSSE3 20131128
+<defines>
+AES_SSSE3 -> 20131128
+</defines>
 
 load_on auto
 
diff --git a/src/lib/block/aes/info.txt b/src/lib/block/aes/info.txt
index 09bd9a0ca..62455cf2c 100644
--- a/src/lib/block/aes/info.txt
+++ b/src/lib/block/aes/info.txt
@@ -1 +1,3 @@
-define AES 20131128
+<defines>
+AES -> 20131128
+</defines>
diff --git a/src/lib/block/blowfish/info.txt b/src/lib/block/blowfish/info.txt
index 1a33140d3..e028a5559 100644
--- a/src/lib/block/blowfish/info.txt
+++ b/src/lib/block/blowfish/info.txt
@@ -1 +1,3 @@
-define BLOWFISH 20131128
+<defines>
+BLOWFISH -> 20131128
+</defines>
diff --git a/src/lib/block/camellia/info.txt b/src/lib/block/camellia/info.txt
index 041ba75a2..c70a7f345 100644
--- a/src/lib/block/camellia/info.txt
+++ b/src/lib/block/camellia/info.txt
@@ -1,4 +1,6 @@
-define CAMELLIA 20150922
+<defines>
+CAMELLIA -> 20150922
+</defines>
 
 <header:public>
 camellia.h
diff --git a/src/lib/block/cascade/info.txt b/src/lib/block/cascade/info.txt
index 14f618fd0..15f5b2262 100644
--- a/src/lib/block/cascade/info.txt
+++ b/src/lib/block/cascade/info.txt
@@ -1,4 +1,6 @@
-define CASCADE 20131128
+<defines>
+CASCADE -> 20131128
+</defines>
 
 <header:public>
 cascade.h
diff --git a/src/lib/block/cast/info.txt b/src/lib/block/cast/info.txt
index be4cb7510..75d7e4ca3 100644
--- a/src/lib/block/cast/info.txt
+++ b/src/lib/block/cast/info.txt
@@ -1,4 +1,6 @@
-define CAST 20131128
+<defines>
+CAST -> 20131128
+</defines>
 
 <header:internal>
 cast_sboxes.h
diff --git a/src/lib/block/des/info.txt b/src/lib/block/des/info.txt
index a5d50d56e..05f85b523 100644
--- a/src/lib/block/des/info.txt
+++ b/src/lib/block/des/info.txt
@@ -1 +1,3 @@
-define DES 20131128
+<defines>
+DES -> 20131128
+</defines>
diff --git a/src/lib/block/gost_28147/info.txt b/src/lib/block/gost_28147/info.txt
index 396557248..17fc97159 100644
--- a/src/lib/block/gost_28147/info.txt
+++ b/src/lib/block/gost_28147/info.txt
@@ -1 +1,3 @@
-define GOST_28147_89 20131128
+<defines>
+GOST_28147_89 -> 20131128
+</defines>
diff --git a/src/lib/block/idea/idea_sse2/info.txt b/src/lib/block/idea/idea_sse2/info.txt
index 78f365b93..4479f12ad 100644
--- a/src/lib/block/idea/idea_sse2/info.txt
+++ b/src/lib/block/idea/idea_sse2/info.txt
@@ -1,4 +1,5 @@
-define IDEA_SSE2 20131128
+<defines>
+IDEA_SSE2 -> 20131128
+</defines>
 
 need_isa sse2
-
diff --git a/src/lib/block/idea/info.txt b/src/lib/block/idea/info.txt
index dbca72c8d..bcbdce03f 100644
--- a/src/lib/block/idea/info.txt
+++ b/src/lib/block/idea/info.txt
@@ -1 +1,3 @@
-define IDEA 20131128
+<defines>
+IDEA -> 20131128
+</defines>
diff --git a/src/lib/block/info.txt b/src/lib/block/info.txt
index 30f7392ef..b03a8c8f5 100644
--- a/src/lib/block/info.txt
+++ b/src/lib/block/info.txt
@@ -1,4 +1,6 @@
-define BLOCK_CIPHER 20131128
+<defines>
+BLOCK_CIPHER -> 20131128
+</defines>
 
 <header:public>
 block_cipher.h
diff --git a/src/lib/block/kasumi/info.txt b/src/lib/block/kasumi/info.txt
index 3dd2a3ac0..b48183ca9 100644
--- a/src/lib/block/kasumi/info.txt
+++ b/src/lib/block/kasumi/info.txt
@@ -1 +1,3 @@
-define KASUMI 20131128
+<defines>
+KASUMI -> 20131128
+</defines>
diff --git a/src/lib/block/lion/info.txt b/src/lib/block/lion/info.txt
index 6074dbd08..c818627eb 100644
--- a/src/lib/block/lion/info.txt
+++ b/src/lib/block/lion/info.txt
@@ -1 +1,3 @@
-define LION 20131128
+<defines>
+LION -> 20131128
+</defines>
diff --git a/src/lib/block/misty1/info.txt b/src/lib/block/misty1/info.txt
index 568f13574..bf21dd439 100644
--- a/src/lib/block/misty1/info.txt
+++ b/src/lib/block/misty1/info.txt
@@ -1 +1,3 @@
-define MISTY1 20131128
+<defines>
+MISTY1 -> 20131128
+</defines>
diff --git a/src/lib/block/noekeon/info.txt b/src/lib/block/noekeon/info.txt
index 769d7150e..f3445eb7e 100644
--- a/src/lib/block/noekeon/info.txt
+++ b/src/lib/block/noekeon/info.txt
@@ -1 +1,3 @@
-define NOEKEON 20131128
+<defines>
+NOEKEON -> 20131128
+</defines>
diff --git a/src/lib/block/noekeon/noekeon_simd/info.txt b/src/lib/block/noekeon/noekeon_simd/info.txt
index 45ff93467..a09e491b5 100644
--- a/src/lib/block/noekeon/noekeon_simd/info.txt
+++ b/src/lib/block/noekeon/noekeon_simd/info.txt
@@ -1,4 +1,6 @@
-define NOEKEON_SIMD 20160903
+<defines>
+NOEKEON_SIMD -> 20160903
+</defines>
 
 <requires>
 noekeon
diff --git a/src/lib/block/seed/info.txt b/src/lib/block/seed/info.txt
index 1c6b28792..dd395eda1 100644
--- a/src/lib/block/seed/info.txt
+++ b/src/lib/block/seed/info.txt
@@ -1 +1,3 @@
-define SEED 20131128
+<defines>
+SEED -> 20131128
+</defines>
diff --git a/src/lib/block/serpent/info.txt b/src/lib/block/serpent/info.txt
index 6337ef6c0..89b860ce4 100644
--- a/src/lib/block/serpent/info.txt
+++ b/src/lib/block/serpent/info.txt
@@ -1,4 +1,6 @@
-define SERPENT 20131128
+<defines>
+SERPENT -> 20131128
+</defines>
 
 <header:public>
 serpent.h
diff --git a/src/lib/block/serpent/serpent_simd/info.txt b/src/lib/block/serpent/serpent_simd/info.txt
index a719ba388..f7dadf33f 100644
--- a/src/lib/block/serpent/serpent_simd/info.txt
+++ b/src/lib/block/serpent/serpent_simd/info.txt
@@ -1,4 +1,6 @@
-define SERPENT_SIMD 20160903
+<defines>
+SERPENT_SIMD -> 20160903
+</defines>
 
 <requires>
 simd
diff --git a/src/lib/block/threefish/info.txt b/src/lib/block/threefish/info.txt
index 15843cdd3..e12223679 100644
--- a/src/lib/block/threefish/info.txt
+++ b/src/lib/block/threefish/info.txt
@@ -1 +1,3 @@
-define THREEFISH_512 20131224
+<defines>
+THREEFISH_512 -> 20131224
+</defines>
diff --git a/src/lib/block/threefish/threefish_avx2/info.txt b/src/lib/block/threefish/threefish_avx2/info.txt
index 8e7db6455..bc2675fb4 100644
--- a/src/lib/block/threefish/threefish_avx2/info.txt
+++ b/src/lib/block/threefish/threefish_avx2/info.txt
@@ -1,4 +1,6 @@
-define THREEFISH_512_AVX2 20160903
+<defines>
+THREEFISH_512_AVX2 -> 20160903
+</defines>
 
 need_isa avx2
 
diff --git a/src/lib/block/twofish/info.txt b/src/lib/block/twofish/info.txt
index c4351db59..9febbc8dd 100644
--- a/src/lib/block/twofish/info.txt
+++ b/src/lib/block/twofish/info.txt
@@ -1 +1,3 @@
-define TWOFISH 20131128
+<defines>
+TWOFISH -> 20131128
+</defines>
diff --git a/src/lib/block/xtea/info.txt b/src/lib/block/xtea/info.txt
index e2cc8ac34..b9b9ad365 100644
--- a/src/lib/block/xtea/info.txt
+++ b/src/lib/block/xtea/info.txt
@@ -1 +1,3 @@
-define XTEA 20131128
+<defines>
+XTEA -> 20131128
+</defines>