Mercurial > dropbear
diff common-kex.c @ 679:03073a27abb3 sha2
- Add hmac-sha2-256 and hmac-sha2-512. Needs debugging, seems to be
getting keyed incorrectly
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Thu, 10 May 2012 08:38:37 +0800 |
parents | 4222a1039b06 |
children | a4b7627b3157 |
line wrap: on
line diff
--- a/common-kex.c Wed May 09 22:52:58 2012 +0800 +++ b/common-kex.c Thu May 10 08:38:37 2012 +0800 @@ -248,26 +248,28 @@ * already initialised hash_state hs, which should already have processed * the dh_K and hash, since these are common. X is the letter 'A', 'B' etc. * out must have at least min(SHA1_HASH_SIZE, outlen) bytes allocated. - * The output will only be expanded once, as we are assured that - * outlen <= 2*SHA1_HASH_SIZE for all known hashes. * * See Section 7.2 of rfc4253 (ssh transport) for details */ static void hashkeys(unsigned char *out, int outlen, const hash_state * hs, const unsigned char X) { hash_state hs2; - unsigned char k2[SHA1_HASH_SIZE]; /* used to extending */ + int offset; memcpy(&hs2, hs, sizeof(hash_state)); sha1_process(&hs2, &X, 1); sha1_process(&hs2, ses.session_id, SHA1_HASH_SIZE); sha1_done(&hs2, out); - if (SHA1_HASH_SIZE < outlen) { + for (offset = SHA1_HASH_SIZE; + offset < outlen; + offset += SHA1_HASH_SIZE) + { /* need to extend */ + unsigned char k2[SHA1_HASH_SIZE]; memcpy(&hs2, hs, sizeof(hash_state)); - sha1_process(&hs2, out, SHA1_HASH_SIZE); + sha1_process(&hs2, out, offset); sha1_done(&hs2, k2); - memcpy(&out[SHA1_HASH_SIZE], k2, outlen - SHA1_HASH_SIZE); + memcpy(&out[offset], k2, MIN(outlen - offset, SHA1_HASH_SIZE)); } }