Commit fa6ec2ac authored by Niels Möller's avatar Niels Möller
Browse files

* keyexchange.c (make_test_kexinit): Added hmac-md5 to the list of

acepted mac algorithms.

* crypto.c: Added md5 support by Balazs Scheidler.

Rev: src/keyexchange.c:1.32
Rev: src/lsh.c:1.30
Rev: src/lshd.c:1.25
parent c8216798
......@@ -559,7 +559,7 @@ struct make_kexinit *make_test_kexinit(struct randomness *r)
make_int_list(1, ATOM_DIFFIE_HELLMAN_GROUP1_SHA1, -1),
make_int_list(1, ATOM_SSH_DSS, -1),
make_int_list(2, ATOM_ARCFOUR, ATOM_NONE, -1),
make_int_list(1, ATOM_HMAC_SHA1, -1),
make_int_list(2, ATOM_HMAC_SHA1, ATOM_HMAC_MD5 -1),
make_int_list(1, ATOM_NONE, -1),
make_int_list(0, -1));
}
......
......@@ -170,11 +170,12 @@ int main(int argc, char **argv)
/* No randomness is needed for verifying signatures */
lookup = make_fake_host_db(make_dss_algorithm(NULL));
kex = make_dh_client(dh, lookup);
algorithms = make_alist(6,
algorithms = make_alist(7,
ATOM_ARCFOUR, &crypto_rc4_algorithm,
ATOM_BLOWFISH_CBC, crypto_cbc(make_blowfish()),
ATOM_3DES_CBC, crypto_cbc(make_des3()),
ATOM_HMAC_SHA1, make_hmac_algorithm(&sha_algorithm),
ATOM_HMAC_MD5, make_hmac_algorithm(&md5_algorithm),
ATOM_DIFFIE_HELLMAN_GROUP1_SHA1, kex,
ATOM_SSH_DSS, make_dss_algorithm(r), -1);
make_kexinit = make_test_kexinit(r);
......
......@@ -184,11 +184,12 @@ int main(int argc, char **argv)
dh = make_dh1(r);
init_host_key(r); /* Initializes public_key and secret_key */
kex = make_dh_server(dh, public_key, secret_key);
algorithms = make_alist(6,
algorithms = make_alist(7,
ATOM_ARCFOUR, &crypto_rc4_algorithm,
ATOM_BLOWFISH_CBC, crypto_cbc(make_blowfish()),
ATOM_3DES_CBC, crypto_cbc(make_des3()),
ATOM_HMAC_SHA1, make_hmac_algorithm(&sha_algorithm),
ATOM_HMAC_MD5, make_hmac_algorithm(&md5_algorithm),
ATOM_DIFFIE_HELLMAN_GROUP1_SHA1, kex,
ATOM_SSH_DSS, make_dss_algorithm(r), -1);
make_kexinit = make_test_kexinit(r);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment