diff options
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$OpenBSD: sshd.c,v 1.113 2000/05/01 20:34:51 markus Exp $"); | 17 | RCSID("$OpenBSD: sshd.c,v 1.115 2000/05/03 10:21:49 markus Exp $"); |
18 | 18 | ||
19 | #include "xmalloc.h" | 19 | #include "xmalloc.h" |
20 | #include "rsa.h" | 20 | #include "rsa.h" |
@@ -562,8 +562,9 @@ main(int ac, char **av) | |||
562 | } | 562 | } |
563 | if (options.protocol & SSH_PROTO_2) { | 563 | if (options.protocol & SSH_PROTO_2) { |
564 | sensitive_data.dsa_host_key = key_new(KEY_DSA); | 564 | sensitive_data.dsa_host_key = key_new(KEY_DSA); |
565 | if (!load_private_key(options.dsa_key_file, "", sensitive_data.dsa_host_key, NULL)) { | 565 | if (!load_private_key(options.host_dsa_key_file, "", sensitive_data.dsa_host_key, NULL)) { |
566 | error("Could not load DSA host key: %.200s", options.dsa_key_file); | 566 | |
567 | error("Could not load DSA host key: %.200s", options.host_dsa_key_file); | ||
567 | log("Disabling protocol version 2"); | 568 | log("Disabling protocol version 2"); |
568 | options.protocol &= ~SSH_PROTO_2; | 569 | options.protocol &= ~SSH_PROTO_2; |
569 | } | 570 | } |
@@ -1320,7 +1321,7 @@ do_ssh2_kex() | |||
1320 | /* send server hostkey, DH pubkey 'f' and singed H */ | 1321 | /* send server hostkey, DH pubkey 'f' and singed H */ |
1321 | packet_start(SSH2_MSG_KEXDH_REPLY); | 1322 | packet_start(SSH2_MSG_KEXDH_REPLY); |
1322 | packet_put_string((char *)server_host_key_blob, sbloblen); | 1323 | packet_put_string((char *)server_host_key_blob, sbloblen); |
1323 | packet_put_bignum2(dh->pub_key); // f | 1324 | packet_put_bignum2(dh->pub_key); /* f */ |
1324 | packet_put_string((char *)signature, slen); | 1325 | packet_put_string((char *)signature, slen); |
1325 | packet_send(); | 1326 | packet_send(); |
1326 | xfree(signature); | 1327 | xfree(signature); |