upstream commit

backout SSH_RSA_MINIMUM_MODULUS_SIZE increase for this
 release; problems spotted by sthen@ ok deraadt@ markus@

Upstream-ID: d0bd60dde9e8c3cd7030007680371894c1499822

diff --git a/ssh.h b/ssh.h
index 4f8da5c1b9225785de9d978195c090c88640ca29..39c7e18af10f43723cb3d40267adc05b948db88b 100644 (file)
--- a/ssh.h
+++ b/ssh.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.h,v 1.80 2015/07/03 03:49:45 djm Exp $ */
+/* $OpenBSD: ssh.h,v 1.81 2015/08/04 05:23:06 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -93,7 +93,7 @@
 #endif
 
 /* Minimum modulus size (n) for RSA keys. */
-#define SSH_RSA_MINIMUM_MODULUS_SIZE   1024
+#define SSH_RSA_MINIMUM_MODULUS_SIZE   768
 
 /* Listen backlog for sshd, ssh-agent and forwarding sockets */
 #define SSH_LISTEN_BACKLOG             128

diff --git a/sshkey.h b/sshkey.h
index f9bb57b59f266fb097645c1c891c5496f0e2384c..c8d3cddca59552100e8efdaa4af01dabe951c24b 100644 (file)
--- a/sshkey.h
+++ b/sshkey.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.h,v 1.8 2015/07/03 04:05:54 djm Exp $ */
+/* $OpenBSD: sshkey.h,v 1.9 2015/08/04 05:23:06 djm Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -46,7 +46,7 @@
 # define EC_POINT      void
 #endif /* WITH_OPENSSL */
 
-#define SSH_RSA_MINIMUM_MODULUS_SIZE   1024
+#define SSH_RSA_MINIMUM_MODULUS_SIZE   768
 #define SSH_KEY_MAX_SIGN_DATA_SIZE     (1 << 20)
 
 struct sshbuf;