From da0c6fe9f2c607238f38430dabdbdaf4502171bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Fri, 13 Jul 2012 08:41:38 +0200
Subject: [PATCH] Configure lsh-transport key exchange algorithms via
algorithm_options.
---
ChangeLog | 5 +++++
src/lsh-transport.c | 7 +------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5aac6554e..8ddb8162c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-13 Niels Möller <nisse@lysator.liu.se>
+
+ * src/lsh-transport.c (main_argp_parser): Configure key exchange
+ algorithms via algorithm_options.
+
2012-07-12 Niels Möller <nisse@lysator.liu.se>
* src/algorithms.h (class algorithms_options): New attribute
diff --git a/src/lsh-transport.c b/src/lsh-transport.c
index 0c1ed22c7..6f60bf79b 100644
--- a/src/lsh-transport.c
+++ b/src/lsh-transport.c
@@ -105,8 +105,6 @@ make_lsh_transport_lookup_verifier(struct lsh_transport_config *config);
(algorithms object algorithms_options)
(werror_config object werror_config)
- (kex_algorithms object int_list)
-
(sloppy . int)
(capture_file . "const char *")
(capture_fd . int)
@@ -157,9 +155,6 @@ make_lsh_transport_config(void)
ALIST_SET(self->super.algorithms, ATOM_DIFFIE_HELLMAN_GROUP1_SHA1,
&make_client_dh_exchange(make_dh_group1(&nettle_sha1),
&self->host_db->super)->super);
- self->kex_algorithms =
- make_int_list(2, ATOM_DIFFIE_HELLMAN_GROUP14_SHA1,
- ATOM_DIFFIE_HELLMAN_GROUP1_SHA1, -1);
self->sloppy = 0;
self->capture_file = NULL;
@@ -1282,7 +1277,7 @@ main_argp_parser(int key, char *arg, struct argp_state *state)
argp_failure(state, EXIT_FAILURE, errno, "Failed to open log file");
self->super.kexinit
- = make_kexinit_info(self->kex_algorithms,
+ = make_kexinit_info(self->algorithms->kex_algorithms,
self->algorithms->hostkey_algorithms,
self->algorithms->crypto_algorithms,
self->algorithms->mac_algorithms,
--
GitLab