diff options
| author | Christian Weisgerber <naddy@cvs.openbsd.org> | 2015-11-13 15:29:56 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@cvs.openbsd.org> | 2015-11-13 15:29:56 +0000 |
| commit | 0ac2f8512bb8cd3adb8f55baff5b4ba761407d5c (patch) | |
| tree | ecc780d5a90d4445b22dd9aae2556500a837358a /sys/crypto | |
| parent | e2493d6dfeac19816025f97313c6f0e983a68b73 (diff) | |
remove unused ARC4 support; ok mikeb@
Diffstat (limited to 'sys/crypto')
| -rw-r--r-- | sys/crypto/cryptodev.h | 37 | ||||
| -rw-r--r-- | sys/crypto/xform.c | 11 | ||||
| -rw-r--r-- | sys/crypto/xform.h | 3 |
3 files changed, 20 insertions, 31 deletions
diff --git a/sys/crypto/cryptodev.h b/sys/crypto/cryptodev.h index ce2e09817a2..76d9f53ebd2 100644 --- a/sys/crypto/cryptodev.h +++ b/sys/crypto/cryptodev.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cryptodev.h,v 1.65 2015/11/13 12:21:16 mikeb Exp $ */ +/* $OpenBSD: cryptodev.h,v 1.66 2015/11/13 15:29:55 naddy Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu) @@ -92,24 +92,23 @@ #define CRYPTO_RIPEMD160_HMAC 8 #define CRYPTO_RIJNDAEL128_CBC 11 /* 128 bit blocksize */ #define CRYPTO_AES_CBC 11 /* 128 bit blocksize -- the same as above */ -#define CRYPTO_ARC4 12 -#define CRYPTO_DEFLATE_COMP 13 /* Deflate compression algorithm */ -#define CRYPTO_NULL 14 -#define CRYPTO_LZS_COMP 15 /* LZS compression algorithm */ -#define CRYPTO_SHA2_256_HMAC 16 -#define CRYPTO_SHA2_384_HMAC 17 -#define CRYPTO_SHA2_512_HMAC 18 -#define CRYPTO_AES_CTR 19 -#define CRYPTO_AES_XTS 20 -#define CRYPTO_AES_GCM_16 21 -#define CRYPTO_AES_128_GMAC 22 -#define CRYPTO_AES_192_GMAC 23 -#define CRYPTO_AES_256_GMAC 24 -#define CRYPTO_AES_GMAC 25 -#define CRYPTO_CHACHA20_POLY1305 26 -#define CRYPTO_CHACHA20_POLY1305_MAC 27 -#define CRYPTO_ESN 28 /* Support for Extended Sequence Numbers */ -#define CRYPTO_ALGORITHM_MAX 28 /* Keep updated */ +#define CRYPTO_DEFLATE_COMP 12 /* Deflate compression algorithm */ +#define CRYPTO_NULL 13 +#define CRYPTO_LZS_COMP 14 /* LZS compression algorithm */ +#define CRYPTO_SHA2_256_HMAC 15 +#define CRYPTO_SHA2_384_HMAC 16 +#define CRYPTO_SHA2_512_HMAC 17 +#define CRYPTO_AES_CTR 18 +#define CRYPTO_AES_XTS 19 +#define CRYPTO_AES_GCM_16 20 +#define CRYPTO_AES_128_GMAC 21 +#define CRYPTO_AES_192_GMAC 22 +#define CRYPTO_AES_256_GMAC 23 +#define CRYPTO_AES_GMAC 24 +#define CRYPTO_CHACHA20_POLY1305 25 +#define CRYPTO_CHACHA20_POLY1305_MAC 26 +#define CRYPTO_ESN 27 /* Support for Extended Sequence Numbers */ +#define CRYPTO_ALGORITHM_MAX 27 /* Keep updated */ /* Algorithm flags */ #define CRYPTO_ALG_FLAG_SUPPORTED 0x01 /* Algorithm is supported */ diff --git a/sys/crypto/xform.c b/sys/crypto/xform.c index 14aa68bbef9..6d16a025f46 100644 --- a/sys/crypto/xform.c +++ b/sys/crypto/xform.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xform.c,v 1.52 2015/11/13 12:21:16 mikeb Exp $ */ +/* $OpenBSD: xform.c,v 1.53 2015/11/13 15:29:55 naddy Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr), @@ -232,15 +232,6 @@ struct enc_xform enc_xform_chacha20_poly1305 = { chacha20_reinit }; -struct enc_xform enc_xform_arc4 = { - CRYPTO_ARC4, "ARC4", - 1, 1, 1, 32, 0, - NULL, - NULL, - NULL, - NULL -}; - struct enc_xform enc_xform_null = { CRYPTO_NULL, "NULL", 4, 0, 0, 256, 0, diff --git a/sys/crypto/xform.h b/sys/crypto/xform.h index d04839b0ec8..a8417b77991 100644 --- a/sys/crypto/xform.h +++ b/sys/crypto/xform.h @@ -1,4 +1,4 @@ -/* $OpenBSD: xform.h,v 1.26 2015/11/13 12:21:16 mikeb Exp $ */ +/* $OpenBSD: xform.h,v 1.27 2015/11/13 15:29:55 naddy Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu) @@ -86,7 +86,6 @@ extern struct enc_xform enc_xform_aes_gcm; extern struct enc_xform enc_xform_aes_gmac; extern struct enc_xform enc_xform_aes_xts; extern struct enc_xform enc_xform_chacha20_poly1305; -extern struct enc_xform enc_xform_arc4; extern struct enc_xform enc_xform_null; extern struct auth_hash auth_hash_hmac_md5_96; |