2 files changed, 18 insertions, 0 deletions

diff --git a/include/linux/pfkeyv2.h b/include/linux/pfkeyv2.h
index 0f0b880c4280..265bafab6494 100644
--- a/include/linux/pfkeyv2.h
+++ b/include/linux/pfkeyv2.h
@@ -285,6 +285,7 @@ struct sadb_x_sec_ctx {
 #define SADB_X_AALG_SHA2_384HMAC        6
 #define SADB_X_AALG_SHA2_512HMAC        7
 #define SADB_X_AALG_RIPEMD160HMAC       8
+#define SADB_X_AALG_AES_XCBC_MAC        9
 #define SADB_X_AALG_NULL                251     /* kame */
 #define SADB_AALG_MAX                   251
 
diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c
index 5a0dbeb6bbe8..6b381fc0383d 100644
--- a/net/xfrm/xfrm_algo.c
+++ b/net/xfrm/xfrm_algo.c
@@ -119,6 +119,23 @@ static struct xfrm_algo_desc aalg_list[] = {
                 .sadb_alg_maxbits = 160
         }
 },
+{
+        .name = "xcbc(aes)",
+
+        .uinfo = {
+                .auth = {
+                        .icv_truncbits = 96,
+                        .icv_fullbits = 128,
+                }
+        },
+
+        .desc = {
+                .sadb_alg_id = SADB_X_AALG_AES_XCBC_MAC,
+                .sadb_alg_ivlen = 0,
+                .sadb_alg_minbits = 128,
+                .sadb_alg_maxbits = 128
+        }
+},
 };
 
 static struct xfrm_algo_desc ealg_list[] = {