aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/stream
diff options
context:
space:
mode:
authorDaniel Wyatt <[email protected]>2017-04-03 15:55:59 -0400
committerDaniel Wyatt <[email protected]>2017-04-03 15:55:59 -0400
commit9580d6e89f56a6d9843ab253529b3c28f02fd7a9 (patch)
tree09240c3da816cf6417c4e0db028cf58fdbe67dd7 /src/lib/stream
parent80e2864358df6be840b4b6c7a6f5c331c4a375f4 (diff)
parent753b4c2d5301574d3c9390b79aa275a49809e6c8 (diff)
Merge remote-tracking branch 'origin/master' into sm3
Diffstat (limited to 'src/lib/stream')
-rw-r--r--src/lib/stream/chacha/chacha_sse2/info.txt4
-rw-r--r--src/lib/stream/chacha/info.txt4
-rw-r--r--src/lib/stream/ctr/info.txt4
-rw-r--r--src/lib/stream/info.txt4
-rw-r--r--src/lib/stream/ofb/info.txt4
-rw-r--r--src/lib/stream/rc4/info.txt4
-rw-r--r--src/lib/stream/salsa20/info.txt4
-rw-r--r--src/lib/stream/shake_cipher/info.txt4
8 files changed, 24 insertions, 8 deletions
diff --git a/src/lib/stream/chacha/chacha_sse2/info.txt b/src/lib/stream/chacha/chacha_sse2/info.txt
index 965479746..20e0eb03f 100644
--- a/src/lib/stream/chacha/chacha_sse2/info.txt
+++ b/src/lib/stream/chacha/chacha_sse2/info.txt
@@ -1,3 +1,5 @@
-define CHACHA_SSE2 20160831
+<defines>
+CHACHA_SSE2 -> 20160831
+</defines>
need_isa sse2
diff --git a/src/lib/stream/chacha/info.txt b/src/lib/stream/chacha/info.txt
index f3bd1ffe8..0bcd013ad 100644
--- a/src/lib/stream/chacha/info.txt
+++ b/src/lib/stream/chacha/info.txt
@@ -1 +1,3 @@
-define CHACHA 20140103
+<defines>
+CHACHA -> 20140103
+</defines>
diff --git a/src/lib/stream/ctr/info.txt b/src/lib/stream/ctr/info.txt
index c0c6694b0..4cb30fa2f 100644
--- a/src/lib/stream/ctr/info.txt
+++ b/src/lib/stream/ctr/info.txt
@@ -1 +1,3 @@
-define CTR_BE 20131128
+<defines>
+CTR_BE -> 20131128
+</defines>
diff --git a/src/lib/stream/info.txt b/src/lib/stream/info.txt
index 59b5d577a..4f62c5a7c 100644
--- a/src/lib/stream/info.txt
+++ b/src/lib/stream/info.txt
@@ -1,4 +1,6 @@
-define STREAM_CIPHER 20131128
+<defines>
+STREAM_CIPHER -> 20131128
+</defines>
<header:public>
stream_cipher.h
diff --git a/src/lib/stream/ofb/info.txt b/src/lib/stream/ofb/info.txt
index 2d3d78f79..be585d0d3 100644
--- a/src/lib/stream/ofb/info.txt
+++ b/src/lib/stream/ofb/info.txt
@@ -1 +1,3 @@
-define OFB 20131128
+<defines>
+OFB -> 20131128
+</defines>
diff --git a/src/lib/stream/rc4/info.txt b/src/lib/stream/rc4/info.txt
index f61b8a4cc..97cc22760 100644
--- a/src/lib/stream/rc4/info.txt
+++ b/src/lib/stream/rc4/info.txt
@@ -1 +1,3 @@
-define RC4 20131128
+<defines>
+RC4 -> 20131128
+</defines>
diff --git a/src/lib/stream/salsa20/info.txt b/src/lib/stream/salsa20/info.txt
index 10f9a8cb2..3c7fed8fe 100644
--- a/src/lib/stream/salsa20/info.txt
+++ b/src/lib/stream/salsa20/info.txt
@@ -1 +1,3 @@
-define SALSA20 20131128
+<defines>
+SALSA20 -> 20131128
+</defines>
diff --git a/src/lib/stream/shake_cipher/info.txt b/src/lib/stream/shake_cipher/info.txt
index 53e6f5012..500a7265d 100644
--- a/src/lib/stream/shake_cipher/info.txt
+++ b/src/lib/stream/shake_cipher/info.txt
@@ -1 +1,3 @@
-define SHAKE_CIPHER 20161018
+<defines>
+SHAKE_CIPHER -> 20161018
+</defines>