diff options
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/readconf.c b/readconf.c index c69e10dda..9c5638b07 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$Id: readconf.c,v 1.13 2000/05/07 02:03:17 damien Exp $"); | 17 | RCSID("$Id: readconf.c,v 1.14 2000/05/09 01:03:01 damien Exp $"); |
18 | 18 | ||
19 | #include "ssh.h" | 19 | #include "ssh.h" |
20 | #include "cipher.h" | 20 | #include "cipher.h" |
@@ -475,7 +475,7 @@ parse_int: | |||
475 | case oCiphers: | 475 | case oCiphers: |
476 | cp = strtok(NULL, WHITESPACE); | 476 | cp = strtok(NULL, WHITESPACE); |
477 | if (!ciphers_valid(cp)) | 477 | if (!ciphers_valid(cp)) |
478 | fatal("%.200s line %d: Bad cipher spec '%s'.", | 478 | fatal("%.200s line %d: Bad SSH2 cipher spec '%s'.", |
479 | filename, linenum, cp ? cp : "<NONE>"); | 479 | filename, linenum, cp ? cp : "<NONE>"); |
480 | if (*activep && options->ciphers == NULL) | 480 | if (*activep && options->ciphers == NULL) |
481 | options->ciphers = xstrdup(cp); | 481 | options->ciphers = xstrdup(cp); |
@@ -745,6 +745,7 @@ fill_default_options(Options * options) | |||
745 | /* Selected in ssh_login(). */ | 745 | /* Selected in ssh_login(). */ |
746 | if (options->cipher == -1) | 746 | if (options->cipher == -1) |
747 | options->cipher = SSH_CIPHER_NOT_SET; | 747 | options->cipher = SSH_CIPHER_NOT_SET; |
748 | /* options->ciphers, default set in myproposals.h */ | ||
748 | if (options->protocol == SSH_PROTO_UNKNOWN) | 749 | if (options->protocol == SSH_PROTO_UNKNOWN) |
749 | options->protocol = SSH_PROTO_1|SSH_PROTO_2|SSH_PROTO_1_PREFERRED; | 750 | options->protocol = SSH_PROTO_1|SSH_PROTO_2|SSH_PROTO_1_PREFERRED; |
750 | if (options->num_identity_files == 0) { | 751 | if (options->num_identity_files == 0) { |