1c1
< /* $FreeBSD: head/sys/opencrypto/cryptodev.h 285247 2015-07-07 18:45:32Z jmg $ */
---
> /* $FreeBSD: head/sys/opencrypto/cryptodev.h 285336 2015-07-09 18:16:35Z gnn $ */
80a81
> #define AES_HASH_LEN 16
89,91c90,92
< #define SHA2_256_HMAC_BLOCK_LEN 64
< #define SHA2_384_HMAC_BLOCK_LEN 128
< #define SHA2_512_HMAC_BLOCK_LEN 128
---
> #define SHA2_256_HMAC_BLOCK_LEN 64
> #define SHA2_384_HMAC_BLOCK_LEN 128
> #define SHA2_512_HMAC_BLOCK_LEN 128
93c94
< #define HMAC_MAX_BLOCK_LEN SHA2_512_HMAC_BLOCK_LEN /* Keep this updated */
---
> #define HMAC_MAX_BLOCK_LEN SHA2_512_HMAC_BLOCK_LEN /* Keep this updated */
95a97,107
> /* HMAC Key Length */
> #define NULL_HMAC_KEY_LEN 0
> #define MD5_HMAC_KEY_LEN 16
> #define SHA1_HMAC_KEY_LEN 20
> #define RIPEMD160_HMAC_KEY_LEN 20
> #define SHA2_256_HMAC_KEY_LEN 32
> #define SHA2_384_HMAC_KEY_LEN 48
> #define SHA2_512_HMAC_KEY_LEN 64
> #define AES_128_HMAC_KEY_LEN 16
> #define AES_192_HMAC_KEY_LEN 24
> #define AES_256_HMAC_KEY_LEN 32
98,107c110,121
< #define NULL_BLOCK_LEN 4
< #define DES_BLOCK_LEN 8
< #define DES3_BLOCK_LEN 8
< #define BLOWFISH_BLOCK_LEN 8
< #define SKIPJACK_BLOCK_LEN 8
< #define CAST128_BLOCK_LEN 8
< #define RIJNDAEL128_BLOCK_LEN 16
< #define AES_BLOCK_LEN RIJNDAEL128_BLOCK_LEN
< #define CAMELLIA_BLOCK_LEN 16
< #define EALG_MAX_BLOCK_LEN AES_BLOCK_LEN /* Keep this updated */
---
> #define NULL_BLOCK_LEN 4
> #define DES_BLOCK_LEN 8
> #define DES3_BLOCK_LEN 8
> #define BLOWFISH_BLOCK_LEN 8
> #define SKIPJACK_BLOCK_LEN 8
> #define CAST128_BLOCK_LEN 8
> #define RIJNDAEL128_BLOCK_LEN 16
> #define AES_BLOCK_LEN 16
> #define AES_MIN_BLOCK_LEN 1
> #define ARC4_BLOCK_LEN 1
> #define CAMELLIA_BLOCK_LEN 16
> #define EALG_MAX_BLOCK_LEN AES_BLOCK_LEN /* Keep this updated */
108a123,155
> /* IV Lengths */
>
> #define ARC4_IV_LEN 1
> #define AES_IV_LEN 12
> #define AES_XTS_IV_LEN 8
> #define AES_XTS_ALPHA 0x87 /* GF(2^128) generator polynomial */
>
> #define AES_CTR_NONCE_SIZE 4
>
> /* Min and Max Encryption Key Sizes */
> #define NULL_MIN_KEY 0
> #define NULL_MAX_KEY 256 /* 2048 bits, max key */
> #define DES_MIN_KEY 8
> #define DES_MAX_KEY DES_MIN_KEY
> #define TRIPLE_DES_MIN_KEY 24
> #define TRIPLE_DES_MAX_KEY TRIPLE_DES_MIN_KEY
> #define BLOWFISH_MIN_KEY 5
> #define BLOWFISH_MAX_KEY 56 /* 448 bits, max key */
> #define CAST_MIN_KEY 5
> #define CAST_MAX_KEY 16
> #define SKIPJACK_MIN_KEY 10
> #define SKIPJACK_MAX_KEY SKIPJACK_MIN_KEY
> #define RIJNDAEL_MIN_KEY 16
> #define RIJNDAEL_MAX_KEY 32
> #define AES_MIN_KEY 16
> #define AES_MAX_KEY 32
> #define AES_XTS_MIN_KEY 32
> #define AES_XTS_MAX_KEY 64
> #define ARC4_MIN_KEY 1
> #define ARC4_MAX_KEY 32
> #define CAMELLIA_MIN_KEY 8
> #define CAMELLIA_MAX_KEY 32
>
110c157
< #define AALG_MAX_RESULT_LEN 64 /* Keep this updated */
---
> #define AALG_MAX_RESULT_LEN 64 /* Keep this updated */
144c191
< #define CRYPTO_ALGO_VALID(x) ((x) >= CRYPTO_ALGORITHM_MIN && \
---
> #define CRYPTO_ALGO_VALID(x) ((x) >= CRYPTO_ALGORITHM_MIN && \
< /* $FreeBSD: head/sys/opencrypto/cryptodev.h 285247 2015-07-07 18:45:32Z jmg $ */
---
> /* $FreeBSD: head/sys/opencrypto/cryptodev.h 285336 2015-07-09 18:16:35Z gnn $ */
80a81
> #define AES_HASH_LEN 16
89,91c90,92
< #define SHA2_256_HMAC_BLOCK_LEN 64
< #define SHA2_384_HMAC_BLOCK_LEN 128
< #define SHA2_512_HMAC_BLOCK_LEN 128
---
> #define SHA2_256_HMAC_BLOCK_LEN 64
> #define SHA2_384_HMAC_BLOCK_LEN 128
> #define SHA2_512_HMAC_BLOCK_LEN 128
93c94
< #define HMAC_MAX_BLOCK_LEN SHA2_512_HMAC_BLOCK_LEN /* Keep this updated */
---
> #define HMAC_MAX_BLOCK_LEN SHA2_512_HMAC_BLOCK_LEN /* Keep this updated */
95a97,107
> /* HMAC Key Length */
> #define NULL_HMAC_KEY_LEN 0
> #define MD5_HMAC_KEY_LEN 16
> #define SHA1_HMAC_KEY_LEN 20
> #define RIPEMD160_HMAC_KEY_LEN 20
> #define SHA2_256_HMAC_KEY_LEN 32
> #define SHA2_384_HMAC_KEY_LEN 48
> #define SHA2_512_HMAC_KEY_LEN 64
> #define AES_128_HMAC_KEY_LEN 16
> #define AES_192_HMAC_KEY_LEN 24
> #define AES_256_HMAC_KEY_LEN 32
98,107c110,121
< #define NULL_BLOCK_LEN 4
< #define DES_BLOCK_LEN 8
< #define DES3_BLOCK_LEN 8
< #define BLOWFISH_BLOCK_LEN 8
< #define SKIPJACK_BLOCK_LEN 8
< #define CAST128_BLOCK_LEN 8
< #define RIJNDAEL128_BLOCK_LEN 16
< #define AES_BLOCK_LEN RIJNDAEL128_BLOCK_LEN
< #define CAMELLIA_BLOCK_LEN 16
< #define EALG_MAX_BLOCK_LEN AES_BLOCK_LEN /* Keep this updated */
---
> #define NULL_BLOCK_LEN 4
> #define DES_BLOCK_LEN 8
> #define DES3_BLOCK_LEN 8
> #define BLOWFISH_BLOCK_LEN 8
> #define SKIPJACK_BLOCK_LEN 8
> #define CAST128_BLOCK_LEN 8
> #define RIJNDAEL128_BLOCK_LEN 16
> #define AES_BLOCK_LEN 16
> #define AES_MIN_BLOCK_LEN 1
> #define ARC4_BLOCK_LEN 1
> #define CAMELLIA_BLOCK_LEN 16
> #define EALG_MAX_BLOCK_LEN AES_BLOCK_LEN /* Keep this updated */
108a123,155
> /* IV Lengths */
>
> #define ARC4_IV_LEN 1
> #define AES_IV_LEN 12
> #define AES_XTS_IV_LEN 8
> #define AES_XTS_ALPHA 0x87 /* GF(2^128) generator polynomial */
>
> #define AES_CTR_NONCE_SIZE 4
>
> /* Min and Max Encryption Key Sizes */
> #define NULL_MIN_KEY 0
> #define NULL_MAX_KEY 256 /* 2048 bits, max key */
> #define DES_MIN_KEY 8
> #define DES_MAX_KEY DES_MIN_KEY
> #define TRIPLE_DES_MIN_KEY 24
> #define TRIPLE_DES_MAX_KEY TRIPLE_DES_MIN_KEY
> #define BLOWFISH_MIN_KEY 5
> #define BLOWFISH_MAX_KEY 56 /* 448 bits, max key */
> #define CAST_MIN_KEY 5
> #define CAST_MAX_KEY 16
> #define SKIPJACK_MIN_KEY 10
> #define SKIPJACK_MAX_KEY SKIPJACK_MIN_KEY
> #define RIJNDAEL_MIN_KEY 16
> #define RIJNDAEL_MAX_KEY 32
> #define AES_MIN_KEY 16
> #define AES_MAX_KEY 32
> #define AES_XTS_MIN_KEY 32
> #define AES_XTS_MAX_KEY 64
> #define ARC4_MIN_KEY 1
> #define ARC4_MAX_KEY 32
> #define CAMELLIA_MIN_KEY 8
> #define CAMELLIA_MAX_KEY 32
>
110c157
< #define AALG_MAX_RESULT_LEN 64 /* Keep this updated */
---
> #define AALG_MAX_RESULT_LEN 64 /* Keep this updated */
144c191
< #define CRYPTO_ALGO_VALID(x) ((x) >= CRYPTO_ALGORITHM_MIN && \
---
> #define CRYPTO_ALGO_VALID(x) ((x) >= CRYPTO_ALGORITHM_MIN && \