diff options
| author | pjd <pjd@FreeBSD.org> | 2011-11-26 23:27:41 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2011-11-26 23:27:41 +0000 |
| commit | a634fb6b1ecfd62eb2230ac4a8f6d371acd16f70 (patch) | |
| tree | 4e46e2a49551e988af999fe8059052b875c4ad22 /sys/netipsec | |
| parent | cab7b40bd054f2b22dd5cee24a95476a1438b23c (diff) | |
| download | FreeBSD-src-a634fb6b1ecfd62eb2230ac4a8f6d371acd16f70.zip FreeBSD-src-a634fb6b1ecfd62eb2230ac4a8f6d371acd16f70.tar.gz | |
The esp_max_ivlen global variable is not needed, we can just use
EALG_MAX_BLOCK_LEN.
Diffstat (limited to 'sys/netipsec')
| -rw-r--r-- | sys/netipsec/xform_esp.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/sys/netipsec/xform_esp.c b/sys/netipsec/xform_esp.c index 8ee5e57..7ccd844 100644 --- a/sys/netipsec/xform_esp.c +++ b/sys/netipsec/xform_esp.c @@ -76,8 +76,6 @@ #include <opencrypto/cryptodev.h> #include <opencrypto/xform.h> -static int esp_max_ivlen; /* max iv length over all algorithms */ - VNET_DEFINE(int, esp_enable) = 1; VNET_DEFINE(struct espstat, espstat); @@ -146,7 +144,7 @@ esp_hdrsiz(struct secasvar *sav) * + sizeof (next header field) * + max icv supported. */ - size = sizeof (struct newesp) + esp_max_ivlen + 9 + 16; + size = sizeof (struct newesp) + EALG_MAX_BLOCK_LEN + 9 + 16; } return size; } @@ -1020,20 +1018,7 @@ static struct xformsw esp_xformsw = { static void esp_attach(void) { -#define MAXIV(xform) \ - if (xform.blocksize > esp_max_ivlen) \ - esp_max_ivlen = xform.blocksize \ - - MAXIV(enc_xform_des); /* SADB_EALG_DESCBC */ - MAXIV(enc_xform_3des); /* SADB_EALG_3DESCBC */ - MAXIV(enc_xform_rijndael128); /* SADB_X_EALG_AES */ - MAXIV(enc_xform_blf); /* SADB_X_EALG_BLOWFISHCBC */ - MAXIV(enc_xform_cast5); /* SADB_X_EALG_CAST128CBC */ - MAXIV(enc_xform_skipjack); /* SADB_X_EALG_SKIPJACK */ - MAXIV(enc_xform_null); /* SADB_EALG_NULL */ - MAXIV(enc_xform_camellia); /* SADB_X_EALG_CAMELLIACBC */ xform_register(&esp_xformsw); -#undef MAXIV } SYSINIT(esp_xform_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_MIDDLE, esp_attach, NULL); |
