Use newly added defines instead of magic values.

This commit is contained in:
pjd 2006-06-04 15:11:59 +00:00
parent b966da31ff
commit 8ec79cc70b

View File

@ -114,7 +114,7 @@ MALLOC_DEFINE(M_XDATA, "xform", "xform data buffers");
struct enc_xform enc_xform_null = { struct enc_xform enc_xform_null = {
CRYPTO_NULL_CBC, "NULL", CRYPTO_NULL_CBC, "NULL",
/* NB: blocksize of 4 is to generate a properly aligned ESP header */ /* NB: blocksize of 4 is to generate a properly aligned ESP header */
4, 0, 256, /* 2048 bits, max key */ NULL_BLOCK_LEN, 0, 256, /* 2048 bits, max key */
null_encrypt, null_encrypt,
null_decrypt, null_decrypt,
null_setkey, null_setkey,
@ -123,7 +123,7 @@ struct enc_xform enc_xform_null = {
struct enc_xform enc_xform_des = { struct enc_xform enc_xform_des = {
CRYPTO_DES_CBC, "DES", CRYPTO_DES_CBC, "DES",
8, 8, 8, DES_BLOCK_LEN, 8, 8,
des1_encrypt, des1_encrypt,
des1_decrypt, des1_decrypt,
des1_setkey, des1_setkey,
@ -132,7 +132,7 @@ struct enc_xform enc_xform_des = {
struct enc_xform enc_xform_3des = { struct enc_xform enc_xform_3des = {
CRYPTO_3DES_CBC, "3DES", CRYPTO_3DES_CBC, "3DES",
8, 24, 24, DES3_BLOCK_LEN, 24, 24,
des3_encrypt, des3_encrypt,
des3_decrypt, des3_decrypt,
des3_setkey, des3_setkey,
@ -141,7 +141,7 @@ struct enc_xform enc_xform_3des = {
struct enc_xform enc_xform_blf = { struct enc_xform enc_xform_blf = {
CRYPTO_BLF_CBC, "Blowfish", CRYPTO_BLF_CBC, "Blowfish",
8, 5, 56 /* 448 bits, max key */, BLOWFISH_BLOCK_LEN, 5, 56 /* 448 bits, max key */,
blf_encrypt, blf_encrypt,
blf_decrypt, blf_decrypt,
blf_setkey, blf_setkey,
@ -150,7 +150,7 @@ struct enc_xform enc_xform_blf = {
struct enc_xform enc_xform_cast5 = { struct enc_xform enc_xform_cast5 = {
CRYPTO_CAST_CBC, "CAST-128", CRYPTO_CAST_CBC, "CAST-128",
8, 5, 16, CAST128_BLOCK_LEN, 5, 16,
cast5_encrypt, cast5_encrypt,
cast5_decrypt, cast5_decrypt,
cast5_setkey, cast5_setkey,
@ -159,7 +159,7 @@ struct enc_xform enc_xform_cast5 = {
struct enc_xform enc_xform_skipjack = { struct enc_xform enc_xform_skipjack = {
CRYPTO_SKIPJACK_CBC, "Skipjack", CRYPTO_SKIPJACK_CBC, "Skipjack",
8, 10, 10, SKIPJACK_BLOCK_LEN, 10, 10,
skipjack_encrypt, skipjack_encrypt,
skipjack_decrypt, skipjack_decrypt,
skipjack_setkey, skipjack_setkey,
@ -168,7 +168,7 @@ struct enc_xform enc_xform_skipjack = {
struct enc_xform enc_xform_rijndael128 = { struct enc_xform enc_xform_rijndael128 = {
CRYPTO_RIJNDAEL128_CBC, "Rijndael-128/AES", CRYPTO_RIJNDAEL128_CBC, "Rijndael-128/AES",
16, 8, 32, RIJNDAEL128_BLOCK_LEN, 8, 32,
rijndael128_encrypt, rijndael128_encrypt,
rijndael128_decrypt, rijndael128_decrypt,
rijndael128_setkey, rijndael128_setkey,
@ -187,60 +187,60 @@ struct enc_xform enc_xform_arc4 = {
/* Authentication instances */ /* Authentication instances */
struct auth_hash auth_hash_null = { struct auth_hash auth_hash_null = {
CRYPTO_NULL_HMAC, "NULL-HMAC", CRYPTO_NULL_HMAC, "NULL-HMAC",
0, 16, 64, sizeof(int), /* NB: context isn't used */ 0, NULL_HASH_LEN, NULL_HMAC_BLOCK_LEN, sizeof(int), /* NB: context isn't used */
null_init, null_update, null_final null_init, null_update, null_final
}; };
struct auth_hash auth_hash_hmac_md5 = { struct auth_hash auth_hash_hmac_md5 = {
CRYPTO_MD5_HMAC, "HMAC-MD5", CRYPTO_MD5_HMAC, "HMAC-MD5",
16, 16, 64, sizeof(MD5_CTX), 16, MD5_HASH_LEN, MD5_HMAC_BLOCK_LEN, sizeof(MD5_CTX),
(void (*) (void *)) MD5Init, MD5Update_int, (void (*) (void *)) MD5Init, MD5Update_int,
(void (*) (u_int8_t *, void *)) MD5Final (void (*) (u_int8_t *, void *)) MD5Final
}; };
struct auth_hash auth_hash_hmac_sha1 = { struct auth_hash auth_hash_hmac_sha1 = {
CRYPTO_SHA1_HMAC, "HMAC-SHA1", CRYPTO_SHA1_HMAC, "HMAC-SHA1",
20, 20, 64, sizeof(SHA1_CTX), 20, SHA1_HASH_LEN, SHA1_HMAC_BLOCK_LEN, sizeof(SHA1_CTX),
SHA1Init_int, SHA1Update_int, SHA1Final_int SHA1Init_int, SHA1Update_int, SHA1Final_int
}; };
struct auth_hash auth_hash_hmac_ripemd_160 = { struct auth_hash auth_hash_hmac_ripemd_160 = {
CRYPTO_RIPEMD160_HMAC, "HMAC-RIPEMD-160", CRYPTO_RIPEMD160_HMAC, "HMAC-RIPEMD-160",
20, 20, 64, sizeof(RMD160_CTX), 20, RIPEMD160_HASH_LEN, RIPEMD160_HMAC_BLOCK_LEN, sizeof(RMD160_CTX),
(void (*)(void *)) RMD160Init, RMD160Update_int, (void (*)(void *)) RMD160Init, RMD160Update_int,
(void (*)(u_int8_t *, void *)) RMD160Final (void (*)(u_int8_t *, void *)) RMD160Final
}; };
struct auth_hash auth_hash_key_md5 = { struct auth_hash auth_hash_key_md5 = {
CRYPTO_MD5_KPDK, "Keyed MD5", CRYPTO_MD5_KPDK, "Keyed MD5",
0, 16, 0, sizeof(MD5_CTX), 0, MD5_KPDK_HASH_LEN, 0, sizeof(MD5_CTX),
(void (*)(void *)) MD5Init, MD5Update_int, (void (*)(void *)) MD5Init, MD5Update_int,
(void (*)(u_int8_t *, void *)) MD5Final (void (*)(u_int8_t *, void *)) MD5Final
}; };
struct auth_hash auth_hash_key_sha1 = { struct auth_hash auth_hash_key_sha1 = {
CRYPTO_SHA1_KPDK, "Keyed SHA1", CRYPTO_SHA1_KPDK, "Keyed SHA1",
0, 20, 0, sizeof(SHA1_CTX), 0, SHA1_KPDK_HASH_LEN, 0, sizeof(SHA1_CTX),
SHA1Init_int, SHA1Update_int, SHA1Final_int SHA1Init_int, SHA1Update_int, SHA1Final_int
}; };
struct auth_hash auth_hash_hmac_sha2_256 = { struct auth_hash auth_hash_hmac_sha2_256 = {
CRYPTO_SHA2_256_HMAC, "HMAC-SHA2-256", CRYPTO_SHA2_256_HMAC, "HMAC-SHA2-256",
32, 32, 64, sizeof(SHA256_CTX), 32, SHA2_256_HASH_LEN, SHA2_256_HMAC_BLOCK_LEN, sizeof(SHA256_CTX),
(void (*)(void *)) SHA256_Init, SHA256Update_int, (void (*)(void *)) SHA256_Init, SHA256Update_int,
(void (*)(u_int8_t *, void *)) SHA256_Final (void (*)(u_int8_t *, void *)) SHA256_Final
}; };
struct auth_hash auth_hash_hmac_sha2_384 = { struct auth_hash auth_hash_hmac_sha2_384 = {
CRYPTO_SHA2_384_HMAC, "HMAC-SHA2-384", CRYPTO_SHA2_384_HMAC, "HMAC-SHA2-384",
48, 48, 128, sizeof(SHA384_CTX), 48, SHA2_384_HASH_LEN, SHA2_384_HMAC_BLOCK_LEN, sizeof(SHA384_CTX),
(void (*)(void *)) SHA384_Init, SHA384Update_int, (void (*)(void *)) SHA384_Init, SHA384Update_int,
(void (*)(u_int8_t *, void *)) SHA384_Final (void (*)(u_int8_t *, void *)) SHA384_Final
}; };
struct auth_hash auth_hash_hmac_sha2_512 = { struct auth_hash auth_hash_hmac_sha2_512 = {
CRYPTO_SHA2_512_HMAC, "HMAC-SHA2-512", CRYPTO_SHA2_512_HMAC, "HMAC-SHA2-512",
64, 64, 128, sizeof(SHA512_CTX), 64, SHA2_512_HASH_LEN, SHA2_512_HMAC_BLOCK_LEN, sizeof(SHA512_CTX),
(void (*)(void *)) SHA512_Init, SHA512Update_int, (void (*)(void *)) SHA512_Init, SHA512Update_int,
(void (*)(u_int8_t *, void *)) SHA512_Final (void (*)(u_int8_t *, void *)) SHA512_Final
}; };