diff options
| author | Simon Warta <[email protected]> | 2017-04-02 11:19:58 +0200 |
|---|---|---|
| committer | Simon Warta <[email protected]> | 2017-04-02 21:51:55 +0200 |
| commit | ca9740f29a860c80b28a7ff8b7c1df1d5ccddab8 (patch) | |
| tree | ecc35158c9de6c4ef43202fd94fb0c670a02d564 /src/lib/kdf | |
| parent | b3f3e6d718736c5838f6f034d7cf2e0c2bf4ba4d (diff) | |
Remove "Dirty hack" for multiple defines in lex_me_harder()
Diffstat (limited to 'src/lib/kdf')
| -rw-r--r-- | src/lib/kdf/hkdf/info.txt | 4 | ||||
| -rw-r--r-- | src/lib/kdf/info.txt | 4 | ||||
| -rw-r--r-- | src/lib/kdf/kdf1/info.txt | 4 | ||||
| -rw-r--r-- | src/lib/kdf/kdf1_iso18033/info.txt | 4 | ||||
| -rw-r--r-- | src/lib/kdf/kdf2/info.txt | 4 | ||||
| -rw-r--r-- | src/lib/kdf/prf_tls/info.txt | 6 | ||||
| -rw-r--r-- | src/lib/kdf/prf_x942/info.txt | 4 | ||||
| -rw-r--r-- | src/lib/kdf/sp800_108/info.txt | 4 | ||||
| -rw-r--r-- | src/lib/kdf/sp800_56c/info.txt | 4 |
9 files changed, 28 insertions, 10 deletions
diff --git a/src/lib/kdf/hkdf/info.txt b/src/lib/kdf/hkdf/info.txt index 7389e5bb1..db6618c3c 100644 --- a/src/lib/kdf/hkdf/info.txt +++ b/src/lib/kdf/hkdf/info.txt @@ -1 +1,3 @@ -define HKDF 20131128 +<defines> +HKDF -> 20131128 +</defines> diff --git a/src/lib/kdf/info.txt b/src/lib/kdf/info.txt index 68aa46895..3d96cea19 100644 --- a/src/lib/kdf/info.txt +++ b/src/lib/kdf/info.txt @@ -1,4 +1,6 @@ -define KDF_BASE 20131128 +<defines> +KDF_BASE -> 20131128 +</defines> <requires> base diff --git a/src/lib/kdf/kdf1/info.txt b/src/lib/kdf/kdf1/info.txt index a77bf1508..a2372c7e3 100644 --- a/src/lib/kdf/kdf1/info.txt +++ b/src/lib/kdf/kdf1/info.txt @@ -1 +1,3 @@ -define KDF1 20131128 +<defines> +KDF1 -> 20131128 +</defines> diff --git a/src/lib/kdf/kdf1_iso18033/info.txt b/src/lib/kdf/kdf1_iso18033/info.txt index 507a04561..af6026836 100644 --- a/src/lib/kdf/kdf1_iso18033/info.txt +++ b/src/lib/kdf/kdf1_iso18033/info.txt @@ -1 +1,3 @@ -define KDF1_18033 20160128 +<defines> +KDF1_18033 -> 20160128 +</defines> diff --git a/src/lib/kdf/kdf2/info.txt b/src/lib/kdf/kdf2/info.txt index 4f63019b1..26c824cf2 100644 --- a/src/lib/kdf/kdf2/info.txt +++ b/src/lib/kdf/kdf2/info.txt @@ -1 +1,3 @@ -define KDF2 20131128 +<defines> +KDF2 -> 20131128 +</defines> diff --git a/src/lib/kdf/prf_tls/info.txt b/src/lib/kdf/prf_tls/info.txt index 505e1ff1e..d4307b6af 100644 --- a/src/lib/kdf/prf_tls/info.txt +++ b/src/lib/kdf/prf_tls/info.txt @@ -1,5 +1,7 @@ -define TLS_V10_PRF 20131128 -define TLS_V12_PRF 20131128 +<defines> +TLS_V10_PRF -> 20131128 +TLS_V12_PRF -> 20131128 +</defines> <requires> hmac diff --git a/src/lib/kdf/prf_x942/info.txt b/src/lib/kdf/prf_x942/info.txt index c016f0b66..822643365 100644 --- a/src/lib/kdf/prf_x942/info.txt +++ b/src/lib/kdf/prf_x942/info.txt @@ -1,4 +1,6 @@ -define X942_PRF 20131128 +<defines> +X942_PRF -> 20131128 +</defines> <requires> asn1 diff --git a/src/lib/kdf/sp800_108/info.txt b/src/lib/kdf/sp800_108/info.txt index a78531fe7..864a7fb9c 100644 --- a/src/lib/kdf/sp800_108/info.txt +++ b/src/lib/kdf/sp800_108/info.txt @@ -1,4 +1,6 @@ -define SP800_108 20160128 +<defines> +SP800_108 -> 20160128 +</defines> <requires> mac diff --git a/src/lib/kdf/sp800_56c/info.txt b/src/lib/kdf/sp800_56c/info.txt index 203c05a83..e598e8845 100644 --- a/src/lib/kdf/sp800_56c/info.txt +++ b/src/lib/kdf/sp800_56c/info.txt @@ -1,4 +1,6 @@ -define SP800_56C 20160211 +<defines> +SP800_56C -> 20160211 +</defines> <requires> sp800_108 |