summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-02-02 12:32:06 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2010-02-02 12:32:06 +1100
commitdf1b05971e096a2dd37d9ddaf6fe7f1f3e3f7b02 (patch)
tree313c7c1f83d2d9b6a759f62a358337ecfe52e9fe /net
parentae42d8f98ac14cc054203feabaf439cb4b11e287 (diff)
parent7d6f75eb21b84cdc5dfb09789974f02b42a89058 (diff)
Merge remote branch 'crypto/master'
Diffstat (limited to 'net')
-rw-r--r--net/xfrm/xfrm_algo.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c
index 743c0134a6a9..8b4d6e3246e5 100644
--- a/net/xfrm/xfrm_algo.c
+++ b/net/xfrm/xfrm_algo.c
@@ -125,6 +125,22 @@ static struct xfrm_algo_desc aead_list[] = {
.sadb_alg_maxbits = 256
}
},
+{
+ .name = "rfc4543(gcm(aes))",
+
+ .uinfo = {
+ .aead = {
+ .icv_truncbits = 128,
+ }
+ },
+
+ .desc = {
+ .sadb_alg_id = SADB_X_EALG_NULL_AES_GMAC,
+ .sadb_alg_ivlen = 8,
+ .sadb_alg_minbits = 128,
+ .sadb_alg_maxbits = 256
+ }
+},
};
static struct xfrm_algo_desc aalg_list[] = {