diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-05-18 17:00:34 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-05-18 17:00:34 +0000 |
| commit | 0b06c334ac6726216450c8d7ab7d6c095fcff45a (patch) | |
| tree | af67d3bd1aa1ba7739ebbdc87f7cde38145a1c34 | |
| parent | bc9f84188fae8a4bf82e9b1fef306384971527d4 (diff) | |
not ready to export fcrypt to userland yet; spotted by lebel
| -rw-r--r-- | sys/crypto/cryptodev.c | 30 | ||||
| -rw-r--r-- | sys/crypto/cryptodev.h | 32 |
2 files changed, 30 insertions, 32 deletions
diff --git a/sys/crypto/cryptodev.c b/sys/crypto/cryptodev.c index 5691f176da6..f6c45e8b12a 100644 --- a/sys/crypto/cryptodev.c +++ b/sys/crypto/cryptodev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cryptodev.c,v 1.43 2002/05/18 09:58:12 deraadt Exp $ */ +/* $OpenBSD: cryptodev.c,v 1.44 2002/05/18 17:00:33 deraadt Exp $ */ /* * Copyright (c) 2001 Theo de Raadt @@ -52,6 +52,34 @@ #include <crypto/cryptodev.h> #include <crypto/xform.h> +struct csession { + TAILQ_ENTRY(csession) next; + u_int64_t sid; + u_int32_t ses; + + u_int32_t cipher; + struct enc_xform *txform; + u_int32_t mac; + struct auth_hash *thash; + + caddr_t key; + int keylen; + u_char tmp_iv[EALG_MAX_BLOCK_LEN]; + + caddr_t mackey; + int mackeylen; + u_char tmp_mac[CRYPTO_MAX_MAC_LEN]; + + struct iovec iovec[IOV_MAX]; + struct uio uio; + int error; +}; + +struct fcrypt { + TAILQ_HEAD(csessionlist, csession) csessions; + int sesn; +}; + void cryptoattach(int); int cryptoopen(dev_t, int, int, struct proc *); diff --git a/sys/crypto/cryptodev.h b/sys/crypto/cryptodev.h index 7456c7dce81..d64514a8434 100644 --- a/sys/crypto/cryptodev.h +++ b/sys/crypto/cryptodev.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cryptodev.h,v 1.28 2002/05/18 09:58:12 deraadt Exp $ */ +/* $OpenBSD: cryptodev.h,v 1.29 2002/05/18 17:00:33 deraadt Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu) @@ -282,29 +282,6 @@ struct crypt_op { #define CRSFEAT_DH 0x00000004 /* supports all basic DH ops */ #ifdef _KERNEL -struct csession { - TAILQ_ENTRY(csession) next; - u_int64_t sid; - u_int32_t ses; - - u_int32_t cipher; - struct enc_xform *txform; - u_int32_t mac; - struct auth_hash *thash; - - caddr_t key; - int keylen; - u_char tmp_iv[EALG_MAX_BLOCK_LEN]; - - caddr_t mackey; - int mackeylen; - u_char tmp_mac[CRYPTO_MAX_MAC_LEN]; - - struct iovec iovec[IOV_MAX]; - struct uio uio; - int error; -}; - int crypto_newsession(u_int64_t *, struct cryptoini *, int); int crypto_freesession(u_int64_t); int crypto_dispatch(struct cryptop *); @@ -332,11 +309,4 @@ int cuio_apply(struct uio *, int, int, struct cryptop *crypto_getreq(int); void crypto_freereq(struct cryptop *); #endif /* _KERNEL */ - -struct csession; -struct fcrypt { - TAILQ_HEAD(csessionlist, csession) csessions; - int sesn; -}; - #endif /* _CRYPTO_CRYPTO_H_ */ |