diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2015-09-15 12:29:33 -0500 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2015-10-20 11:32:36 -0500 |
| commit | 2d697711142c82967bd7d519bf253f9462bbc573 (patch) | |
| tree | 829204069a08e1d22b3ccd5704b9da7e07bb0935 /sys/opencrypto/xform.h | |
| parent | 8debb5ec1f7f108a317cc2c7624198ba2eb03469 (diff) | |
| download | FreeBSD-src-2d697711142c82967bd7d519bf253f9462bbc573.zip FreeBSD-src-2d697711142c82967bd7d519bf253f9462bbc573.tar.gz | |
Revert AESNI patches.
Revert "Importing pfSense patch aesgcm.soft.1.patch"
This reverts commit 46e99a8858f1c843c1774e472c11d422ca2163ae.
TAG: IPSEC-HEAD
Issue: #4841
Diffstat (limited to 'sys/opencrypto/xform.h')
| -rw-r--r-- | sys/opencrypto/xform.h | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/sys/opencrypto/xform.h b/sys/opencrypto/xform.h index 98909db..8df7b07 100644 --- a/sys/opencrypto/xform.h +++ b/sys/opencrypto/xform.h @@ -29,7 +29,6 @@ #include <crypto/sha1.h> #include <crypto/sha2/sha2.h> #include <opencrypto/rmd160.h> -#include <opencrypto/gmac.h> /* Declarations */ struct auth_hash { @@ -37,13 +36,10 @@ struct auth_hash { char *name; u_int16_t keysize; u_int16_t hashsize; - u_int16_t authsize; - u_int16_t ctxsize; u_int16_t blocksize; + u_int16_t ctxsize; void (*Init) (void *); - void (*Setkey) (void *, const u_int8_t *, u_int16_t); - void (*Reinit) (void *, const u_int8_t *, u_int16_t); - int (*Update) (void *, const u_int8_t *, u_int16_t); + int (*Update) (void *, u_int8_t *, u_int16_t); void (*Final) (u_int8_t *, void *); }; @@ -54,11 +50,10 @@ struct enc_xform { int type; char *name; u_int16_t blocksize; - u_int16_t ivsize; u_int16_t minkey, maxkey; void (*encrypt) (caddr_t, u_int8_t *); void (*decrypt) (caddr_t, u_int8_t *); - int (*setkey) (u_int8_t **, u_int8_t *, int); + int (*setkey) (u_int8_t **, u_int8_t *, int len); void (*zerokey) (u_int8_t **); void (*reinit) (caddr_t, u_int8_t *); }; @@ -78,7 +73,6 @@ union authctx { SHA256_CTX sha256ctx; SHA384_CTX sha384ctx; SHA512_CTX sha512ctx; - AES_GMAC_CTX aes_gmac_ctx; }; extern struct enc_xform enc_xform_null; @@ -88,9 +82,6 @@ extern struct enc_xform enc_xform_blf; extern struct enc_xform enc_xform_cast5; extern struct enc_xform enc_xform_skipjack; extern struct enc_xform enc_xform_rijndael128; -extern struct enc_xform enc_xform_aes_ctr; -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_arc4; extern struct enc_xform enc_xform_camellia; @@ -104,9 +95,6 @@ extern struct auth_hash auth_hash_hmac_ripemd_160; extern struct auth_hash auth_hash_hmac_sha2_256; extern struct auth_hash auth_hash_hmac_sha2_384; extern struct auth_hash auth_hash_hmac_sha2_512; -extern struct auth_hash auth_hash_gmac_aes_128; -extern struct auth_hash auth_hash_gmac_aes_192; -extern struct auth_hash auth_hash_gmac_aes_256; extern struct comp_algo comp_algo_deflate; |
