Re: [1/1 take 3] HIFN 795x driver.

[Evgeniy Polyakov <johnpol@2ka.mipt.ru>]

On Thu, Oct 11, 2007 at 06:52:02PM +0800, Herbert Xu (herbert@gondor.apana.org.au) wrote:
> On Thu, Oct 11, 2007 at 02:43:14PM +0400, Evgeniy Polyakov wrote:
> > 
> > Attached patch fixes that with following tcrypt output:
> 
> That was quick :)
> 
> Unfortunately it doesn't apply because des.c has been renamed
> to des_generic.c in cryptodev-2.6.  Could you please fix that
> up and also move the prototype into a header file, say
> include/crypto/des.h?

Here is DES update.
I will send HIFN river update in the next mail.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>

diff --git a/crypto/des_generic.c b/crypto/des_generic.c
index ec09e7b..355ecb7 100644
--- a/crypto/des_generic.c
+++ b/crypto/des_generic.c
@@ -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)))
diff --git a/include/crypto/des.h b/include/crypto/des.h
new file mode 100644
index 0000000..2971c63
--- /dev/null
+++ b/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 */

-- 
	Evgeniy Polyakov