[CRYPTO] sha: Add header file for SHA definitions

There are currently several SHA implementations that all define their own
initialization vectors and size values. Since this values are idential
move them to a header file under include/crypto.

Signed-off-by: Jan Glauber <jang@de.ibm.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

2 files changed, 15 insertions, 19 deletions

diff --git a/arch/s390/crypto/sha1_s390.c b/arch/s390/crypto/sha1_s390.c
index 8ebd3cd6bd1f..5a834f6578ab 100644
--- a/arch/s390/crypto/sha1_s390.c
+++ b/arch/s390/crypto/sha1_s390.c
@@ -26,12 +26,10 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/crypto.h>
+#include <crypto/sha.h>
 
 #include "crypt_s390.h"
 
-#define SHA1_DIGEST_SIZE        20
-#define SHA1_BLOCK_SIZE         64
-
 struct s390_sha1_ctx {
         u64 count;              /* message length */
         u32 state[5];
@@ -42,11 +40,11 @@ static void sha1_init(struct crypto_tfm *tfm)
 {
         struct s390_sha1_ctx *sctx = crypto_tfm_ctx(tfm);
 
-        sctx->state[0] = 0x67452301;
-        sctx->state[1] = 0xEFCDAB89;
-        sctx->state[2] = 0x98BADCFE;
-        sctx->state[3] = 0x10325476;
-        sctx->state[4] = 0xC3D2E1F0;
+        sctx->state[0] = SHA1_H0;
+        sctx->state[1] = SHA1_H1;
+        sctx->state[2] = SHA1_H2;
+        sctx->state[3] = SHA1_H3;
+        sctx->state[4] = SHA1_H4;
         sctx->count = 0;
 }
 
diff --git a/arch/s390/crypto/sha256_s390.c b/arch/s390/crypto/sha256_s390.c
index c728bd0ae1ed..ccf8633c4f65 100644
--- a/arch/s390/crypto/sha256_s390.c
+++ b/arch/s390/crypto/sha256_s390.c
@@ -19,12 +19,10 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/crypto.h>
+#include <crypto/sha.h>
 
 #include "crypt_s390.h"
 
-#define SHA256_DIGEST_SIZE      32
-#define SHA256_BLOCK_SIZE       64
-
 struct s390_sha256_ctx {
         u64 count;              /* message length */
         u32 state[8];
@@ -35,14 +33,14 @@ static void sha256_init(struct crypto_tfm *tfm)
 {
         struct s390_sha256_ctx *sctx = crypto_tfm_ctx(tfm);
 
-        sctx->state[0] = 0x6a09e667;
-        sctx->state[1] = 0xbb67ae85;
-        sctx->state[2] = 0x3c6ef372;
-        sctx->state[3] = 0xa54ff53a;
-        sctx->state[4] = 0x510e527f;
-        sctx->state[5] = 0x9b05688c;
-        sctx->state[6] = 0x1f83d9ab;
-        sctx->state[7] = 0x5be0cd19;
+        sctx->state[0] = SHA256_H0;
+        sctx->state[1] = SHA256_H1;
+        sctx->state[2] = SHA256_H2;
+        sctx->state[3] = SHA256_H3;
+        sctx->state[4] = SHA256_H4;
+        sctx->state[5] = SHA256_H5;
+        sctx->state[6] = SHA256_H6;
+        sctx->state[7] = SHA256_H7;
         sctx->count = 0;
 }