X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=sshsha.c;h=d545cf0c2d944d3b841609796a4f5ac27a85cf22;hb=cb47941b614940b52891a9150afbe3fdba36be81;hp=4bac4fdc528914026fd8e17cec5b5233eab9b9d3;hpb=8f91f075991a82cd3ba6415b5fddf2fe7ed4d8ea;p=PuTTY.git

diff --git a/sshsha.c b/sshsha.c
index 4bac4fdc..d545cf0c 100644
--- a/sshsha.c
+++ b/sshsha.c
@@ -13,7 +13,7 @@
 
 #define rol(x,y) ( ((x) << (y)) | (((uint32)x) >> (32-y)) )
 
-void SHA_Core_Init(uint32 h[5])
+static void SHA_Core_Init(uint32 h[5])
 {
     h[0] = 0x67452301;
     h[1] = 0xefcdab89;
@@ -195,7 +195,7 @@ void SHA_Simple(void *p, int len, unsigned char *output)
 
 static void *sha1_make_context(void)
 {
-    return smalloc(2*sizeof(SHA_State));
+    return snewn(2, SHA_State);
 }
 
 static void sha1_free_context(void *handle)
@@ -286,12 +286,14 @@ const struct ssh_mac ssh_sha1 = {
     sha1_make_context, sha1_free_context, sha1_key,
     sha1_generate, sha1_verify,
     "hmac-sha1",
-    20
+    20,
+    "HMAC-SHA1"
 };
 
 const struct ssh_mac ssh_sha1_buggy = {
     sha1_make_context, sha1_free_context, sha1_key_buggy,
     sha1_generate, sha1_verify,
     "hmac-sha1",
-    20
+    20,
+    "bug-compatible HMAC-SHA1"
 };