crypto: user - Move cryptouser.h to uapi

The header file cryptouser.h only contains information that is
exported to user-space.

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

diff --git a/include/linux/cryptouser.h b/include/linux/cryptouser.h
deleted file mode 100644 (file)
index 36efbbb..0000000
--- a/include/linux/cryptouser.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Crypto user configuration API.
- *
- * Copyright (C) 2011 secunet Security Networks AG
- * Copyright (C) 2011 Steffen Klassert <steffen.klassert@secunet.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/* Netlink configuration messages.  */
-enum {
-       CRYPTO_MSG_BASE = 0x10,
-       CRYPTO_MSG_NEWALG = 0x10,
-       CRYPTO_MSG_DELALG,
-       CRYPTO_MSG_UPDATEALG,
-       CRYPTO_MSG_GETALG,
-       __CRYPTO_MSG_MAX
-};
-#define CRYPTO_MSG_MAX (__CRYPTO_MSG_MAX - 1)
-#define CRYPTO_NR_MSGTYPES (CRYPTO_MSG_MAX + 1 - CRYPTO_MSG_BASE)
-
-#define CRYPTO_MAX_NAME CRYPTO_MAX_ALG_NAME
-
-/* Netlink message attributes.  */
-enum crypto_attr_type_t {
-       CRYPTOCFGA_UNSPEC,
-       CRYPTOCFGA_PRIORITY_VAL,        /* __u32 */
-       CRYPTOCFGA_REPORT_LARVAL,       /* struct crypto_report_larval */
-       CRYPTOCFGA_REPORT_HASH,         /* struct crypto_report_hash */
-       CRYPTOCFGA_REPORT_BLKCIPHER,    /* struct crypto_report_blkcipher */
-       CRYPTOCFGA_REPORT_AEAD,         /* struct crypto_report_aead */
-       CRYPTOCFGA_REPORT_COMPRESS,     /* struct crypto_report_comp */
-       CRYPTOCFGA_REPORT_RNG,          /* struct crypto_report_rng */
-       CRYPTOCFGA_REPORT_CIPHER,       /* struct crypto_report_cipher */
-       CRYPTOCFGA_REPORT_AKCIPHER,     /* struct crypto_report_akcipher */
-       __CRYPTOCFGA_MAX
-
-#define CRYPTOCFGA_MAX (__CRYPTOCFGA_MAX - 1)
-};
-
-struct crypto_user_alg {
-       char cru_name[CRYPTO_MAX_ALG_NAME];
-       char cru_driver_name[CRYPTO_MAX_ALG_NAME];
-       char cru_module_name[CRYPTO_MAX_ALG_NAME];
-       __u32 cru_type;
-       __u32 cru_mask;
-       __u32 cru_refcnt;
-       __u32 cru_flags;
-};
-
-struct crypto_report_larval {
-       char type[CRYPTO_MAX_NAME];
-};
-
-struct crypto_report_hash {
-       char type[CRYPTO_MAX_NAME];
-       unsigned int blocksize;
-       unsigned int digestsize;
-};
-
-struct crypto_report_cipher {
-       char type[CRYPTO_MAX_ALG_NAME];
-       unsigned int blocksize;
-       unsigned int min_keysize;
-       unsigned int max_keysize;
-};
-
-struct crypto_report_blkcipher {
-       char type[CRYPTO_MAX_NAME];
-       char geniv[CRYPTO_MAX_NAME];
-       unsigned int blocksize;
-       unsigned int min_keysize;
-       unsigned int max_keysize;
-       unsigned int ivsize;
-};
-
-struct crypto_report_aead {
-       char type[CRYPTO_MAX_NAME];
-       char geniv[CRYPTO_MAX_NAME];
-       unsigned int blocksize;
-       unsigned int maxauthsize;
-       unsigned int ivsize;
-};
-
-struct crypto_report_comp {
-       char type[CRYPTO_MAX_NAME];
-};
-
-struct crypto_report_rng {
-       char type[CRYPTO_MAX_NAME];
-       unsigned int seedsize;
-};
-
-struct crypto_report_akcipher {
-       char type[CRYPTO_MAX_NAME];
-};
-
-#define CRYPTO_REPORT_MAXSIZE (sizeof(struct crypto_user_alg) + \
-                              sizeof(struct crypto_report_blkcipher))

