X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=sshsh256.c;h=4186f3e8180fc54b54fdefa19851200fd17157fe;hb=510f49e405e71ba5c97875e7a019364e1ef5fac9;hp=8e3d4fc15429ae1058f4132645658868d82610d7;hpb=f7713d452d37e9b314af48bb295d418b185989b7;p=PuTTY.git diff --git a/sshsh256.c b/sshsh256.c index 8e3d4fc1..4186f3e8 100644 --- a/sshsh256.c +++ b/sshsh256.c @@ -200,6 +200,24 @@ static void *sha256_init(void) return s; } +static void *sha256_copy(const void *vold) +{ + const SHA256_State *old = (const SHA256_State *)vold; + SHA256_State *s; + + s = snew(SHA256_State); + *s = *old; + return s; +} + +static void sha256_free(void *handle) +{ + SHA256_State *s = handle; + + smemclr(s, sizeof(*s)); + sfree(s); +} + static void sha256_bytes(void *handle, const void *p, int len) { SHA256_State *s = handle; @@ -212,12 +230,12 @@ static void sha256_final(void *handle, unsigned char *output) SHA256_State *s = handle; SHA256_Final(s, output); - smemclr(s, sizeof(*s)); - sfree(s); + sha256_free(s); } const struct ssh_hash ssh_sha256 = { - sha256_init, sha256_bytes, sha256_final, 32, "SHA-256" + sha256_init, sha256_copy, sha256_bytes, sha256_final, sha256_free, + 32, "SHA-256" }; /* ---------------------------------------------------------------------- @@ -327,7 +345,7 @@ const struct ssh_mac ssh_hmac_sha256 = { hmacsha256_start, hmacsha256_bytes, hmacsha256_genresult, hmacsha256_verresult, "hmac-sha2-256", "hmac-sha2-256-etm@openssh.com", - 32, + 32, 32, "HMAC-SHA-256" };