[CRYPTO] des: Create header file for common macros

This patch creates include/crypto/des.h for common macros shared between DES implementations. Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

[CRYPTO] des: Create header file for common macros
This patch creates include/crypto/des.h for common macros shared between DES implementations. Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Evgeniy Polyakov · Herbert Xu
1 parent f7d0561ea1
Showing 2 changed files with 20 additions and 7 deletions Side-by-side Diff
crypto/des_generic.c
include/crypto/des.h
@@ -20,13 +20,7 @@
 #include <linux/crypto.h>
 #include <linux/types.h>
  
-#define DES_KEY_SIZE		8
-#define DES_EXPKEY_WORDS	32
-#define DES_BLOCK_SIZE		8
-
-#define DES3_EDE_KEY_SIZE	(3 * DES_KEY_SIZE)
-#define DES3_EDE_EXPKEY_WORDS	(3 * DES_EXPKEY_WORDS)
-#define DES3_EDE_BLOCK_SIZE	DES_BLOCK_SIZE
+#include <crypto/des.h>
  
 #define ROL(x, r) ((x) = rol32((x), (r)))
 #define ROR(x, r) ((x) = ror32((x), (r)))
+/* 
+ * DES & Triple DES EDE Cipher Algorithms.
+ */
+
+#ifndef __CRYPTO_DES_H
+#define __CRYPTO_DES_H
+
+#define DES_KEY_SIZE		8
+#define DES_EXPKEY_WORDS	32
+#define DES_BLOCK_SIZE		8
+
+#define DES3_EDE_KEY_SIZE	(3 * DES_KEY_SIZE)
+#define DES3_EDE_EXPKEY_WORDS	(3 * DES_EXPKEY_WORDS)
+#define DES3_EDE_BLOCK_SIZE	DES_BLOCK_SIZE
+
+
+extern unsigned long des_ekey(u32 *pe, const u8 *k);
+
+#endif /* __CRYPTO_DES_H */
...	...	@@ -20,13 +20,7 @@
20	20	#include <linux/crypto.h>
21	21	#include <linux/types.h>
22	22
23		-#define DES_KEY_SIZE 8
24		-#define DES_EXPKEY_WORDS 32
25		-#define DES_BLOCK_SIZE 8
26		-
27		-#define DES3_EDE_KEY_SIZE (3 * DES_KEY_SIZE)
28		-#define DES3_EDE_EXPKEY_WORDS (3 * DES_EXPKEY_WORDS)
29		-#define DES3_EDE_BLOCK_SIZE DES_BLOCK_SIZE
	23	+#include <crypto/des.h>
30	24
31	25	#define ROL(x, r) ((x) = rol32((x), (r)))
32	26	#define ROR(x, r) ((x) = ror32((x), (r)))
	1	+/*
	2	+ * DES & Triple DES EDE Cipher Algorithms.
	3	+ */
	4	+
	5	+#ifndef __CRYPTO_DES_H
	6	+#define __CRYPTO_DES_H
	7	+
	8	+#define DES_KEY_SIZE 8
	9	+#define DES_EXPKEY_WORDS 32
	10	+#define DES_BLOCK_SIZE 8
	11	+
	12	+#define DES3_EDE_KEY_SIZE (3 * DES_KEY_SIZE)
	13	+#define DES3_EDE_EXPKEY_WORDS (3 * DES_EXPKEY_WORDS)
	14	+#define DES3_EDE_BLOCK_SIZE DES_BLOCK_SIZE
	15	+
	16	+
	17	+extern unsigned long des_ekey(u32 pe, const u8 k);
	18	+
	19	+#endif /* __CRYPTO_DES_H */