summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2001-01-10 19:43:21 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2001-01-10 19:43:21 +0000
commit83ed0c1e65a43f3b626d608f167fd60a4657150d (patch)
treec46d8c4c4beb8ca8f9272b6590cebb4995758d9a /usr.bin
parent50bdf8a0b3e18a1f8e4ae0362f41d8de488b60e9 (diff)
XXX -- generate_empheral_server_key() is not safe against races, because it calls log()
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/sshd.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 4c8ff6a1b5d..17d79089d1a 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/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"
@@ -257,8 +257,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)
{
@@ -270,6 +270,7 @@ generate_empheral_server_key(void)
arc4random_stir();
log("RSA key generation complete.");
}
+
void
key_regeneration_alarm(int sig)
{