These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / net / xfrm / xfrm_algo.c

diff --git a/kernel/net/xfrm/xfrm_algo.c b/kernel/net/xfrm/xfrm_algo.c
index 12e82a5..f07224d 100644 (file)
--- a/kernel/net/xfrm/xfrm_algo.c
+++ b/kernel/net/xfrm/xfrm_algo.c
@@ -31,6 +31,7 @@ static struct xfrm_algo_desc aead_list[] = {
 
        .uinfo = {
                .aead = {
+                       .geniv = "seqiv",
                        .icv_truncbits = 64,
                }
        },
@@ -49,6 +50,7 @@ static struct xfrm_algo_desc aead_list[] = {
 
        .uinfo = {
                .aead = {
+                       .geniv = "seqiv",
                        .icv_truncbits = 96,
                }
        },
@@ -67,6 +69,7 @@ static struct xfrm_algo_desc aead_list[] = {
 
        .uinfo = {
                .aead = {
+                       .geniv = "seqiv",
                        .icv_truncbits = 128,
                }
        },
@@ -85,6 +88,7 @@ static struct xfrm_algo_desc aead_list[] = {
 
        .uinfo = {
                .aead = {
+                       .geniv = "seqiv",
                        .icv_truncbits = 64,
                }
        },
@@ -103,6 +107,7 @@ static struct xfrm_algo_desc aead_list[] = {
 
        .uinfo = {
                .aead = {
+                       .geniv = "seqiv",
                        .icv_truncbits = 96,
                }
        },
@@ -121,6 +126,7 @@ static struct xfrm_algo_desc aead_list[] = {
 
        .uinfo = {
                .aead = {
+                       .geniv = "seqiv",
                        .icv_truncbits = 128,
                }
        },
@@ -139,6 +145,7 @@ static struct xfrm_algo_desc aead_list[] = {
 
        .uinfo = {
                .aead = {
+                       .geniv = "seqiv",
                        .icv_truncbits = 128,
                }
        },
@@ -152,6 +159,18 @@ static struct xfrm_algo_desc aead_list[] = {
                .sadb_alg_maxbits = 256
        }
 },
+{
+       .name = "rfc7539esp(chacha20,poly1305)",
+
+       .uinfo = {
+               .aead = {
+                       .geniv = "seqiv",
+                       .icv_truncbits = 128,
+               }
+       },
+
+       .pfkey_supported = 0,
+},
 };
 
 static struct xfrm_algo_desc aalg_list[] = {
@@ -353,6 +372,7 @@ static struct xfrm_algo_desc ealg_list[] = {
 
        .uinfo = {
                .encr = {
+                       .geniv = "echainiv",
                        .blockbits = 64,
                        .defkeybits = 64,
                }
@@ -373,6 +393,7 @@ static struct xfrm_algo_desc ealg_list[] = {
 
        .uinfo = {
                .encr = {
+                       .geniv = "echainiv",
                        .blockbits = 64,
                        .defkeybits = 192,
                }
@@ -393,6 +414,7 @@ static struct xfrm_algo_desc ealg_list[] = {
 
        .uinfo = {
                .encr = {
+                       .geniv = "echainiv",
                        .blockbits = 64,
                        .defkeybits = 128,
                }
@@ -413,6 +435,7 @@ static struct xfrm_algo_desc ealg_list[] = {
 
        .uinfo = {
                .encr = {
+                       .geniv = "echainiv",
                        .blockbits = 64,
                        .defkeybits = 128,
                }
@@ -433,6 +456,7 @@ static struct xfrm_algo_desc ealg_list[] = {
 
        .uinfo = {
                .encr = {
+                       .geniv = "echainiv",
                        .blockbits = 128,
                        .defkeybits = 128,
                }
@@ -453,6 +477,7 @@ static struct xfrm_algo_desc ealg_list[] = {
 
        .uinfo = {
                .encr = {
+                       .geniv = "echainiv",
                        .blockbits = 128,
                        .defkeybits = 128,
                }
@@ -473,6 +498,7 @@ static struct xfrm_algo_desc ealg_list[] = {
 
        .uinfo = {
                .encr = {
+                       .geniv = "echainiv",
                        .blockbits = 128,
                        .defkeybits = 128,
                }
@@ -493,6 +519,7 @@ static struct xfrm_algo_desc ealg_list[] = {
 
        .uinfo = {
                .encr = {
+                       .geniv = "echainiv",
                        .blockbits = 128,
                        .defkeybits = 128,
                }
@@ -512,6 +539,7 @@ static struct xfrm_algo_desc ealg_list[] = {
 
        .uinfo = {
                .encr = {
+                       .geniv = "seqiv",
                        .blockbits = 128,
                        .defkeybits = 160, /* 128-bit key + 32-bit nonce */
                }