diff options
-rw-r--r-- | include/linux/pfkeyv2.h | 1 | ||||
-rw-r--r-- | net/xfrm/xfrm_algo.c | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/include/linux/pfkeyv2.h b/include/linux/pfkeyv2.h index 6db69ff5d83e..700725ddcaae 100644 --- a/include/linux/pfkeyv2.h +++ b/include/linux/pfkeyv2.h | |||
@@ -298,6 +298,7 @@ struct sadb_x_sec_ctx { | |||
298 | #define SADB_X_EALG_BLOWFISHCBC 7 | 298 | #define SADB_X_EALG_BLOWFISHCBC 7 |
299 | #define SADB_EALG_NULL 11 | 299 | #define SADB_EALG_NULL 11 |
300 | #define SADB_X_EALG_AESCBC 12 | 300 | #define SADB_X_EALG_AESCBC 12 |
301 | #define SADB_X_EALG_AESCTR 13 | ||
301 | #define SADB_X_EALG_AES_CCM_ICV8 14 | 302 | #define SADB_X_EALG_AES_CCM_ICV8 14 |
302 | #define SADB_X_EALG_AES_CCM_ICV12 15 | 303 | #define SADB_X_EALG_AES_CCM_ICV12 15 |
303 | #define SADB_X_EALG_AES_CCM_ICV16 16 | 304 | #define SADB_X_EALG_AES_CCM_ICV16 16 |
diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c index 6cc15250de69..8aa6440d689f 100644 --- a/net/xfrm/xfrm_algo.c +++ b/net/xfrm/xfrm_algo.c | |||
@@ -399,6 +399,23 @@ static struct xfrm_algo_desc ealg_list[] = { | |||
399 | .sadb_alg_maxbits = 256 | 399 | .sadb_alg_maxbits = 256 |
400 | } | 400 | } |
401 | }, | 401 | }, |
402 | { | ||
403 | .name = "rfc3686(ctr(aes))", | ||
404 | |||
405 | .uinfo = { | ||
406 | .encr = { | ||
407 | .blockbits = 128, | ||
408 | .defkeybits = 160, /* 128-bit key + 32-bit nonce */ | ||
409 | } | ||
410 | }, | ||
411 | |||
412 | .desc = { | ||
413 | .sadb_alg_id = SADB_X_EALG_AESCTR, | ||
414 | .sadb_alg_ivlen = 8, | ||
415 | .sadb_alg_minbits = 128, | ||
416 | .sadb_alg_maxbits = 256 | ||
417 | } | ||
418 | }, | ||
402 | }; | 419 | }; |
403 | 420 | ||
404 | static struct xfrm_algo_desc calg_list[] = { | 421 | static struct xfrm_algo_desc calg_list[] = { |