summaryrefslogtreecommitdiff
path: root/sys/crypto
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2005-05-10 13:42:12 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2005-05-10 13:42:12 +0000
commit871030bbf20d828a2cf476cf4e1e751a1cf70c3d (patch)
treecf82fc6a2aa620810c4c200abc5df94df3334c5b /sys/crypto
parent0d5699d5552a32f081891a1e532434a13e6a8885 (diff)
support NULL encryption for ESP; ok hshoexer, ho
Diffstat (limited to 'sys/crypto')
-rw-r--r--sys/crypto/cryptosoft.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/crypto/cryptosoft.c b/sys/crypto/cryptosoft.c
index 1b582f99879..e1fdd00cae4 100644
--- a/sys/crypto/cryptosoft.c
+++ b/sys/crypto/cryptosoft.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptosoft.c,v 1.43 2005/05/02 22:19:10 markus Exp $ */
+/* $OpenBSD: cryptosoft.c,v 1.44 2005/05/10 13:42:11 markus Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
@@ -94,6 +94,9 @@ swcr_encdec(struct cryptodesc *crd, struct swcr_data *sw, caddr_t buf,
if (crd->crd_len % blks)
return EINVAL;
+ if (exf == &enc_xform_null)
+ return (0);
+
if (outtype == CRYPTO_BUF_MBUF)
m = (struct mbuf *) buf;
else