Merge branch 'upstream-merged'

1 files changed, 19 insertions, 0 deletions

diff --git a/libdde-linux26/libdde_linux26/contrib/include/crypto/des.h b/libdde-linux26/libdde_linux26/contrib/include/crypto/des.h
new file mode 100644
index 00000000..2971c630
--- /dev/null
+++ b/libdde-linux26/libdde_linux26/contrib/include/crypto/des.h
@@ -0,0 +1,19 @@
+/* 
+ * 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 */