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

13 files changed, 39 insertions, 14 deletions

diff --git a/src/lib/modes/aead/ccm/info.txt b/src/lib/modes/aead/ccm/info.txt
index ee8373caf..b12a43b03 100644
--- a/src/lib/modes/aead/ccm/info.txt
+++ b/src/lib/modes/aead/ccm/info.txt
@@ -1 +1,3 @@
-define AEAD_CCM 20131128
+<defines>
+AEAD_CCM -> 20131128
+</defines>
diff --git a/src/lib/modes/aead/chacha20poly1305/info.txt b/src/lib/modes/aead/chacha20poly1305/info.txt
index f03f2797e..7452f65c3 100644
--- a/src/lib/modes/aead/chacha20poly1305/info.txt
+++ b/src/lib/modes/aead/chacha20poly1305/info.txt
@@ -1,4 +1,6 @@
-define AEAD_CHACHA20_POLY1305 20141228
+<defines>
+AEAD_CHACHA20_POLY1305 -> 20141228
+</defines>
 
 <requires>
 chacha
diff --git a/src/lib/modes/aead/eax/info.txt b/src/lib/modes/aead/eax/info.txt
index 140da5740..6bc01ff70 100644
--- a/src/lib/modes/aead/eax/info.txt
+++ b/src/lib/modes/aead/eax/info.txt
@@ -1,4 +1,6 @@
-define AEAD_EAX 20131128
+<defines>
+AEAD_EAX -> 20131128
+</defines>
 
 <requires>
 cmac
diff --git a/src/lib/modes/aead/gcm/clmul/info.txt b/src/lib/modes/aead/gcm/clmul/info.txt
index 098aa16f9..999502e31 100644
--- a/src/lib/modes/aead/gcm/clmul/info.txt
+++ b/src/lib/modes/aead/gcm/clmul/info.txt
@@ -1,5 +1,6 @@
-
-define GCM_CLMUL 20131227
+<defines>
+GCM_CLMUL -> 20131227
+</defines>
 
 need_isa aesni
 
diff --git a/src/lib/modes/aead/gcm/info.txt b/src/lib/modes/aead/gcm/info.txt
index 708e61fdd..6dc5c6928 100644
--- a/src/lib/modes/aead/gcm/info.txt
+++ b/src/lib/modes/aead/gcm/info.txt
@@ -1,4 +1,6 @@
-define AEAD_GCM 20131128
+<defines>
+AEAD_GCM -> 20131128
+</defines>
 
 <requires>
 ctr
diff --git a/src/lib/modes/aead/info.txt b/src/lib/modes/aead/info.txt
index 102f05b7b..15106e46a 100644
--- a/src/lib/modes/aead/info.txt
+++ b/src/lib/modes/aead/info.txt
@@ -1 +1,3 @@
-define AEAD_MODES 20131128
+<defines>
+AEAD_MODES -> 20131128
+</defines>
diff --git a/src/lib/modes/aead/ocb/info.txt b/src/lib/modes/aead/ocb/info.txt
index a3af9dc29..738d7c20e 100644
--- a/src/lib/modes/aead/ocb/info.txt
+++ b/src/lib/modes/aead/ocb/info.txt
@@ -1,4 +1,6 @@
-define AEAD_OCB 20131128
+<defines>
+AEAD_OCB -> 20131128
+</defines>
 
 <requires>
 cmac
diff --git a/src/lib/modes/aead/siv/info.txt b/src/lib/modes/aead/siv/info.txt
index b76a82422..d25798ac9 100644
--- a/src/lib/modes/aead/siv/info.txt
+++ b/src/lib/modes/aead/siv/info.txt
@@ -1,4 +1,6 @@
-define AEAD_SIV 20131202
+<defines>
+AEAD_SIV -> 20131202
+</defines>
 
 load_on auto
 
diff --git a/src/lib/modes/cbc/info.txt b/src/lib/modes/cbc/info.txt
index ce59deba0..a1e3e1dec 100644
--- a/src/lib/modes/cbc/info.txt
+++ b/src/lib/modes/cbc/info.txt
@@ -1,4 +1,6 @@
-define MODE_CBC 20131128
+<defines>
+MODE_CBC -> 20131128
+</defines>
 
 <requires>
 mode_pad
diff --git a/src/lib/modes/cfb/info.txt b/src/lib/modes/cfb/info.txt
index 8d0e20a84..29744514f 100644
--- a/src/lib/modes/cfb/info.txt
+++ b/src/lib/modes/cfb/info.txt
@@ -1 +1,3 @@
-define MODE_CFB 20131128
+<defines>
+MODE_CFB -> 20131128
+</defines>
diff --git a/src/lib/modes/info.txt b/src/lib/modes/info.txt
index 1e50e7de5..70bd189d7 100644
--- a/src/lib/modes/info.txt
+++ b/src/lib/modes/info.txt
@@ -1,4 +1,6 @@
-define MODES 20150626
+<defines>
+MODES -> 20150626
+</defines>
 
 <header:public>
 cipher_mode.h
diff --git a/src/lib/modes/mode_pad/info.txt b/src/lib/modes/mode_pad/info.txt
index e9df6334b..12b6e5b3a 100644
--- a/src/lib/modes/mode_pad/info.txt
+++ b/src/lib/modes/mode_pad/info.txt
@@ -1 +1,3 @@
-define CIPHER_MODE_PADDING 20131128
+<defines>
+CIPHER_MODE_PADDING -> 20131128
+</defines>
diff --git a/src/lib/modes/xts/info.txt b/src/lib/modes/xts/info.txt
index 5f5dc7834..04cd046c7 100644
--- a/src/lib/modes/xts/info.txt
+++ b/src/lib/modes/xts/info.txt
@@ -1 +1,3 @@
-define MODE_XTS 20131128
+<defines>
+MODE_XTS -> 20131128
+</defines>