diff options
author | Matt Johnston <matt@ucc.asn.au> | 2015-02-13 23:15:12 +0800 |
---|---|---|
committer | Matt Johnston <matt@ucc.asn.au> | 2015-02-13 23:15:12 +0800 |
commit | a0d90c5d7e3435cfa87420aba2a02ef5363467a3 (patch) | |
tree | 9931bee3ea448e0149858a170eabd8800a9f44df | |
parent | 3ad782a99aff7e696557685f37b9bf535c98098e (diff) | |
parent | 2bd89d77d9c7c3a9e5233855c201e19710a84b50 (diff) | |
download | dropbear-a0d90c5d7e3435cfa87420aba2a02ef5363467a3.tar.gz |
merge
-rw-r--r-- | common-algo.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/common-algo.c b/common-algo.c index 6a20282..9a3664b 100644 --- a/common-algo.c +++ b/common-algo.c @@ -183,18 +183,18 @@ algo_type sshciphers[] = { }; algo_type sshhashes[] = { -#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_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_MD5_HMAC {"hmac-md5", 0, (void*)&dropbear_md5, 1, NULL}, #endif |