diff options
| author | ume <ume@FreeBSD.org> | 2005-03-11 12:37:07 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2005-03-11 12:37:07 +0000 |
| commit | 4319b5fb5e160e2be5ff7b12e86441ffae879993 (patch) | |
| tree | 2ca524f4eb9697cb8e44dcb16dcb5bd954060917 /sys | |
| parent | 364f261bed3d4f605e8a6613b88275abb211a816 (diff) | |
| download | FreeBSD-src-4319b5fb5e160e2be5ff7b12e86441ffae879993.zip FreeBSD-src-4319b5fb5e160e2be5ff7b12e86441ffae879993.tar.gz | |
refer opencrypto/cast.h directly.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/crypto/cast128/cast128.h | 17 | ||||
| -rw-r--r-- | sys/netinet6/esp_core.c | 10 | ||||
| -rw-r--r-- | sys/opencrypto/cryptosoft.c | 2 |
3 files changed, 10 insertions, 19 deletions
diff --git a/sys/crypto/cast128/cast128.h b/sys/crypto/cast128/cast128.h deleted file mode 100644 index c316f17..0000000 --- a/sys/crypto/cast128/cast128.h +++ /dev/null @@ -1,17 +0,0 @@ -/* $FreeBSD$ */ - -#ifndef _CAST128_H_ -#define _CAST128_H_ - -#include <opencrypto/cast.h> - -#define cast128_key cast_key - -#define cast128_setkey(key, rawkey, keybytes) \ - cast_setkey((key), (rawkey), (keybytes)) -#define cast128_encrypt(key, inblock, outblock) \ - cast_encrypt((key), (inblock), (outblock)) -#define cast128_decrypt(key, inblock, outblock) \ - cast_decrypt((key), (inblock), (outblock)) - -#endif /* _CAST128_H_ */ diff --git a/sys/netinet6/esp_core.c b/sys/netinet6/esp_core.c index 31b3548..43ea585 100644 --- a/sys/netinet6/esp_core.c +++ b/sys/netinet6/esp_core.c @@ -75,7 +75,15 @@ #include <crypto/des/des.h> #include <crypto/blowfish/blowfish.h> -#include <crypto/cast128/cast128.h> + +#include <opencrypto/cast.h> +#define cast128_key cast_key +#define cast128_setkey(key, rawkey, keybytes) \ + cast_setkey((key), (rawkey), (keybytes)) +#define cast128_encrypt(key, inblock, outblock) \ + cast_encrypt((key), (inblock), (outblock)) +#define cast128_decrypt(key, inblock, outblock) \ + cast_decrypt((key), (inblock), (outblock)) #include <net/net_osdep.h> diff --git a/sys/opencrypto/cryptosoft.c b/sys/opencrypto/cryptosoft.c index db3cd75..d251d96 100644 --- a/sys/opencrypto/cryptosoft.c +++ b/sys/opencrypto/cryptosoft.c @@ -35,9 +35,9 @@ __FBSDID("$FreeBSD$"); #include <sys/uio.h> #include <crypto/blowfish/blowfish.h> -#include <crypto/cast128/cast128.h> #include <crypto/sha1.h> #include <opencrypto/rmd160.h> +#include <opencrypto/cast.h> #include <opencrypto/skipjack.h> #include <sys/md5.h> |
