summaryrefslogtreecommitdiffstats
path: root/sys/opencrypto
diff options
context:
space:
mode:
authorLuiz Otavio O Souza <luiz@netgate.com>2016-05-11 12:51:39 -0500
committerLuiz Otavio O Souza <luiz@netgate.com>2016-05-11 17:02:14 -0500
commitc23a05e2de0834d542caafe185dcb440b47051a5 (patch)
treefa605b5c497769f2108dc69e590f13b7aa2b175d /sys/opencrypto
parent3e1742ed6cd844d82787f2fa5cd57652805c6b34 (diff)
downloadFreeBSD-src-c23a05e2de0834d542caafe185dcb440b47051a5.zip
FreeBSD-src-c23a05e2de0834d542caafe185dcb440b47051a5.tar.gz
MFC r290924:
Use explicitly specified ivsize instead of blocksize when we mean IV size. Set zero ivsize for enc_xform_null and remove special handling from xform_esp.c. Reviewed by: gnn Differential Revision: https://reviews.freebsd.org/D1503 TAG: IPSEC-HEAD
Diffstat (limited to 'sys/opencrypto')
-rw-r--r--sys/opencrypto/xform.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/opencrypto/xform.c b/sys/opencrypto/xform.c
index cb44bfa..3dee366 100644
--- a/sys/opencrypto/xform.c
+++ b/sys/opencrypto/xform.c
@@ -154,7 +154,7 @@ MALLOC_DEFINE(M_XDATA, "xform", "xform data buffers");
struct enc_xform enc_xform_null = {
CRYPTO_NULL_CBC, "NULL",
/* NB: blocksize of 4 is to generate a properly aligned ESP header */
- NULL_BLOCK_LEN, NULL_BLOCK_LEN, NULL_MIN_KEY, NULL_MAX_KEY,
+ NULL_BLOCK_LEN, 0, NULL_MIN_KEY, NULL_MAX_KEY,
null_encrypt,
null_decrypt,
null_setkey,
OpenPOWER on IntegriCloud