From 2f959b4cd1d1afcd241d7ffa06a34646c0c89969 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Thu, 11 Jan 2001 06:20:23 +0000 Subject: 20010112 - (bal) OpenBSD Sync - markus@cvs.openbsd.org 2001/01/10 22:56:22 [bufaux.h bufaux.c sftp-server.c sftp.h getput.h] cleanup sftp-server implementation: add buffer_get_int64, buffer_put_int64, GET_64BIT, PUT_64BIT parse SSH2_FILEXFER_ATTR_EXTENDED send SSH2_FX_EOF if readdir returns no more entries reply to SSH2_FXP_EXTENDED message use #defines from the draft move #definations to sftp.h more info: http://www.ietf.org/internet-drafts/draft-ietf-secsh-filexfer-00.txt - markus@cvs.openbsd.org 2001/01/10 19:43:20 [sshd.c] XXX - generate_empheral_server_key() is not safe against races, because it calls log() - markus@cvs.openbsd.org 2001/01/09 21:19:50 [packet.c] allow TCP_NDELAY for ipv6; from netbsd via itojun@ --- sshd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sshd.c') diff --git a/sshd.c b/sshd.c index aa7e016bf..298a1b6bd 100644 --- a/sshd.c +++ b/sshd.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshd.c,v 1.146 2001/01/07 11:28:07 markus Exp $"); +RCSID("$OpenBSD: sshd.c,v 1.147 2001/01/10 19:43:20 deraadt Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -266,8 +266,8 @@ grace_alarm_handler(int sig) * do anything with the private key or random state before forking. * Thus there should be no concurrency control/asynchronous execution * problems. + * XXX calling log() is not safe from races. */ -/* XXX do we really want this work to be done in a signal handler ? -m */ void generate_empheral_server_key(void) { @@ -279,6 +279,7 @@ generate_empheral_server_key(void) arc4random_stir(); log("RSA key generation complete."); } + void key_regeneration_alarm(int sig) { -- cgit v1.2.3