New function ltime() returns a struct tm of the current local time.

[sgt/putty] / sshsha.c

diff --git a/sshsha.c b/sshsha.c
index d8fc569..d545cf0 100644 (file)
--- a/sshsha.c
+++ b/sshsha.c
@@ -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"
 };