aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorAllan Jude <allanjude@FreeBSD.org>2015-12-27 17:33:59 +0000
committerAllan Jude <allanjude@FreeBSD.org>2015-12-27 17:33:59 +0000
commit7a3f5d11fb3873674a1f7e27bcc9a5f7ce279390 (patch)
tree8a9bc5399c16c0f637716b176f3f95c32c001a0f /sys/dev
parent1747e1d875f0d7228940ece2eb8ad3b248832432 (diff)
Notes
Diffstat (limited to 'sys/dev')
-rwxr-xr-xsys/dev/random/build.sh2
-rw-r--r--sys/dev/random/fortuna.c4
-rw-r--r--sys/dev/random/hash.c2
-rw-r--r--sys/dev/random/other_algorithm.c2
-rw-r--r--sys/dev/random/randomdev.c2
-rw-r--r--sys/dev/random/unit_test.c2
-rw-r--r--sys/dev/random/yarrow.c4
7 files changed, 8 insertions, 10 deletions
diff --git a/sys/dev/random/build.sh b/sys/dev/random/build.sh
index 2b4052d1619c..326f8a6c12e4 100755
--- a/sys/dev/random/build.sh
+++ b/sys/dev/random/build.sh
@@ -42,7 +42,6 @@ cc -g -O0 -pthread \
hash.c \
../../crypto/rijndael/rijndael-api-fst.c \
../../crypto/rijndael/rijndael-alg-fst.c \
- ../../crypto/sha2/sha2.c \
../../crypto/sha2/sha256c.c \
-lz \
-o yunit_test
@@ -53,7 +52,6 @@ cc -g -O0 -pthread \
hash.c \
../../crypto/rijndael/rijndael-api-fst.c \
../../crypto/rijndael/rijndael-alg-fst.c \
- ../../crypto/sha2/sha2.c \
../../crypto/sha2/sha256c.c \
-lz \
-o funit_test
diff --git a/sys/dev/random/fortuna.c b/sys/dev/random/fortuna.c
index 4ae006b7e859..800c39702a8a 100644
--- a/sys/dev/random/fortuna.c
+++ b/sys/dev/random/fortuna.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
#include <machine/cpu.h>
#include <crypto/rijndael/rijndael-api-fst.h>
-#include <crypto/sha2/sha2.h>
+#include <crypto/sha2/sha256.h>
#include <dev/random/hash.h>
#include <dev/random/randomdev.h>
@@ -68,7 +68,7 @@ __FBSDID("$FreeBSD$");
#include "unit_test.h"
#include <crypto/rijndael/rijndael-api-fst.h>
-#include <crypto/sha2/sha2.h>
+#include <crypto/sha2/sha256.h>
#include <dev/random/hash.h>
#include <dev/random/randomdev.h>
diff --git a/sys/dev/random/hash.c b/sys/dev/random/hash.c
index 284057c672bb..fe52cd68b848 100644
--- a/sys/dev/random/hash.c
+++ b/sys/dev/random/hash.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
#endif /* _KERNEL */
#include <crypto/rijndael/rijndael-api-fst.h>
-#include <crypto/sha2/sha2.h>
+#include <crypto/sha2/sha256.h>
#include <dev/random/hash.h>
diff --git a/sys/dev/random/other_algorithm.c b/sys/dev/random/other_algorithm.c
index 740e879a6d6d..0c73ef5421df 100644
--- a/sys/dev/random/other_algorithm.c
+++ b/sys/dev/random/other_algorithm.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
#include <machine/cpu.h>
#include <crypto/rijndael/rijndael-api-fst.h>
-#include <crypto/sha2/sha2.h>
+#include <crypto/sha2/sha256.h>
#include <dev/random/hash.h>
#include <dev/random/randomdev.h>
diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c
index f20a462904f2..978a5644ca35 100644
--- a/sys/dev/random/randomdev.c
+++ b/sys/dev/random/randomdev.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
#include <sys/unistd.h>
#include <crypto/rijndael/rijndael-api-fst.h>
-#include <crypto/sha2/sha2.h>
+#include <crypto/sha2/sha256.h>
#include <dev/random/hash.h>
#include <dev/random/randomdev.h>
diff --git a/sys/dev/random/unit_test.c b/sys/dev/random/unit_test.c
index f682d17f95f9..aec2f1d2837e 100644
--- a/sys/dev/random/unit_test.c
+++ b/sys/dev/random/unit_test.c
@@ -36,7 +36,7 @@ cc -g -O0 -pthread -DRANDOM_<alg> -I../.. -lstdthreads -Wall \
hash.c \
../../crypto/rijndael/rijndael-api-fst.c \
../../crypto/rijndael/rijndael-alg-fst.c \
- ../../crypto/sha2/sha2.c \
+ ../../crypto/sha2/sha256c.c \
-lz \
-o unit_test
./unit_test
diff --git a/sys/dev/random/yarrow.c b/sys/dev/random/yarrow.c
index 5cb1bcecae3e..8d5f389b846b 100644
--- a/sys/dev/random/yarrow.c
+++ b/sys/dev/random/yarrow.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
#include <machine/cpu.h>
#include <crypto/rijndael/rijndael-api-fst.h>
-#include <crypto/sha2/sha2.h>
+#include <crypto/sha2/sha256.h>
#include <dev/random/hash.h>
#include <dev/random/randomdev.h>
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
#include "unit_test.h"
#include <crypto/rijndael/rijndael-api-fst.h>
-#include <crypto/sha2/sha2.h>
+#include <crypto/sha2/sha256.h>
#include <dev/random/hash.h>
#include <dev/random/randomdev.h>