summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-08-04 05:23:06 +0000
committerDamien Miller <djm@mindrot.org>2015-08-05 10:08:39 +1000
commit57e8e229bad5fe6056b5f1199665f5f7008192c6 (patch)
treeda9b89884cfaf139dd155ea076533c021f3e9de8
parentf097d0ea1e0889ca0fa2e53a00214e43ab7fa22a (diff)
upstream commit
backout SSH_RSA_MINIMUM_MODULUS_SIZE increase for this release; problems spotted by sthen@ ok deraadt@ markus@ Upstream-ID: d0bd60dde9e8c3cd7030007680371894c1499822
-rw-r--r--ssh.h4
-rw-r--r--sshkey.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/ssh.h b/ssh.h
index 4f8da5c1..39c7e18a 100644
--- 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 f9bb57b5..c8d3cddc 100644
--- 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;