summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshd.c11
2 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index b3a259a70..b3ed25257 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
19 - markus@cvs.openbsd.org 2001/03/29 21:17:40 19 - markus@cvs.openbsd.org 2001/03/29 21:17:40
20 [dh.c dh.h kex.c kex.h] 20 [dh.c dh.h kex.c kex.h]
21 prepare for rekeying: move DH code to dh.c 21 prepare for rekeying: move DH code to dh.c
22 - djm@cvs.openbsd.org 2001/03/29 23:42:01
23 [sshd.c]
24 Protocol 1 key regeneration log => verbose, some KNF; ok markus@
22 25
2320010329 2620010329
24 - OpenBSD CVS Sync 27 - OpenBSD CVS Sync
@@ -4789,4 +4792,4 @@
4789 - Wrote replacements for strlcpy and mkdtemp 4792 - Wrote replacements for strlcpy and mkdtemp
4790 - Released 1.0pre1 4793 - Released 1.0pre1
4791 4794
4792$Id: ChangeLog,v 1.1041 2001/03/30 00:50:10 djm Exp $ 4795$Id: ChangeLog,v 1.1042 2001/03/30 00:50:32 djm Exp $
diff --git a/sshd.c b/sshd.c
index d35403f20..b5e2d0f6f 100644
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: sshd.c,v 1.184 2001/03/29 21:06:21 stevesk Exp $"); 43RCSID("$OpenBSD: sshd.c,v 1.185 2001/03/29 23:42:01 djm Exp $");
44 44
45#include <openssl/dh.h> 45#include <openssl/dh.h>
46#include <openssl/bn.h> 46#include <openssl/bn.h>
@@ -278,12 +278,13 @@ generate_ephemeral_server_key(void)
278 u_int32_t rand = 0; 278 u_int32_t rand = 0;
279 int i; 279 int i;
280 280
281 log("Generating %s%d bit RSA key.", sensitive_data.server_key ? "new " : "", 281 verbose("Generating %s%d bit RSA key.",
282 options.server_key_bits); 282 sensitive_data.server_key ? "new " : "", options.server_key_bits);
283 if (sensitive_data.server_key != NULL) 283 if (sensitive_data.server_key != NULL)
284 key_free(sensitive_data.server_key); 284 key_free(sensitive_data.server_key);
285 sensitive_data.server_key = key_generate(KEY_RSA1, options.server_key_bits); 285 sensitive_data.server_key = key_generate(KEY_RSA1,
286 log("RSA key generation complete."); 286 options.server_key_bits);
287 verbose("RSA key generation complete.");
287 288
288 for (i = 0; i < SSH_SESSION_KEY_LENGTH; i++) { 289 for (i = 0; i < SSH_SESSION_KEY_LENGTH; i++) {
289 if (i % 4 == 0) 290 if (i % 4 == 0)