crypto: algif_aead - Temporarily disable all AEAD algorithms

herbertx · herbertx · commit 3e90950d36f1 · 2015-06-22T15:49:30.000+08:00
As the AEAD conversion is still ongoing, we do not yet wish to
export legacy AEAD implementations to user-space, as their calling
convention will change.

This patch actually disables all AEAD algorithms because some of
them (e.g., cryptd) will need to be modified to propagate this flag.

Subsequent patches will reenable them on an individual basis.

Signed-off-by: Herbert Xu &lt;herbert@gondor.apana.org.au&gt;
diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c
@@ -514,7 +514,8 @@ static struct proto_ops algif_aead_ops = {
 
 static void *aead_bind(const char *name, u32 type, u32 mask)
 {
-	return crypto_alloc_aead(name, type, mask);
+	return crypto_alloc_aead(name, type | CRYPTO_ALG_AEAD_NEW,
+				 mask | CRYPTO_ALG_AEAD_NEW);
 }
 
 static void aead_release(void *private)
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
@@ -101,6 +101,12 @@
  */
 #define CRYPTO_ALG_INTERNAL		0x00002000
 
+/*
+ * Temporary flag used to prevent legacy AEAD implementations from
+ * being used by user-space.
+ */
+#define CRYPTO_ALG_AEAD_NEW		0x00004000
+
 /*
  * Transform masks and values (for crt_flags).
  */

Original file line number	Diff line number	Diff line change
`@@ -514,7 +514,8 @@ static struct proto_ops algif_aead_ops = {`
`514`	`514`
`515`	`515`	`static void aead_bind(const char name, u32 type, u32 mask)`
`516`	`516`	`{`
`517`		`- return crypto_alloc_aead(name, type, mask);`
	`517`	`+ return crypto_alloc_aead(name, type \| CRYPTO_ALG_AEAD_NEW,`
	`518`	`+ mask \| CRYPTO_ALG_AEAD_NEW);`
`518`	`519`	`}`
`519`	`520`
`520`	`521`	`static void aead_release(void *private)`