diff options
| -rw-r--r-- | common-algo.c | 2 | ||||
| -rw-r--r-- | common-kex.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/common-algo.c b/common-algo.c index ae2102a..21ac96a 100644 --- a/common-algo.c +++ b/common-algo.c @@ -31,6 +31,8 @@ /* Mappings for ciphers, parameters are {&cipher_desc, keysize, blocksize} */ +/* NOTE: if keysize > 2*SHA1_HASH_SIZE, code such as hashkeys() + needs revisiting */ #ifdef DROPBEAR_AES256_CBC static const struct dropbear_cipher dropbear_aes256 = diff --git a/common-kex.c b/common-kex.c index 5db8e52..5a48758 100644 --- a/common-kex.c +++ b/common-kex.c @@ -217,12 +217,10 @@ static void kexinitialise() { * 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, since that is all that is required - * (for 3DES and SHA, with 24 and 20 bytes respectively). + * The output will only be expanded once, as we are assured that + * outlen <= 2*SHA1_HASH_SIZE for all known hashes. * - * See Section 5.2 of the IETF secsh Transport Draft for details */ - -/* Duplicated verbatim from kex.c --mihnea */ + * 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) { |