From ca9740f29a860c80b28a7ff8b7c1df1d5ccddab8 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@kullo.net>
Date: Sun, 2 Apr 2017 11:19:58 +0200
Subject: Remove "Dirty hack" for multiple defines in lex_me_harder()

---
 src/lib/mac/cbc_mac/info.txt  | 4 +++-
 src/lib/mac/cmac/info.txt     | 4 +++-
 src/lib/mac/gmac/info.txt     | 4 +++-
 src/lib/mac/hmac/info.txt     | 4 +++-
 src/lib/mac/info.txt          | 4 +++-
 src/lib/mac/poly1305/info.txt | 4 +++-
 src/lib/mac/siphash/info.txt  | 4 +++-
 src/lib/mac/x919_mac/info.txt | 4 +++-
 8 files changed, 24 insertions(+), 8 deletions(-)

(limited to 'src/lib/mac')

diff --git a/src/lib/mac/cbc_mac/info.txt b/src/lib/mac/cbc_mac/info.txt
index 5e864ca22..1cf22eae0 100644
--- a/src/lib/mac/cbc_mac/info.txt
+++ b/src/lib/mac/cbc_mac/info.txt
@@ -1 +1,3 @@
-define CBC_MAC 20131128
+<defines>
+CBC_MAC -> 20131128
+</defines>
diff --git a/src/lib/mac/cmac/info.txt b/src/lib/mac/cmac/info.txt
index 39c75aed1..01bdf7884 100644
--- a/src/lib/mac/cmac/info.txt
+++ b/src/lib/mac/cmac/info.txt
@@ -1 +1,3 @@
-define CMAC 20131128
+<defines>
+CMAC -> 20131128
+</defines>
diff --git a/src/lib/mac/gmac/info.txt b/src/lib/mac/gmac/info.txt
index 921690c93..416e914db 100644
--- a/src/lib/mac/gmac/info.txt
+++ b/src/lib/mac/gmac/info.txt
@@ -1,4 +1,6 @@
-define GMAC 20160207
+<defines>
+GMAC -> 20160207
+</defines>
 
 <requires>
 gcm
diff --git a/src/lib/mac/hmac/info.txt b/src/lib/mac/hmac/info.txt
index 171cd8515..cf1a288f6 100644
--- a/src/lib/mac/hmac/info.txt
+++ b/src/lib/mac/hmac/info.txt
@@ -1 +1,3 @@
-define HMAC 20131128
+<defines>
+HMAC -> 20131128
+</defines>
diff --git a/src/lib/mac/info.txt b/src/lib/mac/info.txt
index ab7833857..7aef92b87 100644
--- a/src/lib/mac/info.txt
+++ b/src/lib/mac/info.txt
@@ -1,4 +1,6 @@
-define MAC 20150626
+<defines>
+MAC -> 20150626
+</defines>
 
 <header:public>
 mac.h
diff --git a/src/lib/mac/poly1305/info.txt b/src/lib/mac/poly1305/info.txt
index ed3133850..868f97241 100644
--- a/src/lib/mac/poly1305/info.txt
+++ b/src/lib/mac/poly1305/info.txt
@@ -1,4 +1,6 @@
-define POLY1305 20141227
+<defines>
+POLY1305 -> 20141227
+</defines>
 
 <header:public>
 poly1305.h
diff --git a/src/lib/mac/siphash/info.txt b/src/lib/mac/siphash/info.txt
index 98c4d0986..8d4c20d1a 100644
--- a/src/lib/mac/siphash/info.txt
+++ b/src/lib/mac/siphash/info.txt
@@ -1 +1,3 @@
-define SIPHASH 20150110
+<defines>
+SIPHASH -> 20150110
+</defines>
diff --git a/src/lib/mac/x919_mac/info.txt b/src/lib/mac/x919_mac/info.txt
index 90d849803..65d6cee64 100644
--- a/src/lib/mac/x919_mac/info.txt
+++ b/src/lib/mac/x919_mac/info.txt
@@ -1,4 +1,6 @@
-define ANSI_X919_MAC 20131128
+<defines>
+ANSI_X919_MAC -> 20131128
+</defines>
 
 <requires>
 des
-- 
cgit v1.2.3