diff options
-rw-r--r-- | crypto/des_generic.c | 8 | ||||
-rw-r--r-- | include/crypto/des.h | 19 |
2 files changed, 20 insertions, 7 deletions
diff --git a/crypto/des_generic.c b/crypto/des_generic.c index 59966d14b8e0..f75eafe1a875 100644 --- a/crypto/des_generic.c +++ b/crypto/des_generic.c | |||
@@ -20,13 +20,7 @@ | |||
20 | #include <linux/crypto.h> | 20 | #include <linux/crypto.h> |
21 | #include <linux/types.h> | 21 | #include <linux/types.h> |
22 | 22 | ||
23 | #define DES_KEY_SIZE 8 | 23 | #include <crypto/des.h> |
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 | ||
30 | 24 | ||
31 | #define ROL(x, r) ((x) = rol32((x), (r))) | 25 | #define ROL(x, r) ((x) = rol32((x), (r))) |
32 | #define ROR(x, r) ((x) = ror32((x), (r))) | 26 | #define ROR(x, r) ((x) = ror32((x), (r))) |
diff --git a/include/crypto/des.h b/include/crypto/des.h new file mode 100644 index 000000000000..2971c6304ade --- /dev/null +++ b/include/crypto/des.h | |||
@@ -0,0 +1,19 @@ | |||
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 */ | ||