Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/netipsec allow ESP to use AES-CTR



details:   https://anonhg.NetBSD.org/src/rev/66f93766cee7
branches:  trunk
changeset: 765245:66f93766cee7
user:      drochner <drochner%NetBSD.org@localhost>
date:      Mon May 23 13:57:52 2011 +0000

description:
allow ESP to use AES-CTR
(pfkey and userland tool support is already there because it has been
in KAME IPSEC all the time)
tested against KAME IPSEC

diffstat:

 sys/netipsec/xform_esp.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (35 lines):

diff -r 18078be2fe2b -r 66f93766cee7 sys/netipsec/xform_esp.c
--- a/sys/netipsec/xform_esp.c  Mon May 23 13:55:55 2011 +0000
+++ b/sys/netipsec/xform_esp.c  Mon May 23 13:57:52 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform_esp.c,v 1.35 2011/05/23 13:46:54 drochner Exp $  */
+/*     $NetBSD: xform_esp.c,v 1.36 2011/05/23 13:57:52 drochner Exp $  */
 /*     $FreeBSD: src/sys/netipsec/xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $  */
 /*     $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
 
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.35 2011/05/23 13:46:54 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.36 2011/05/23 13:57:52 drochner Exp $");
 
 #include "opt_inet.h"
 #ifdef __FreeBSD__
@@ -130,6 +130,8 @@
                return &enc_xform_skipjack;
        case SADB_X_EALG_CAMELLIACBC:
                return &enc_xform_camellia;
+       case SADB_X_EALG_AESCTR:
+               return &enc_xform_aes_ctr;
        case SADB_EALG_NULL:
                return &enc_xform_null;
        }
@@ -1044,6 +1046,7 @@
        MAXIV(enc_xform_cast5);         /* SADB_X_EALG_CAST128CBC */
        MAXIV(enc_xform_skipjack);      /* SADB_X_EALG_SKIPJACK */
        MAXIV(enc_xform_camellia);      /* SADB_X_EALG_CAMELLIACBC */
+       MAXIV(enc_xform_aes_ctr);       /* SADB_X_EALG_AESCTR */
        MAXIV(enc_xform_null);          /* SADB_EALG_NULL */
 
        xform_register(&esp_xformsw);



Home | Main Index | Thread Index | Old Index