X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/6668a75e54d5a0f3af36b57180177a7fc09868d4..b4bc538452c92b6a2f9c935028461f5c774a4f1f:/sshsha.c

diff --git a/sshsha.c b/sshsha.c
index b3860b69..9e9ef8c6 100644
--- a/sshsha.c
+++ b/sshsha.c
@@ -28,6 +28,21 @@ void SHATransform(word32 * digest, word32 * block)
     word32 a, b, c, d, e;
     int t;
 
+#ifdef RANDOM_DIAGNOSTICS
+    {
+        extern int random_diagnostics;
+        if (random_diagnostics) {
+            int i;
+            printf("SHATransform:");
+            for (i = 0; i < 5; i++)
+                printf(" %08x", digest[i]);
+            printf(" +");
+            for (i = 0; i < 16; i++)
+                printf(" %08x", block[i]);
+        }
+    }
+#endif
+
     for (t = 0; t < 16; t++)
 	w[t] = block[t];
 
@@ -83,6 +98,19 @@ void SHATransform(word32 * digest, word32 * block)
     digest[2] += c;
     digest[3] += d;
     digest[4] += e;
+
+#ifdef RANDOM_DIAGNOSTICS
+    {
+        extern int random_diagnostics;
+        if (random_diagnostics) {
+            int i;
+            printf(" =");
+            for (i = 0; i < 5; i++)
+                printf(" %08x", digest[i]);
+            printf("\n");
+        }
+    }
+#endif
 }
 
 /* ----------------------------------------------------------------------
@@ -217,7 +245,7 @@ static void sha1_final(void *handle, unsigned char *output)
 }
 
 const struct ssh_hash ssh_sha1 = {
-    sha1_init, sha1_bytes, sha1_final, 20
+    sha1_init, sha1_bytes, sha1_final, 20, "SHA-1"
 };
 
 /* ----------------------------------------------------------------------
@@ -227,7 +255,7 @@ const struct ssh_hash ssh_sha1 = {
 
 static void *sha1_make_context(void)
 {
-    return snewn(2, SHA_State);
+    return snewn(3, SHA_State);
 }
 
 static void sha1_free_context(void *handle)
@@ -253,7 +281,7 @@ static void sha1_key_internal(void *handle, unsigned char *key, int len)
     SHA_Init(&keys[1]);
     SHA_Bytes(&keys[1], foo, 64);
 
-    memset(foo, 0, 64);		       /* burn the evidence */
+    smemclr(foo, 64);		       /* burn the evidence */
 }
 
 static void sha1_key(void *handle, unsigned char *key)
@@ -266,33 +294,57 @@ static void sha1_key_buggy(void *handle, unsigned char *key)
     sha1_key_internal(handle, key, 16);
 }
 
-static void sha1_do_hmac(void *handle, unsigned char *blk, int len,
-			 unsigned long seq, unsigned char *hmac)
+static void hmacsha1_start(void *handle)
+{
+    SHA_State *keys = (SHA_State *)handle;
+
+    keys[2] = keys[0];		      /* structure copy */
+}
+
+static void hmacsha1_bytes(void *handle, unsigned char const *blk, int len)
+{
+    SHA_State *keys = (SHA_State *)handle;
+    SHA_Bytes(&keys[2], (void *)blk, len);
+}
+
+static void hmacsha1_genresult(void *handle, unsigned char *hmac)
 {
     SHA_State *keys = (SHA_State *)handle;
     SHA_State s;
     unsigned char intermediate[20];
 
-    intermediate[0] = (unsigned char) ((seq >> 24) & 0xFF);
-    intermediate[1] = (unsigned char) ((seq >> 16) & 0xFF);
-    intermediate[2] = (unsigned char) ((seq >> 8) & 0xFF);
-    intermediate[3] = (unsigned char) ((seq) & 0xFF);
-
-    s = keys[0];		       /* structure copy */
-    SHA_Bytes(&s, intermediate, 4);
-    SHA_Bytes(&s, blk, len);
+    s = keys[2];		       /* structure copy */
     SHA_Final(&s, intermediate);
     s = keys[1];		       /* structure copy */
     SHA_Bytes(&s, intermediate, 20);
     SHA_Final(&s, hmac);
 }
 
