diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2016-09-28 18:33:06 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-09-28 19:11:32 +0200 |
| commit | 0082fba4efdd492f765ed4c53f0d0fbd3bdbdf7f (patch) | |
| tree | b0271896ec4d6c0e716821954212677438824a05 /servconf.c | |
| parent | upstream commit (diff) | |
| download | openssh-0082fba4efdd492f765ed4c53f0d0fbd3bdbdf7f.tar.xz openssh-0082fba4efdd492f765ed4c53f0d0fbd3bdbdf7f.zip | |
upstream commit
Remove support for pre-authentication compression. Doing
compression early in the protocol probably seemed reasonable in the 1990s,
but today it's clearly a bad idea in terms of both cryptography (cf. multiple
compression oracle attacks in TLS) and attack surface.
Moreover, to support it across privilege-separation zlib needed
the assistance of a complex shared-memory manager that made the
required attack surface considerably larger.
Prompted by Guido Vranken pointing out a compiler-elided security
check in the shared memory manager found by Stack
(http://css.csail.mit.edu/stack/); ok deraadt@ markus@
NB. pre-auth authentication has been disabled by default in sshd
for >10 years.
Upstream-ID: 32af9771788d45a0779693b41d06ec199d849caf
Diffstat (limited to 'servconf.c')
| -rw-r--r-- | servconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servconf.c b/servconf.c index acd903a88..51feb051f 100644 --- a/servconf.c +++ b/servconf.c @@ -1,5 +1,5 @@ -/* $OpenBSD: servconf.c,v 1.295 2016/08/25 23:57:54 djm Exp $ */ +/* $OpenBSD: servconf.c,v 1.296 2016/09/28 16:33:07 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -921,7 +921,7 @@ static const struct multistate multistate_permitrootlogin[] = { }; static const struct multistate multistate_compression[] = { { "delayed", COMP_DELAYED }, - { "yes", COMP_ZLIB }, + { "yes", COMP_DELAYED }, { "no", COMP_NONE }, { NULL, -1 } }; |