upstream commit
backout SSH_RSA_MINIMUM_MODULUS_SIZE increase for this release; problems spotted by sthen@ ok deraadt@ markus@ Upstream-ID: d0bd60dde9e8c3cd7030007680371894c1499822
This commit is contained in:
parent
f097d0ea1e
commit
57e8e229ba
4
ssh.h
4
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>
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||||
|
@ -93,7 +93,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Minimum modulus size (n) for RSA keys. */
|
/* 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 */
|
/* Listen backlog for sshd, ssh-agent and forwarding sockets */
|
||||||
#define SSH_LISTEN_BACKLOG 128
|
#define SSH_LISTEN_BACKLOG 128
|
||||||
|
|
4
sshkey.h
4
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.
|
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
|
||||||
|
@ -46,7 +46,7 @@
|
||||||
# define EC_POINT void
|
# define EC_POINT void
|
||||||
#endif /* WITH_OPENSSL */
|
#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)
|
#define SSH_KEY_MAX_SIGN_DATA_SIZE (1 << 20)
|
||||||
|
|
||||||
struct sshbuf;
|
struct sshbuf;
|
||||||
|
|
Loading…
Reference in New Issue