Some minor SHA1/256 improvements&fixes.

* Use a shared init function.
* Fix some functions used in descriptors and implementation.

Signed-off-by: Steffen Jaeckel <s@jaeckel.eu>

Author: sjaeckel

src/hashes/sha1.c

@@ -29,7 +29,7 @@ const struct ltc_hash_descriptor sha1_portable_desc =
    { 1, 3, 14, 3, 2, 26,  },
    6,
 
-    &sha1_c_init,
+    &sha1_init,
     &sha1_c_process,
     &sha1_c_done,
     &sha1_c_test,
@@ -186,18 +186,7 @@ static int s_sha1_c_compress(hash_state *md, const unsigned char *buf)
 */
 int sha1_c_init(hash_state * md)
 {
-   LTC_ARGCHK(md != NULL);
-
-   md->sha1.state = LTC_ALIGN_BUF(md->sha1.state_buf, 16);
-
-   md->sha1.state[0] = 0x67452301UL;
-   md->sha1.state[1] = 0xefcdab89UL;
-   md->sha1.state[2] = 0x98badcfeUL;
-   md->sha1.state[3] = 0x10325476UL;
-   md->sha1.state[4] = 0xc3d2e1f0UL;
-   md->sha1.curlen = 0;
-   md->sha1.length = 0;
-   return CRYPT_OK;
+   return sha1_init(md);
 }
 
 /**

src/hashes/sha1_desc.c

@@ -79,12 +79,18 @@ static LTC_INLINE int s_sha1_x86_is_supported(void)
 */
 int sha1_init(hash_state * md)
 {
-#if defined LTC_SHA1_X86
-    if(s_sha1_x86_is_supported()) {
-        return sha1_x86_init(md);
-    }
-#endif
-    return sha1_c_init(md);
+   LTC_ARGCHK(md != NULL);
+
+   md->sha1.state = LTC_ALIGN_BUF(md->sha1.state_buf, 16);
+
+   md->sha1.state[0] = 0x67452301UL;
+   md->sha1.state[1] = 0xefcdab89UL;
+   md->sha1.state[2] = 0x98badcfeUL;
+   md->sha1.state[3] = 0x10325476UL;
+   md->sha1.state[4] = 0xc3d2e1f0UL;
+   md->sha1.curlen = 0;
+   md->sha1.length = 0;
+   return CRYPT_OK;
 }
 
 /**

src/hashes/sha1_x86.c

@@ -38,7 +38,7 @@ const struct ltc_hash_descriptor sha1_x86_desc =
     { 1, 3, 14, 3, 2, 26,  },
     6,
 
-    &sha1_x86_init,
+    &sha1_init,
     &sha1_x86_process,
     &sha1_x86_done,
     &sha1_x86_test,
@@ -198,18 +198,7 @@ static int s_sha1_x86_compress(hash_state *md, const unsigned char *buf)
 */
 int sha1_x86_init(hash_state * md)
 {
-   LTC_ARGCHK(md != NULL);
-
-   md->sha1.state = LTC_ALIGN_BUF(md->sha1.state_buf, 16);
-
-   md->sha1.state[0] = 0x67452301UL;
-   md->sha1.state[1] = 0xefcdab89UL;
-   md->sha1.state[2] = 0x98badcfeUL;
-   md->sha1.state[3] = 0x10325476UL;
-   md->sha1.state[4] = 0xc3d2e1f0UL;
-   md->sha1.curlen = 0;
-   md->sha1.length = 0;
-   return CRYPT_OK;
+   return sha1_init(md);
 }
 
 /**

src/hashes/sha2/sha224.c

@@ -20,10 +20,10 @@ const struct ltc_hash_descriptor sha224_portable_desc =
    { 2, 16, 840, 1, 101, 3, 4, 2, 4,  },
    9,
 
-    &sha224_c_init,
+    &sha224_init,
     &sha256_c_process,
     &sha224_c_done,
-    &sha224_test,
+    &sha224_c_test,
     NULL
 };
 
@@ -35,21 +35,7 @@ const struct ltc_hash_descriptor sha224_portable_desc =
 */
 int sha224_c_init(hash_state * md)
 {
-    LTC_ARGCHK(md != NULL);
-
-    md->sha256.state = LTC_ALIGN_BUF(md->sha256.state_buf, 16);
-
-    md->sha256.curlen = 0;
-    md->sha256.length = 0;
-    md->sha256.state[0] = 0xc1059ed8UL;
-    md->sha256.state[1] = 0x367cd507UL;
-    md->sha256.state[2] = 0x3070dd17UL;
-    md->sha256.state[3] = 0xf70e5939UL;
-    md->sha256.state[4] = 0xffc00b31UL;
-    md->sha256.state[5] = 0x68581511UL;
-    md->sha256.state[6] = 0x64f98fa7UL;
-    md->sha256.state[7] = 0xbefa4fa4UL;
-    return CRYPT_OK;
+   return sha224_init(md);
 }
 
 /**
@@ -66,7 +52,7 @@ int sha224_c_done(hash_state * md, unsigned char *out)
     LTC_ARGCHK(md  != NULL);
     LTC_ARGCHK(out != NULL);
 
-    err = sha256_done(md, buf);
+    err = sha256_c_done(md, buf);
     XMEMCPY(out, buf, 28);
 #ifdef LTC_CLEAN_STACK
     zeromem(buf, sizeof(buf));

src/hashes/sha2/sha224_desc.c

@@ -85,12 +85,21 @@ static LTC_INLINE int s_sha224_x86_is_supported(void)
 */
 int sha224_init(hash_state * md)
 {
-#if defined LTC_SHA224_X86
-    if(s_sha224_x86_is_supported()) {
-        return sha224_x86_init(md);
-    }
-#endif
-    return sha224_c_init(md);
+   LTC_ARGCHK(md != NULL);
+
+   md->sha256.state = LTC_ALIGN_BUF(md->sha256.state_buf, 16);
+
+   md->sha256.curlen = 0;
+   md->sha256.length = 0;
+   md->sha256.state[0] = 0xc1059ed8UL;
+   md->sha256.state[1] = 0x367cd507UL;
+   md->sha256.state[2] = 0x3070dd17UL;
+   md->sha256.state[3] = 0xf70e5939UL;
+   md->sha256.state[4] = 0xffc00b31UL;
+   md->sha256.state[5] = 0x68581511UL;
+   md->sha256.state[6] = 0x64f98fa7UL;
+   md->sha256.state[7] = 0xbefa4fa4UL;
+   return CRYPT_OK;
 }
 
 /**

src/hashes/sha2/sha224_x86.c

@@ -20,7 +20,7 @@ const struct ltc_hash_descriptor sha224_x86_desc =
    { 2, 16, 840, 1, 101, 3, 4, 2, 4,  },
    9,
 
-    &sha224_x86_init,
+    &sha224_init,
     &sha256_x86_process,
     &sha224_x86_done,
     &sha224_x86_test,
@@ -35,21 +35,7 @@ const struct ltc_hash_descriptor sha224_x86_desc =
 */
 int sha224_x86_init(hash_state * md)
 {
-    LTC_ARGCHK(md != NULL);
-
-    md->sha256.state = LTC_ALIGN_BUF(md->sha256.state_buf, 16);
-
-    md->sha256.curlen = 0;
-    md->sha256.length = 0;
-    md->sha256.state[0] = 0xc1059ed8UL;
-    md->sha256.state[1] = 0x367cd507UL;
-    md->sha256.state[2] = 0x3070dd17UL;
-    md->sha256.state[3] = 0xf70e5939UL;
-    md->sha256.state[4] = 0xffc00b31UL;
-    md->sha256.state[5] = 0x68581511UL;
-    md->sha256.state[6] = 0x64f98fa7UL;
-    md->sha256.state[7] = 0xbefa4fa4UL;
-    return CRYPT_OK;
+    return sha224_init(md);
 }
 
 /**

src/hashes/sha2/sha256.c

@@ -20,7 +20,7 @@ const struct ltc_hash_descriptor sha256_portable_desc =
    { 2, 16, 840, 1, 101, 3, 4, 2, 1,  },
    9,
 
-    &sha256_c_init,
+    &sha256_init,
     &sha256_c_process,
     &sha256_c_done,
     &sha256_c_test,
@@ -233,21 +233,7 @@ static int s_sha256_compress(hash_state * md, const unsigned char *buf)
 */
 int sha256_c_init(hash_state * md)
 {
-    LTC_ARGCHK(md != NULL);
-
-    md->sha256.state = LTC_ALIGN_BUF(md->sha256.state_buf, 16);
-
-    md->sha256.curlen = 0;
-    md->sha256.length = 0;
-    md->sha256.state[0] = 0x6A09E667UL;
-    md->sha256.state[1] = 0xBB67AE85UL;
-    md->sha256.state[2] = 0x3C6EF372UL;
-    md->sha256.state[3] = 0xA54FF53AUL;
-    md->sha256.state[4] = 0x510E527FUL;
-    md->sha256.state[5] = 0x9B05688CUL;
-    md->sha256.state[6] = 0x1F83D9ABUL;
-    md->sha256.state[7] = 0x5BE0CD19UL;
-    return CRYPT_OK;
+    return sha256_init(md);
 }
 
 /**

src/hashes/sha2/sha256_desc.c

@@ -88,12 +88,21 @@ const struct ltc_hash_descriptor sha256_desc =
 */
 int sha256_init(hash_state * md)
 {
-#if defined LTC_SHA256_X86
-    if(s_sha256_x86_is_supported()) {
-        return sha256_x86_init(md);
-    }
-#endif
-    return sha256_c_init(md);
+   LTC_ARGCHK(md != NULL);
+
+   md->sha256.state = LTC_ALIGN_BUF(md->sha256.state_buf, 16);
+
+   md->sha256.curlen = 0;
+   md->sha256.length = 0;
+   md->sha256.state[0] = 0x6A09E667UL;
+   md->sha256.state[1] = 0xBB67AE85UL;
+   md->sha256.state[2] = 0x3C6EF372UL;
+   md->sha256.state[3] = 0xA54FF53AUL;
+   md->sha256.state[4] = 0x510E527FUL;
+   md->sha256.state[5] = 0x9B05688CUL;
+   md->sha256.state[6] = 0x1F83D9ABUL;
+   md->sha256.state[7] = 0x5BE0CD19UL;
+   return CRYPT_OK;
 }
 
 /**

src/hashes/sha2/sha256_x86.c

@@ -37,7 +37,7 @@ const struct ltc_hash_descriptor sha256_x86_desc =
    { 2, 16, 840, 1, 101, 3, 4, 2, 1,  },
    9,
 
-    &sha256_x86_init,
+    &sha256_init,
     &sha256_x86_process,
     &sha256_x86_done,
     &sha256_x86_test,
@@ -265,21 +265,7 @@ static int s_sha256_compress(hash_state * md, const unsigned char *buf)
 */
 int sha256_x86_init(hash_state * md)
 {
-    LTC_ARGCHK(md != NULL);
-
-    md->sha256.state = LTC_ALIGN_BUF(md->sha256.state_buf, 16);
-
-    md->sha256.curlen = 0;
-    md->sha256.length = 0;
-    md->sha256.state[0] = 0x6A09E667UL;
-    md->sha256.state[1] = 0xBB67AE85UL;
-    md->sha256.state[2] = 0x3C6EF372UL;
-    md->sha256.state[3] = 0xA54FF53AUL;
-    md->sha256.state[4] = 0x510E527FUL;
-    md->sha256.state[5] = 0x9B05688CUL;
-    md->sha256.state[6] = 0x1F83D9ABUL;
-    md->sha256.state[7] = 0x5BE0CD19UL;
-    return CRYPT_OK;
+    return sha256_init(md);
 }
 
 /**