diff --git a/include/uapi/linux/cryptouser.h b/include/uapi/linux/cryptouser.h
new file mode 100644 (file)
index 0000000..36efbbb
--- /dev/null
+++ b/include/uapi/linux/cryptouser.h
@@ -0,0 +1,110 @@
+/*
+ * Crypto user configuration API.
+ *
+ * Copyright (C) 2011 secunet Security Networks AG
+ * Copyright (C) 2011 Steffen Klassert <steffen.klassert@secunet.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/* Netlink configuration messages.  */
+enum {
+       CRYPTO_MSG_BASE = 0x10,
+       CRYPTO_MSG_NEWALG = 0x10,
+       CRYPTO_MSG_DELALG,
+       CRYPTO_MSG_UPDATEALG,
+       CRYPTO_MSG_GETALG,
+       __CRYPTO_MSG_MAX
+};
+#define CRYPTO_MSG_MAX (__CRYPTO_MSG_MAX - 1)
+#define CRYPTO_NR_MSGTYPES (CRYPTO_MSG_MAX + 1 - CRYPTO_MSG_BASE)
+
+#define CRYPTO_MAX_NAME CRYPTO_MAX_ALG_NAME
+
+/* Netlink message attributes.  */
+enum crypto_attr_type_t {
+       CRYPTOCFGA_UNSPEC,
+       CRYPTOCFGA_PRIORITY_VAL,        /* __u32 */
+       CRYPTOCFGA_REPORT_LARVAL,       /* struct crypto_report_larval */
+       CRYPTOCFGA_REPORT_HASH,         /* struct crypto_report_hash */
+       CRYPTOCFGA_REPORT_BLKCIPHER,    /* struct crypto_report_blkcipher */
+       CRYPTOCFGA_REPORT_AEAD,         /* struct crypto_report_aead */
+       CRYPTOCFGA_REPORT_COMPRESS,     /* struct crypto_report_comp */
+       CRYPTOCFGA_REPORT_RNG,          /* struct crypto_report_rng */
+       CRYPTOCFGA_REPORT_CIPHER,       /* struct crypto_report_cipher */
+       CRYPTOCFGA_REPORT_AKCIPHER,     /* struct crypto_report_akcipher */
+       __CRYPTOCFGA_MAX
+
+#define CRYPTOCFGA_MAX (__CRYPTOCFGA_MAX - 1)
+};
+
+struct crypto_user_alg {
+       char cru_name[CRYPTO_MAX_ALG_NAME];
+       char cru_driver_name[CRYPTO_MAX_ALG_NAME];
+       char cru_module_name[CRYPTO_MAX_ALG_NAME];
+       __u32 cru_type;
+       __u32 cru_mask;
+       __u32 cru_refcnt;
+       __u32 cru_flags;
+};
+
+struct crypto_report_larval {
+       char type[CRYPTO_MAX_NAME];
+};
+
+struct crypto_report_hash {
+       char type[CRYPTO_MAX_NAME];
+       unsigned int blocksize;
+       unsigned int digestsize;
+};
+
+struct crypto_report_cipher {
+       char type[CRYPTO_MAX_ALG_NAME];
+       unsigned int blocksize;
+       unsigned int min_keysize;
+       unsigned int max_keysize;
+};
+
+struct crypto_report_blkcipher {
+       char type[CRYPTO_MAX_NAME];
+       char geniv[CRYPTO_MAX_NAME];
+       unsigned int blocksize;
+       unsigned int min_keysize;
+       unsigned int max_keysize;
+       unsigned int ivsize;
+};
+
+struct crypto_report_aead {
+       char type[CRYPTO_MAX_NAME];
+       char geniv[CRYPTO_MAX_NAME];
+       unsigned int blocksize;
+       unsigned int maxauthsize;
+       unsigned int ivsize;
+};
+
+struct crypto_report_comp {
+       char type[CRYPTO_MAX_NAME];
+};
+
+struct crypto_report_rng {
+       char type[CRYPTO_MAX_NAME];
+       unsigned int seedsize;
+};
+
+struct crypto_report_akcipher {
+       char type[CRYPTO_MAX_NAME];
+};
+
+#define CRYPTO_REPORT_MAXSIZE (sizeof(struct crypto_user_alg) + \
+                              sizeof(struct crypto_report_blkcipher))