Mercurial > dropbear
changeset 1019:6c42bab6e081
merge
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Fri, 13 Feb 2015 23:15:12 +0800 |
parents | cb148f8d3d22 (current diff) a37f8730eb0f (diff) |
children | 363c0feca5d4 |
files | common-algo.c |
diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/common-algo.c Fri Feb 13 23:13:58 2015 +0800 +++ b/common-algo.c Fri Feb 13 23:15:12 2015 +0800 @@ -183,18 +183,18 @@ }; algo_type sshhashes[] = { +#ifdef DROPBEAR_SHA1_96_HMAC + {"hmac-sha1-96", 0, &dropbear_sha1_96, 1, NULL}, +#endif +#ifdef DROPBEAR_SHA1_HMAC + {"hmac-sha1", 0, &dropbear_sha1, 1, NULL}, +#endif #ifdef DROPBEAR_SHA2_256_HMAC {"hmac-sha2-256", 0, &dropbear_sha2_256, 1, NULL}, #endif #ifdef DROPBEAR_SHA2_512_HMAC {"hmac-sha2-512", 0, &dropbear_sha2_512, 1, NULL}, #endif -#ifdef DROPBEAR_SHA1_96_HMAC - {"hmac-sha1-96", 0, &dropbear_sha1_96, 1, NULL}, -#endif -#ifdef DROPBEAR_SHA1_HMAC - {"hmac-sha1", 0, &dropbear_sha1, 1, NULL}, -#endif #ifdef DROPBEAR_MD5_HMAC {"hmac-md5", 0, (void*)&dropbear_md5, 1, NULL}, #endif