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

* src/atoms.in: Deleted diffie-hellman-group2-sha1.

* src/lsh.c (main_argp_parser): Deleted support for
diffie-hellman-group2-sha1.
* src/lshd.c (main_argp_parser): Likewise.

Rev: src/atoms.in:1.37
Rev: src/lsh.c:1.201
Rev: src/lshd.c:1.171
parent 48f2d7dc
......@@ -40,7 +40,6 @@ hmac-md5-96 OPTIONAL first 96 bits of HMAC-MD5 (length = 12)
diffie-hellman-group1-sha1 REQUIRED
diffie-hellman-group14-sha1 (to be REQUIRED?)
diffie-hellman-group2-sha1 (alternative name for the same thing)
# Key and certificate types
......
......@@ -767,7 +767,7 @@ main_argp_parser(int key, char *arg, struct argp_state *state)
{
int i = 0;
self->kex_algorithms
= alloc_int_list(3 * self->with_dh_keyexchange + self->with_srp_keyexchange);
= alloc_int_list(2 * self->with_dh_keyexchange + self->with_srp_keyexchange);
#if WITH_SRP
if (self->with_srp_keyexchange)
......@@ -783,20 +783,12 @@ main_argp_parser(int key, char *arg, struct argp_state *state)
#endif /* WITH_SRP */
if (self->with_dh_keyexchange)
{
struct keyexchange_algorithm *dh2
= make_dh_client(make_dh14(self->super.random));
LIST(self->kex_algorithms)[i++] = ATOM_DIFFIE_HELLMAN_GROUP14_SHA1;
ALIST_SET(self->algorithms->algorithms,
ATOM_DIFFIE_HELLMAN_GROUP14_SHA1,
&dh2->super);
&make_dh_client(make_dh14(self->super.random))
->super);
/* Alternative name for the same thing */
LIST(self->kex_algorithms)[i++] = ATOM_DIFFIE_HELLMAN_GROUP2_SHA1;
ALIST_SET(self->algorithms->algorithms,
ATOM_DIFFIE_HELLMAN_GROUP2_SHA1,
&dh2->super);
LIST(self->kex_algorithms)[i++] = ATOM_DIFFIE_HELLMAN_GROUP1_SHA1;
ALIST_SET(self->algorithms->algorithms,
ATOM_DIFFIE_HELLMAN_GROUP1_SHA1,
......
......@@ -557,23 +557,15 @@ main_argp_parser(int key, char *arg, struct argp_state *state)
{
int i = 0;
self->kex_algorithms
= alloc_int_list(3 * self->with_dh_keyexchange + self->with_srp_keyexchange);
= alloc_int_list(2 * self->with_dh_keyexchange + self->with_srp_keyexchange);
if (self->with_dh_keyexchange)
{
struct keyexchange_algorithm *dh2
= make_dh_server(make_dh14(self->random));
LIST(self->kex_algorithms)[i++] = ATOM_DIFFIE_HELLMAN_GROUP14_SHA1;
ALIST_SET(self->super.algorithms,
ATOM_DIFFIE_HELLMAN_GROUP14_SHA1,
&dh2->super);
/* Alternative name for the same thing */
LIST(self->kex_algorithms)[i++] = ATOM_DIFFIE_HELLMAN_GROUP2_SHA1;
ALIST_SET(self->super.algorithms,
ATOM_DIFFIE_HELLMAN_GROUP2_SHA1,
&dh2->super);
&make_dh_server(make_dh14(self->random))
->super);
LIST(self->kex_algorithms)[i++] = ATOM_DIFFIE_HELLMAN_GROUP1_SHA1;
ALIST_SET(self->super.algorithms,
......
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