merge crypto/crypto{dev,}.h to crypto/cryptodev.h, to avoid name conflicts inside OpenSSL codebase

15 files changed, 194 insertions, 198 deletions

diff --git a/sys/crypto/criov.c b/sys/crypto/criov.c
index aab7ff5205d..2752d6a7803 100644
--- a/sys/crypto/criov.c
+++ b/sys/crypto/criov.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: criov.c,v 1.5 2001/06/18 08:34:45 deraadt Exp $	*/
+/*      $OpenBSD: criov.c,v 1.6 2001/06/23 18:30:35 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1999 Theo de Raadt
@@ -38,7 +38,7 @@
 #include <vm/vm_extern.h>
 #include <vm/pmap.h>
 
-#include <crypto/crypto.h>
+#include <crypto/cryptodev.h>
 
 int
 iov2pages(uio, np, pp, lp, maxp, nicep)
diff --git a/sys/crypto/crypto.c b/sys/crypto/crypto.c
index 203dc6688f0..6ac917e3628 100644
--- a/sys/crypto/crypto.c
+++ b/sys/crypto/crypto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crypto.c,v 1.19 2001/06/16 22:17:49 deraadt Exp $	*/
+/*	$OpenBSD: crypto.c,v 1.20 2001/06/23 18:30:35 deraadt Exp $	*/
 
 /*
  * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
@@ -26,7 +26,7 @@
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/pool.h>
-#include <crypto/crypto.h>
+#include <crypto/cryptodev.h>
 
 struct cryptocap *crypto_drivers = NULL;
 int crypto_drivers_num = 0;
diff --git a/sys/crypto/crypto.h b/sys/crypto/crypto.h
deleted file mode 100644
index 46eb89a47f7..00000000000
--- a/sys/crypto/crypto.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*	$OpenBSD: crypto.h,v 1.20 2001/06/16 22:17:49 deraadt Exp $	*/
-
-/*
- * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
- *
- * This code was written by Angelos D. Keromytis in Athens, Greece, in
- * February 2000. Network Security Technologies Inc. (NSTI) kindly
- * supported the development of this code.
- *
- * Copyright (c) 2000 Angelos D. Keromytis
- *
- * Permission to use, copy, and modify this software without fee
- * is hereby granted, provided that this entire notice is included in
- * all source code copies of any software which is or includes a copy or
- * modification of this software. 
- *
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
- * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
- * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
- * PURPOSE.
- */
-
-#ifndef _CRYPTO_CRYPTO_H_
-#define _CRYPTO_CRYPTO_H_
-
-/* Some initial values */
-#define CRYPTO_DRIVERS_INITIAL	4
-#define CRYPTO_SW_SESSIONS	32
-
-/* HMAC values */
-#define HMAC_BLOCK_LEN		64
-#define HMAC_IPAD_VAL		0x36
-#define HMAC_OPAD_VAL		0x5C
-
-/* Encryption algorithm block sizes */
-#define DES_BLOCK_LEN		8
-#define DES3_BLOCK_LEN		8
-#define BLOWFISH_BLOCK_LEN	8
-#define SKIPJACK_BLOCK_LEN	8
-#define CAST128_BLOCK_LEN	8
-#define RIJNDAEL128_BLOCK_LEN	16
-#define EALG_MAX_BLOCK_LEN	16 /* Keep this updated */
-
-/* Maximum hash algorithm result length */
-#define AALG_MAX_RESULT_LEN	20 /* Keep this updated */
-
-#define CRYPTO_DES_CBC		1
-#define CRYPTO_3DES_CBC		2
-#define CRYPTO_BLF_CBC		3
-#define CRYPTO_CAST_CBC		4
-#define CRYPTO_SKIPJACK_CBC	5
-#define CRYPTO_MD5_HMAC		6
-#define CRYPTO_SHA1_HMAC	7
-#define CRYPTO_RIPEMD160_HMAC	8
-#define CRYPTO_MD5_KPDK		9
-#define CRYPTO_SHA1_KPDK	10
-#define CRYPTO_RIJNDAEL128_CBC	11 /* 128 bit blocksize */
-#define CRYPTO_AES_CBC		11 /* 128 bit blocksize -- the same as above */
-
-#define CRYPTO_ALGORITHM_MAX	11 /* Keep this updated */
-
-/* Standard initialization structure beginning */
-struct cryptoini {
-	int		cri_alg;	/* Algorithm to use */
-	int		cri_klen;	/* Key length, in bits */
-	int		cri_rnd;	/* Algorithm rounds, where relevant */
-	caddr_t		cri_key;	/* key to use */
-	u_int8_t	cri_iv[EALG_MAX_BLOCK_LEN];	/* IV to use */
-	struct cryptoini *cri_next;
-};
-
-/* Describe boundaries of a single crypto operation */
-struct cryptodesc {
-	int		crd_skip;	/* How many bytes to ignore from start */
-	int		crd_len;	/* How many bytes to process */
-	int		crd_inject;	/* Where to inject results, if applicable */
-	int		crd_flags;
-
-#define CRD_F_ENCRYPT		0x1	/* Set when doing encryption */
-#define CRD_F_IV_PRESENT	0x2	/* When encrypting, IV is already in
-					   place, so don't copy. */
-#define CRD_F_IV_EXPLICIT	0x4	/* IV explicitly provided */
-
-	struct cryptoini	CRD_INI; /* Initialization/context data */
-#define crd_iv		CRD_INI.cri_iv
-#define crd_key		CRD_INI.cri_key
-#define crd_rnd		CRD_INI.cri_rnd
-#define crd_alg		CRD_INI.cri_alg
-#define crd_klen	CRD_INI.cri_klen
-
-	struct cryptodesc *crd_next;
-};
-
-/* Structure describing complete operation */
-struct cryptop {
-	u_int64_t	crp_sid;	/* Session ID */
-	int		crp_ilen;	/* Input data total length */
-	int		crp_olen;	/* Result total length (unused for now) */
-	int		crp_alloctype;	/* Type of buf to allocate if needed */
-
-	int		crp_etype;	/*
-					 * Error type (zero means no error).
-					 * All error codes except EAGAIN
-					 * indicate possible data corruption (as in,
-					 * the data have been touched). On all
-					 * errors, the crp_sid may have changed
-					 * (reset to a new one), so the caller
-					 * should always check and use the new
-					 * value on future requests.
-					 */
-	int		crp_flags;
-
-#define CRYPTO_F_IMBUF	0x0001	/* Input/output are mbuf chains, otherwise contig */
-#define CRYPTO_F_IOV	0x0002	/* Input/output are uio */
-#define CRYPTO_F_REL	0x0004	/* Must return data in same place */
-
-	caddr_t		crp_buf;	/* Data to be processed */
-	caddr_t		crp_opaque;	/* Opaque pointer, passed along */
-	struct cryptodesc *crp_desc;	/* Linked list of processing descriptors */
-	int (*crp_callback)(struct cryptop *); /* Callback function */
-	struct cryptop	*crp_next;
-	caddr_t		crp_iv;
-	caddr_t		crp_mac;
-	int		crp_mac_trunc_len;
-};
-
-#define CRYPTO_BUF_CONTIG	0x1
-#define CRYPTO_BUF_MBUF		0x2
-
-#define CRYPTO_OP_DECRYPT	0x0
-#define CRYPTO_OP_ENCRYPT	0x1
-
-/* Crypto capabilities structure */
-struct cryptocap {
-	u_int32_t	cc_sessions;
-	u_int8_t	cc_alg[CRYPTO_ALGORITHM_MAX + 1]; /* Supported */
-	u_int8_t	cc_flags;
-#define CRYPTOCAP_F_CLEANUP   0x1
-#define CRYPTOCAP_F_SOFTWARE  0x02
-
-	int		(*cc_newsession) (u_int32_t *, struct cryptoini *);
-	int		(*cc_process) (struct cryptop *);
-	int		(*cc_freesession) (u_int64_t);
-};
-
-
-#ifdef _KERNEL
-int	crypto_newsession(u_int64_t *, struct cryptoini *, int);
-int	crypto_freesession(u_int64_t);
-int	crypto_dispatch(struct cryptop *);
-int	crypto_register(u_int32_t, int,
-	    int (*)(u_int32_t *, struct cryptoini *), int (*)(u_int64_t),
-	    int (*)(struct cryptop *));
-int	crypto_unregister(u_int32_t, int);
-int32_t	crypto_get_driverid(void);
-void	crypto_thread(void);
-int	crypto_invoke(struct cryptop *);
-void	crypto_done(struct cryptop *);
-
-struct mbuf;
-int	mbuf2pages __P((struct mbuf *, int *, long *, int *, int, int *));
-int	iov2pages __P((struct uio *, int *, long *, int *, int, int *));
-void	cuio_copydata __P((struct uio *, int, int, caddr_t));
-void	cuio_copyback __P((struct uio *, int, int, caddr_t));
-
-struct	cryptop *crypto_getreq(int);
-void	crypto_freereq(struct cryptop *);
-#endif /* _KERNEL */
-#endif /* _CRYPTO_CRYPTO_H_ */
diff --git a/sys/crypto/cryptodev.c b/sys/crypto/cryptodev.c
index 6a5a72684cd..8db25708c39 100644
--- a/sys/crypto/cryptodev.c
+++ b/sys/crypto/cryptodev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cryptodev.c,v 1.14 2001/06/23 01:29:40 pvalchev Exp $	*/
+/*	$OpenBSD: cryptodev.c,v 1.15 2001/06/23 18:30:36 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2001 Theo de Raadt
@@ -44,9 +44,8 @@
 #include <crypto/cast.h>
 #include <crypto/skipjack.h>
 #include <crypto/blf.h>
-#include <crypto/crypto.h>
-#include <crypto/xform.h>
 #include <crypto/cryptodev.h>
+#include <crypto/xform.h>
 
 struct csession {
 	TAILQ_ENTRY(csession) next;
diff --git a/sys/crypto/cryptodev.h b/sys/crypto/cryptodev.h
index 12260ddc49e..58b3e844882 100644
--- a/sys/crypto/cryptodev.h
+++ b/sys/crypto/cryptodev.h
@@ -1,6 +1,25 @@
-/*	$OpenBSD: cryptodev.h,v 1.3 2001/06/01 23:51:27 deraadt Exp $	*/
+/*	$OpenBSD: cryptodev.h,v 1.4 2001/06/23 18:30:36 deraadt Exp $	*/
 
 /*
+ * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
+ *
+ * This code was written by Angelos D. Keromytis in Athens, Greece, in
+ * February 2000. Network Security Technologies Inc. (NSTI) kindly
+ * supported the development of this code.
+ *
+ * Copyright (c) 2000 Angelos D. Keromytis
+ *
+ * Permission to use, copy, and modify this software without fee
+ * is hereby granted, provided that this entire notice is included in
+ * all source code copies of any software which is or includes a copy or
+ * modification of this software. 
+ *
+ * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
+ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
+ * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
+ * PURPOSE.
+ *
  * Copyright (c) 2001 Theo de Raadt
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,8 +46,131 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef _CRYPTO_CRYPTO_H_
+#define _CRYPTO_CRYPTO_H_
+
 #include <sys/ioccom.h>
 
+/* Some initial values */
+#define CRYPTO_DRIVERS_INITIAL	4
+#define CRYPTO_SW_SESSIONS	32
+
+/* HMAC values */
+#define HMAC_BLOCK_LEN		64
+#define HMAC_IPAD_VAL		0x36
+#define HMAC_OPAD_VAL		0x5C
+
+/* Encryption algorithm block sizes */
+#define DES_BLOCK_LEN		8
+#define DES3_BLOCK_LEN		8
+#define BLOWFISH_BLOCK_LEN	8
+#define SKIPJACK_BLOCK_LEN	8
+#define CAST128_BLOCK_LEN	8
+#define RIJNDAEL128_BLOCK_LEN	16
+#define EALG_MAX_BLOCK_LEN	16 /* Keep this updated */
+
+/* Maximum hash algorithm result length */
+#define AALG_MAX_RESULT_LEN	20 /* Keep this updated */
+
+#define CRYPTO_DES_CBC		1
+#define CRYPTO_3DES_CBC		2
+#define CRYPTO_BLF_CBC		3
+#define CRYPTO_CAST_CBC		4
+#define CRYPTO_SKIPJACK_CBC	5
+#define CRYPTO_MD5_HMAC		6
+#define CRYPTO_SHA1_HMAC	7
+#define CRYPTO_RIPEMD160_HMAC	8
+#define CRYPTO_MD5_KPDK		9
+#define CRYPTO_SHA1_KPDK	10
+#define CRYPTO_RIJNDAEL128_CBC	11 /* 128 bit blocksize */
+#define CRYPTO_AES_CBC		11 /* 128 bit blocksize -- the same as above */
+
+#define CRYPTO_ALGORITHM_MAX	11 /* Keep this updated */
+
+/* Standard initialization structure beginning */
+struct cryptoini {
+	int		cri_alg;	/* Algorithm to use */
+	int		cri_klen;	/* Key length, in bits */
+	int		cri_rnd;	/* Algorithm rounds, where relevant */
+	caddr_t		cri_key;	/* key to use */
+	u_int8_t	cri_iv[EALG_MAX_BLOCK_LEN];	/* IV to use */
+	struct cryptoini *cri_next;
+};
+
+/* Describe boundaries of a single crypto operation */
+struct cryptodesc {
+	int		crd_skip;	/* How many bytes to ignore from start */
+	int		crd_len;	/* How many bytes to process */
+	int		crd_inject;	/* Where to inject results, if applicable */
+	int		crd_flags;
+
+#define CRD_F_ENCRYPT		0x1	/* Set when doing encryption */
+#define CRD_F_IV_PRESENT	0x2	/* When encrypting, IV is already in
+					   place, so don't copy. */
+#define CRD_F_IV_EXPLICIT	0x4	/* IV explicitly provided */
+
+	struct cryptoini	CRD_INI; /* Initialization/context data */
+#define crd_iv		CRD_INI.cri_iv
+#define crd_key		CRD_INI.cri_key
+#define crd_rnd		CRD_INI.cri_rnd
+#define crd_alg		CRD_INI.cri_alg
+#define crd_klen	CRD_INI.cri_klen
+
+	struct cryptodesc *crd_next;
+};
+
+/* Structure describing complete operation */
+struct cryptop {
+	u_int64_t	crp_sid;	/* Session ID */
+	int		crp_ilen;	/* Input data total length */
+	int		crp_olen;	/* Result total length (unused for now) */
+	int		crp_alloctype;	/* Type of buf to allocate if needed */
+
+	int		crp_etype;	/*
+					 * Error type (zero means no error).
+					 * All error codes except EAGAIN
+					 * indicate possible data corruption (as in,
+					 * the data have been touched). On all
+					 * errors, the crp_sid may have changed
+					 * (reset to a new one), so the caller
+					 * should always check and use the new
+					 * value on future requests.
+					 */
+	int		crp_flags;
+
+#define CRYPTO_F_IMBUF	0x0001	/* Input/output are mbuf chains, otherwise contig */
+#define CRYPTO_F_IOV	0x0002	/* Input/output are uio */
+#define CRYPTO_F_REL	0x0004	/* Must return data in same place */
+
+	caddr_t		crp_buf;	/* Data to be processed */
+	caddr_t		crp_opaque;	/* Opaque pointer, passed along */
+	struct cryptodesc *crp_desc;	/* Linked list of processing descriptors */
+	int (*crp_callback)(struct cryptop *); /* Callback function */
+	struct cryptop	*crp_next;
+	caddr_t		crp_iv;
+	caddr_t		crp_mac;
+	int		crp_mac_trunc_len;
+};
+
+#define CRYPTO_BUF_CONTIG	0x1
+#define CRYPTO_BUF_MBUF		0x2
+
+#define CRYPTO_OP_DECRYPT	0x0
+#define CRYPTO_OP_ENCRYPT	0x1
+
+/* Crypto capabilities structure */
+struct cryptocap {
+	u_int32_t	cc_sessions;
+	u_int8_t	cc_alg[CRYPTO_ALGORITHM_MAX + 1]; /* Supported */
+	u_int8_t	cc_flags;
+#define CRYPTOCAP_F_CLEANUP   0x1
+#define CRYPTOCAP_F_SOFTWARE  0x02
+
+	int		(*cc_newsession) (u_int32_t *, struct cryptoini *);
+	int		(*cc_process) (struct cryptop *);
+	int		(*cc_freesession) (u_int64_t);
+};
+
 struct session_op {
 	u_int32_t	cipher;		/* ie. CRYPTO_DES_CBC */
 	u_int32_t	mac;		/* ie. CRYPTO_MD5_HMAC */
@@ -62,3 +204,28 @@ struct crypt_op {
 #define	CIOCGSESSION	_IOWR('c', 101, struct session_op)
 #define	CIOCFSESSION	_IOW('c', 102, u_int32_t)
 #define CIOCCRYPT	_IOWR('c', 103, struct crypt_op)
+
+
+#ifdef _KERNEL
+int	crypto_newsession(u_int64_t *, struct cryptoini *, int);
+int	crypto_freesession(u_int64_t);
+int	crypto_dispatch(struct cryptop *);
+int	crypto_register(u_int32_t, int,
+	    int (*)(u_int32_t *, struct cryptoini *), int (*)(u_int64_t),
+	    int (*)(struct cryptop *));
+int	crypto_unregister(u_int32_t, int);
+int32_t	crypto_get_driverid(void);
+void	crypto_thread(void);
+int	crypto_invoke(struct cryptop *);
+void	crypto_done(struct cryptop *);
+
+struct mbuf;
+int	mbuf2pages __P((struct mbuf *, int *, long *, int *, int, int *));
+int	iov2pages __P((struct uio *, int *, long *, int *, int, int *));
+void	cuio_copydata __P((struct uio *, int, int, caddr_t));
+void	cuio_copyback __P((struct uio *, int, int, caddr_t));
+
+struct	cryptop *crypto_getreq(int);
+void	crypto_freereq(struct cryptop *);
+#endif /* _KERNEL */
+#endif /* _CRYPTO_CRYPTO_H_ */
diff --git a/sys/crypto/cryptombuf.c b/sys/crypto/cryptombuf.c
index da6ad720914..ae4320628c1 100644
--- a/sys/crypto/cryptombuf.c
+++ b/sys/crypto/cryptombuf.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: cryptombuf.c,v 1.2 2001/06/08 10:35:14 art Exp $	*/
+/*      $OpenBSD: cryptombuf.c,v 1.3 2001/06/23 18:30:36 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1999 Theo de Raadt
@@ -38,7 +38,7 @@
 #include <vm/vm_extern.h>
 #include <vm/pmap.h>
 
-#include <crypto/crypto.h>
+#include <crypto/cryptodev.h>
 
 int
 mbuf2pages(m, np, pp, lp, maxp, nicep)
diff --git a/sys/crypto/cryptosoft.c b/sys/crypto/cryptosoft.c
index 009a96df8b6..b38272f8737 100644
--- a/sys/crypto/cryptosoft.c
+++ b/sys/crypto/cryptosoft.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cryptosoft.c,v 1.22 2001/06/16 22:17:49 deraadt Exp $	*/
+/*	$OpenBSD: cryptosoft.c,v 1.23 2001/06/23 18:30:36 deraadt Exp $	*/
 
 /*
  * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
@@ -34,7 +34,7 @@
 #include <crypto/cast.h>
 #include <crypto/skipjack.h>
 #include <crypto/blf.h>
-#include <crypto/crypto.h>
+#include <crypto/cryptodev.h>
 #include <crypto/cryptosoft.h>
 #include <crypto/xform.h>
 
diff --git a/sys/crypto/xform.c b/sys/crypto/xform.c
index 8b2a4ae33f6..4ff79f71703 100644
--- a/sys/crypto/xform.c
+++ b/sys/crypto/xform.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xform.c,v 1.7 2001/06/16 22:17:50 deraadt Exp $	*/
+/*	$OpenBSD: xform.c,v 1.8 2001/06/23 18:30:36 deraadt Exp $	*/
 
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -51,7 +51,7 @@
 #include <crypto/cast.h>
 #include <crypto/skipjack.h>
 #include <crypto/rijndael.h>
-#include <crypto/crypto.h>
+#include <crypto/cryptodev.h>
 #include <crypto/xform.h>
 
 extern void des_ecb3_encrypt(caddr_t, caddr_t, caddr_t, caddr_t, caddr_t, int);
diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c
index e5d136892ab..c0e672f9be6 100644
--- a/sys/dev/pci/hifn7751.c
+++ b/sys/dev/pci/hifn7751.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hifn7751.c,v 1.72 2001/06/23 00:25:37 jason Exp $	*/
+/*	$OpenBSD: hifn7751.c,v 1.73 2001/06/23 18:30:37 deraadt Exp $	*/
 
 /*
  * Invertex AEON / Hi/fn 7751 driver
@@ -52,7 +52,7 @@
 #include <machine/pmap.h>
 #include <sys/device.h>
 
-#include <crypto/crypto.h>
+#include <crypto/cryptodev.h>
 #include <dev/rndvar.h>
 
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/ises.c b/sys/dev/pci/ises.c
index 1d302121f8d..db141d384ae 100644
--- a/sys/dev/pci/ises.c
+++ b/sys/dev/pci/ises.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ises.c,v 1.7 2001/06/12 15:40:32 niklas Exp $	*/
+/*	$OpenBSD: ises.c,v 1.8 2001/06/23 18:30:37 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2000, 2001 Håkan Olsson (ho@crt.se)
@@ -43,7 +43,7 @@
 #include <sys/device.h>
 #include <sys/queue.h>
 
-#include <crypto/crypto.h>
+#include <crypto/cryptodev.h>
 #include <crypto/cryptosoft.h>
 #include <dev/rndvar.h>
 #include <sys/md5k.h>
diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c
index e82df674e27..0b477adde70 100644
--- a/sys/dev/pci/ubsec.c
+++ b/sys/dev/pci/ubsec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ubsec.c,v 1.59 2001/06/18 10:23:45 deraadt Exp $	*/
+/*	$OpenBSD: ubsec.c,v 1.60 2001/06/23 18:30:37 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2000 Jason L. Wright (jason@thought.net)
@@ -53,7 +53,7 @@
 #include <sys/device.h>
 #include <sys/queue.h>
 
-#include <crypto/crypto.h>
+#include <crypto/cryptodev.h>
 #include <crypto/cryptosoft.h>
 #include <dev/rndvar.h>
 #include <sys/md5k.h>
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 3635e8b94fb..a7f0229cbcd 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init_main.c,v 1.67 2001/06/23 06:04:34 art Exp $	*/
+/*	$OpenBSD: init_main.c,v 1.68 2001/06/23 18:30:37 deraadt Exp $	*/
 /*	$NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $	*/
 
 /*
@@ -98,7 +98,7 @@
 #include <net/raw_cb.h>
 
 #if defined(CRYPTO)
-#include <crypto/crypto.h>
+#include <crypto/cryptodev.h>
 #include <crypto/cryptosoft.h>
 #endif
 
diff --git a/sys/net/pfkeyv2_convert.c b/sys/net/pfkeyv2_convert.c
index b6fd5cf7a76..49fc24ff3ca 100644
--- a/sys/net/pfkeyv2_convert.c
+++ b/sys/net/pfkeyv2_convert.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfkeyv2_convert.c,v 1.1 2001/06/08 02:53:49 angelos Exp $	*/
+/*	$OpenBSD: pfkeyv2_convert.c,v 1.2 2001/06/23 18:30:37 deraadt Exp $	*/
 
 /*
  * The author of this code is Angelos D. Keromytis (angelos@keromytis.org)
@@ -100,7 +100,7 @@
 #include <sys/socket.h>
 #include <netinet/ip_ipsp.h>
 #include <net/pfkeyv2.h>
-#include <crypto/crypto.h>
+#include <crypto/cryptodev.h>
 #include <crypto/xform.h>
 
 /*
diff --git a/sys/netinet/ip_ah.c b/sys/netinet/ip_ah.c
index a736d3f688a..07044c62692 100644
--- a/sys/netinet/ip_ah.c
+++ b/sys/netinet/ip_ah.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ah.c,v 1.60 2001/06/23 16:15:56 fgsch Exp $ */
+/*	$OpenBSD: ip_ah.c,v 1.61 2001/06/23 18:30:38 deraadt Exp $ */
 
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -62,7 +62,7 @@
 #include <net/pfkeyv2.h>
 #include <net/if_enc.h>
 
-#include <crypto/crypto.h>
+#include <crypto/cryptodev.h>
 #include <crypto/xform.h>
 
 #include "bpfilter.h"
diff --git a/sys/netinet/ip_esp.c b/sys/netinet/ip_esp.c
index 54d8659334c..08b39b55230 100644
--- a/sys/netinet/ip_esp.c
+++ b/sys/netinet/ip_esp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_esp.c,v 1.66 2001/06/13 13:42:02 angelos Exp $ */
+/*	$OpenBSD: ip_esp.c,v 1.67 2001/06/23 18:30:38 deraadt Exp $ */
 
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
@@ -63,7 +63,7 @@
 #include <net/pfkeyv2.h>
 #include <net/if_enc.h>
 
-#include <crypto/crypto.h>
+#include <crypto/cryptodev.h>
 #include <crypto/xform.h>
 
 #include "bpfilter.h"