diff options
author | Luiz Otavio O Souza <luiz@netgate.com> | 2016-05-11 12:51:39 -0500 |
---|---|---|
committer | Luiz Otavio O Souza <luiz@netgate.com> | 2016-05-12 10:59:59 -0500 |
commit | eaaca999d480adab78b944fb5b4822c14ab4778f (patch) | |
tree | dc479c0ed2f7c85d0b542384bf0a354ce4d85134 /sys/opencrypto/xform.c | |
parent | b2fbeb687ab88416fde1db788240cd4694bf340b (diff) | |
download | FreeBSD-src-eaaca999d480adab78b944fb5b4822c14ab4778f.zip FreeBSD-src-eaaca999d480adab78b944fb5b4822c14ab4778f.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
(cherry picked from commit c23a05e2de0834d542caafe185dcb440b47051a5)
Diffstat (limited to 'sys/opencrypto/xform.c')
-rw-r--r-- | sys/opencrypto/xform.c | 2 |
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, |