crypto: api - Move crypto attr definitions out of crypto.h

The definitions for crypto_attr-related types and enums are not
needed by most Crypto API users.  This patch moves them out of
crypto.h and into algapi.h/internal.h depending on the extent of
their use.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/internal.h b/crypto/internal.h
index 976ec9d..f00869a 100644 (file)
--- a/crypto/internal.h
+++ b/crypto/internal.h
@@ -29,6 +29,18 @@ struct crypto_larval {
        u32 mask;
 };
 
+enum {
+       CRYPTOA_UNSPEC,
+       CRYPTOA_ALG,
+       CRYPTOA_TYPE,
+       __CRYPTOA_MAX,
+};
+
+#define CRYPTOA_MAX (__CRYPTOA_MAX - 1)
+
+/* Maximum number of (rtattr) parameters for each template. */
+#define CRYPTO_MAX_ATTRS 32
+
 extern struct list_head crypto_alg_list;
 extern struct rw_semaphore crypto_alg_sem;
 extern struct blocking_notifier_head crypto_chain;

diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index 41d42e6..5f6841c 100644 (file)
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -96,6 +96,15 @@ struct scatter_walk {
        unsigned int offset;
 };
 
+struct crypto_attr_alg {
+       char name[CRYPTO_MAX_ALG_NAME];
+};
+
+struct crypto_attr_type {
+       u32 type;
+       u32 mask;
+};
+
 void crypto_mod_put(struct crypto_alg *alg);
 
 int crypto_register_template(struct crypto_template *tmpl);

diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 3b9263d..855869e 100644 (file)
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -643,27 +643,6 @@ struct crypto_comp {
        struct crypto_tfm base;
 };
 
-enum {
-       CRYPTOA_UNSPEC,
-       CRYPTOA_ALG,
-       CRYPTOA_TYPE,
-       __CRYPTOA_MAX,
-};
-
-#define CRYPTOA_MAX (__CRYPTOA_MAX - 1)
-
-/* Maximum number of (rtattr) parameters for each template. */
-#define CRYPTO_MAX_ATTRS 32
-
-struct crypto_attr_alg {
-       char name[CRYPTO_MAX_ALG_NAME];
-};
-
-struct crypto_attr_type {
-       u32 type;
-       u32 mask;
-};
-
 /* 
  * Transform user interface.
  */