summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-05-07 12:03:14 +1000
committerDamien Miller <djm@mindrot.org>2000-05-07 12:03:14 +1000
commite247cc402bc391650f014316363dbce78ad85dc7 (patch)
tree65d72c3d3514c6119f47017f14b71ed153485a5d /sshd.c
parent0437b33e54fd72060d17908d6abf96bfabaacad2 (diff)
- Remove references to SSLeay.
- Big OpenBSD CVS update - markus@cvs.openbsd.org [clientloop.c] - typo [session.c] - update proctitle on pty alloc/dealloc, e.g. w/ windows client [session.c] - update proctitle for proto 1, too [channels.h nchan.c serverloop.c session.c sshd.c] - use c-style comments - deraadt@cvs.openbsd.org [scp.c] - more atomicio - markus@cvs.openbsd.org [channels.c] - set O_NONBLOCK [ssh.1] - update AUTHOR [readconf.c ssh-keygen.c ssh.h] - default DSA key file ~/.ssh/id_dsa [clientloop.c] - typo, rm verbose debug - deraadt@cvs.openbsd.org [ssh-keygen.1] - document DSA use of ssh-keygen [sshd.8] - a start at describing what i understand of the DSA side [ssh-keygen.1] - document -X and -x [ssh-keygen.c] - simplify usage - markus@cvs.openbsd.org [sshd.8] - there is no rhosts_dsa [ssh-keygen.1] - document -y, update -X,-x [nchan.c] - fix close for non-open ssh1 channels [servconf.c servconf.h ssh.h sshd.8 sshd.c ] - s/DsaKey/HostDSAKey/, document option [sshconnect2.c] - respect number_of_password_prompts [channels.c channels.h servconf.c servconf.h session.c sshd.8] - GatewayPorts for sshd, ok deraadt@ [ssh-add.1 ssh-agent.1 ssh.1] - more doc on: DSA, id_dsa, known_hosts2, authorized_keys2 [ssh.1] - more info on proto 2 [sshd.8] - sync AUTHOR w/ ssh.1 [key.c key.h sshconnect.c] - print key type when talking about host keys [packet.c] - clear padding in ssh2 [dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h] - replace broken uuencode w/ libc b64_ntop [auth2.c] - log failure before sending the reply [key.c radix.c uuencode.c] - remote trailing comments before calling __b64_pton [auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1] [sshconnect2.c sshd.8] - add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8 - Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sshd.c b/sshd.c
index 70f292cc7..d1ed1506e 100644
--- a/sshd.c
+++ b/sshd.c
@@ -14,7 +14,7 @@
14 */ 14 */
15 15
16#include "includes.h" 16#include "includes.h"
17RCSID("$OpenBSD: sshd.c,v 1.113 2000/05/01 20:34:51 markus Exp $"); 17RCSID("$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);