move drivers/random SHA implementation to libutil and header to <minix/sha2.h>

diff --git a/drivers/random/Makefile b/drivers/random/Makefile
index a6f474146a4cfc62c6a54c868952a15385daa65d..21fccde02549307fa7b5d3d03d63963c23c39802 100644 (file)
--- a/drivers/random/Makefile
+++ b/drivers/random/Makefile
@@ -1,11 +1,11 @@
 # Makefile for random driver (RANDOM)
 PROG=  random
-SRCS=  main.c random.c sha2.c rijndael_api.c rijndael_alg.c
+SRCS=  main.c random.c rijndael_api.c rijndael_alg.c
 
 .PATH: ${.CURDIR}/aes
 
 DPADD+=        ${LIBDRIVER} ${LIBSYS}
-LDADD+=        -ldriver -lsys
+LDADD+=        -ldriver -lsys -lutil
 
 MAN=
 

diff --git a/drivers/random/random.c b/drivers/random/random.c
index 9e74ea4f7142d727b13a64f872be2214f230ea12..eb794a20c4f56a29e62a3bd294dbb7f3d5d4a436 100644 (file)
--- a/drivers/random/random.c
+++ b/drivers/random/random.c
@@ -12,7 +12,7 @@ that data into a seed for a psuedo random number generator.
 #include "assert.h"
 
 #include "random.h"
-#include "sha2.h"
+#include <minix/sha2.h>
 #include "aes/rijndael.h"
 
 #define N_DERIV        16

diff --git a/include/Makefile b/include/Makefile
index c7456927568a9be6d7b3a7c657fa1712b12a410d..70a5067d170497e594da7d63bf33eb066bde8935 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -24,7 +24,7 @@ INCS+=        minix/a.out.h minix/bitmap.h minix/callnr.h minix/cdrom.h \
        minix/sys_config.h minix/sysinfo.h minix/syslib.h \
        minix/sysutil.h minix/tty.h minix/type.h minix/types.h \
        minix/u64.h minix/vfsif.h minix/vm.h \
-       minix/compiler.h minix/compiler-ack.h
+       minix/compiler.h minix/compiler-ack.h minix/sha2.h
 INCS+= net/hton.h net/if.h net/ioctl.h net/netlib.h
 INCS+= net/gen/arp_io.h net/gen/dhcp.h net/gen/ether.h \
        net/gen/eth_hdr.h net/gen/eth_io.h net/gen/icmp.h \

diff --git a/drivers/random/sha2.h b/include/minix/sha2.h
similarity index 100%
rename from drivers/random/sha2.h
rename to include/minix/sha2.h

diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index 87b0cc4881cd56437068ddec99a386d4dcaac02b..9b5dba9213282df077521c95d9f5f311d3f4b121 100644 (file)
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -4,6 +4,6 @@ CPPFLAGS+=-O -D_MINIX -D_POSIX_SOURCE
 
 LIB=   util
 
-SRCS=  openpty.c
+SRCS=  openpty.c sha2.c
 
 .include <minix.lib.mk>

diff --git a/drivers/random/sha2.c b/lib/libutil/sha2.c
similarity index 99%
rename from drivers/random/sha2.c
rename to lib/libutil/sha2.c
index 5691dc8aa28609d781580987060b2e5fee409f4d..33ba0e7e18ff1ca2ea40836512aae440ffa4fff7 100644 (file)
--- a/drivers/random/sha2.c
+++ b/lib/libutil/sha2.c
@@ -40,7 +40,7 @@
 /* #include <sys/time.h> */
 /* #include <sys/systm.h> */
 /* #include <machine/endian.h> */
-#include "sha2.h"
+#include <minix/sha2.h>
 
 /*
  * ASSERT NOTE: