[src/trunk]: src/crypto/dist/ipsec-tools/src/racoon report a higher encryptio...

[vanhu <vanhu%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0f0dea0be74e
branches:  trunk
changeset: 757989:0f0dea0be74e
user:      vanhu <vanhu%NetBSD.org@localhost>
date:      Mon Oct 11 14:16:30 2010 +0000

description:
report a higher encryption key length in approval for OBEY / CLAIM / STRICT modes

diffstat:

 crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (26 lines):

diff -r b1a653bbe5a7 -r 0f0dea0be74e crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c
--- a/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c    Mon Oct 11 13:58:10 2010 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c    Mon Oct 11 14:16:30 2010 +0000
@@ -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;