move drivers/random SHA implementation to libutil and header to <minix/sha2.h>
This commit is contained in:
		
							parent
							
								
									36e12d5bd8
								
							
						
					
					
						commit
						035c5a369c
					
				@ -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=
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
 | 
			
		||||
@ -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 \
 | 
			
		||||
 | 
			
		||||
@ -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>
 | 
			
		||||
 | 
			
		||||
@ -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:
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user