2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index cb64d640e..45f758529 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -104,6 +104,10 @@
      fix potential divide-by-zero in sftp's "df" output when talking to a server
      that reports zero files on the filesystem (Unix filesystems always have at
      least the root inode).  From Steve McClellan at radisys, ok djm@
+   - markus@cvs.openbsd.org 2009/12/11 18:16:33
+     [key.c]
+     switch from 35 to the more common value of RSA_F4 == (2**16)+1 == 65537
+     for the RSA public exponent; discussed with provos; ok djm@
 
 20091226
  - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1
diff --git a/key.c b/key.c
index 3e17da601..f2edf6d5d 100644
--- a/key.c
+++ b/key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.c,v 1.80 2008/10/10 05:00:12 stevesk Exp $ */
+/* $OpenBSD: key.c,v 1.81 2009/12/11 18:16:33 markus Exp $ */
 /*
  * read_bignum():
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -685,7 +685,7 @@ rsa_generate_private_key(u_int bits)
 {
         RSA *private;
 
-        private = RSA_generate_key(bits, 35, NULL, NULL);
+        private = RSA_generate_key(bits, RSA_F4, NULL, NULL);
         if (private == NULL)
                 fatal("rsa_generate_private_key: key generation failed.");
         return private;