+static void sha1_do_hmac(void *handle, unsigned char *blk, int len,
+			 unsigned long seq, unsigned char *hmac)
+{
+    unsigned char seqbuf[4];
+
+    PUT_32BIT_MSB_FIRST(seqbuf, seq);
+    hmacsha1_start(handle);
+    hmacsha1_bytes(handle, seqbuf, 4);
+    hmacsha1_bytes(handle, blk, len);
+    hmacsha1_genresult(handle, hmac);
+}
+
 static void sha1_generate(void *handle, unsigned char *blk, int len,
 			  unsigned long seq)
 {
     sha1_do_hmac(handle, blk, len, seq, blk + len);
 }
 
+static int hmacsha1_verresult(void *handle, unsigned char const *hmac)
+{
+    unsigned char correct[20];
+    hmacsha1_genresult(handle, correct);
+    return !memcmp(correct, hmac, 20);
+}
+
 static int sha1_verify(void *handle, unsigned char *blk, int len,
 		       unsigned long seq)
 {
@@ -301,6 +353,13 @@ static int sha1_verify(void *handle, unsigned char *blk, int len,
     return !memcmp(correct, blk + len, 20);
 }
 
+static void hmacsha1_96_genresult(void *handle, unsigned char *hmac)
+{
+    unsigned char full[20];
+    hmacsha1_genresult(handle, full);
+    memcpy(hmac, full, 12);
+}
+
 static void sha1_96_generate(void *handle, unsigned char *blk, int len,
 			     unsigned long seq)
 {
@@ -309,6 +368,13 @@ static void sha1_96_generate(void *handle, unsigned char *blk, int len,
     memcpy(blk + len, full, 12);
 }
 
+static int hmacsha1_96_verresult(void *handle, unsigned char const *hmac)
+{
+    unsigned char correct[20];
+    hmacsha1_genresult(handle, correct);
+    return !memcmp(correct, hmac, 12);
+}
+
 static int sha1_96_verify(void *handle, unsigned char *blk, int len,
 		       unsigned long seq)
 {
@@ -333,6 +399,7 @@ void hmac_sha1_simple(void *key, int keylen, void *data, int datalen,
 const struct ssh_mac ssh_hmac_sha1 = {
     sha1_make_context, sha1_free_context, sha1_key,
     sha1_generate, sha1_verify,
+    hmacsha1_start, hmacsha1_bytes, hmacsha1_genresult, hmacsha1_verresult,
     "hmac-sha1",
     20,
     "HMAC-SHA1"
@@ -341,6 +408,8 @@ const struct ssh_mac ssh_hmac_sha1 = {
 const struct ssh_mac ssh_hmac_sha1_96 = {
     sha1_make_context, sha1_free_context, sha1_key,
     sha1_96_generate, sha1_96_verify,
+    hmacsha1_start, hmacsha1_bytes,
+    hmacsha1_96_genresult, hmacsha1_96_verresult,
     "hmac-sha1-96",
     12,
     "HMAC-SHA1-96"
@@ -349,6 +418,7 @@ const struct ssh_mac ssh_hmac_sha1_96 = {
 const struct ssh_mac ssh_hmac_sha1_buggy = {
     sha1_make_context, sha1_free_context, sha1_key_buggy,
     sha1_generate, sha1_verify,
+    hmacsha1_start, hmacsha1_bytes, hmacsha1_genresult, hmacsha1_verresult,
     "hmac-sha1",
     20,
     "bug-compatible HMAC-SHA1"
@@ -357,6 +427,8 @@ const struct ssh_mac ssh_hmac_sha1_buggy = {
 const struct ssh_mac ssh_hmac_sha1_96_buggy = {
     sha1_make_context, sha1_free_context, sha1_key_buggy,
     sha1_96_generate, sha1_96_verify,
+    hmacsha1_start, hmacsha1_bytes,
+    hmacsha1_96_genresult, hmacsha1_96_verresult,
     "hmac-sha1-96",
     12,
     "bug-compatible HMAC-SHA1-96"