diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2000-03-20 21:21:50 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2000-03-20 21:21:50 +0000 |
| commit | 1a2c729fbcd6a6056047031a0c913d69402f6d61 (patch) | |
| tree | d2655b444e4d4ddb9c6ddb907ce0bef366cdfe0d /sys/crypto | |
| parent | 6e61e3438ad2c1b357701ff3c6023f8b2ec283c5 (diff) | |
move software crypto engine out of main crypto.c
Diffstat (limited to 'sys/crypto')
| -rw-r--r-- | sys/crypto/crypto.h | 41 | ||||
| -rw-r--r-- | sys/crypto/cryptosoft.c | 1 |
2 files changed, 1 insertions, 41 deletions
diff --git a/sys/crypto/crypto.h b/sys/crypto/crypto.h index ba1ad389c23..7bbd45c1f0f 100644 --- a/sys/crypto/crypto.h +++ b/sys/crypto/crypto.h @@ -144,49 +144,8 @@ struct cryptocap int (*cc_freesession) (u_int32_t); }; -/* Software session entry */ -struct swcr_data -{ - int sw_alg; /* Algorithm */ - union - { - struct - { - u_int8_t *SW_ictx; - u_int8_t *SW_octx; - struct auth_hash *SW_axf; - } SWCR_AUTH; - - struct - { - u_int8_t *SW_kschedule; - u_int8_t *SW_iv; - struct enc_xform *SW_exf; - } SWCR_ENC; - } SWCR_UN; - -#define sw_ictx SWCR_UN.SWCR_AUTH.SW_ictx -#define sw_octx SWCR_UN.SWCR_AUTH.SW_octx -#define sw_axf SWCR_UN.SWCR_AUTH.SW_axf -#define sw_kschedule SWCR_UN.SWCR_ENC.SW_kschedule -#define sw_iv SWCR_UN.SWCR_ENC.SW_iv -#define sw_exf SWCR_UN.SWCR_ENC.SW_exf - - struct swcr_data *sw_next; -}; #ifdef _KERNEL -extern u_int8_t hmac_ipad_buffer[64]; -extern u_int8_t hmac_opad_buffer[64]; - -extern int swcr_encdec(struct cryptodesc *, struct swcr_data *, caddr_t, int); -extern int swcr_authcompute(struct cryptodesc *, struct swcr_data *, - caddr_t, int); -extern int swcr_process(struct cryptop *); -extern int swcr_newsession(u_int32_t *, struct cryptoini *); -extern int swcr_freesession(u_int32_t); -extern void swcr_init(void); - extern int crypto_newsession(u_int64_t *, struct cryptoini *); extern int crypto_freesession(u_int64_t); extern int crypto_dispatch(struct cryptop *); diff --git a/sys/crypto/cryptosoft.c b/sys/crypto/cryptosoft.c index d877c8e957b..2a8aaa11332 100644 --- a/sys/crypto/cryptosoft.c +++ b/sys/crypto/cryptosoft.c @@ -33,6 +33,7 @@ #include <crypto/skipjack.h> #include <crypto/blf.h> #include <crypto/crypto.h> +#include <crypto/cryptosoft.h> #include <crypto/xform.h> u_int8_t hmac_ipad_buffer[64] = { |