From c2419d67eb0e296fdf628a357b989e7628e89e87 Mon Sep 17 00:00:00 2001
From: Joy Latten <latten@austin.ibm.com>
Date: Thu, 7 Feb 2008 23:11:56 -0800
Subject: [PATCH] --- yaml --- r: 84861 b: refs/heads/master c:
 405137d16fbe4c80b9e06e61af05856027745d23 h: refs/heads/master i:   84859:
 32b31129e3d600076965f67859b610980e60f07c v: v3

---
 [refs]                        |  2 +-
 trunk/include/linux/pfkeyv2.h |  1 +
 trunk/net/xfrm/xfrm_algo.c    | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6591071bfe7f..1f384eec554e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 054b0e2b2d5ed460784e8dfbf30ff4768dbf4376
+refs/heads/master: 405137d16fbe4c80b9e06e61af05856027745d23
diff --git a/trunk/include/linux/pfkeyv2.h b/trunk/include/linux/pfkeyv2.h
index 6db69ff5d83e..700725ddcaae 100644
--- a/trunk/include/linux/pfkeyv2.h
+++ b/trunk/include/linux/pfkeyv2.h
@@ -298,6 +298,7 @@ struct sadb_x_sec_ctx {
 #define SADB_X_EALG_BLOWFISHCBC		7
 #define SADB_EALG_NULL			11
 #define SADB_X_EALG_AESCBC		12
+#define SADB_X_EALG_AESCTR		13
 #define SADB_X_EALG_AES_CCM_ICV8	14
 #define SADB_X_EALG_AES_CCM_ICV12	15
 #define SADB_X_EALG_AES_CCM_ICV16	16
diff --git a/trunk/net/xfrm/xfrm_algo.c b/trunk/net/xfrm/xfrm_algo.c
index 6cc15250de69..8aa6440d689f 100644
--- a/trunk/net/xfrm/xfrm_algo.c
+++ b/trunk/net/xfrm/xfrm_algo.c
@@ -399,6 +399,23 @@ static struct xfrm_algo_desc ealg_list[] = {
 		.sadb_alg_maxbits = 256
 	}
 },
+{
+	.name = "rfc3686(ctr(aes))",
+
+	.uinfo = {
+		.encr = {
+			.blockbits = 128,
+			.defkeybits = 160, /* 128-bit key + 32-bit nonce */
+		}
+	},
+
+	.desc = {
+		.sadb_alg_id = SADB_X_EALG_AESCTR,
+		.sadb_alg_ivlen	= 8,
+		.sadb_alg_minbits = 128,
+		.sadb_alg_maxbits = 256
+	}
+},
 };
 
 static struct xfrm_algo_desc calg_list[] = {