Module Name: src
Committed By: vanhu
Date: Mon Oct 11 14:16:31 UTC 2010
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: ipsec_doi.c
Log Message:
report a higher encryption key length in approval for OBEY / CLAIM / STRICT
modes
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c:1.44 src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c:1.45
--- src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c:1.44 Sun Jan 17 23:02:48 2010
+++ src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c Mon Oct 11 14:16:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_doi.c,v 1.44 2010/01/17 23:02:48 wiz Exp $ */
+/* $NetBSD: ipsec_doi.c,v 1.45 2010/10/11 14:16:30 vanhu Exp $ */
/* Id: ipsec_doi.c,v 1.55 2006/08/17 09:20:41 vanhu Exp */
@@ -370,12 +370,16 @@
case PROP_CHECK_OBEY:
sa->lifetime = pctx->sa->lifetime;
sa->lifebyte = pctx->sa->lifebyte;
+ sa->encklen = pctx->sa->encklen;
break;
case PROP_CHECK_CLAIM:
+ case PROP_CHECK_STRICT:
if (pctx->sa->lifetime < sa->lifetime)
sa->lifetime = pctx->sa->lifetime;
if (pctx->sa->lifebyte < sa->lifebyte)
sa->lifebyte = pctx->sa->lifebyte;
+ if (pctx->sa->encklen > sa->encklen)
+ sa->encklen = pctx->sa->encklen;
break;
default:
break;
