diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-09-28 16:33:06 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-09-29 03:11:32 +1000 |
commit | 0082fba4efdd492f765ed4c53f0d0fbd3bdbdf7f (patch) | |
tree | b0271896ec4d6c0e716821954212677438824a05 /monitor_wrap.h | |
parent | 27c3a9c2aede2184856b5de1e6eca414bb751c38 (diff) |
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 'monitor_wrap.h')
-rw-r--r-- | monitor_wrap.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h index 1bc76afff..db5902f55 100644 --- a/monitor_wrap.h +++ b/monitor_wrap.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.h,v 1.31 2016/08/13 17:47:41 markus Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.h,v 1.32 2016/09/28 16:33:07 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
@@ -95,7 +95,4 @@ int mm_bsdauth_respond(void *, u_int, char **); | |||
95 | int mm_skey_query(void *, char **, char **, u_int *, char ***, u_int **); | 95 | int mm_skey_query(void *, char **, char **, u_int *, char ***, u_int **); |
96 | int mm_skey_respond(void *, u_int, char **); | 96 | int mm_skey_respond(void *, u_int, char **); |
97 | 97 | ||
98 | /* zlib allocation hooks */ | ||
99 | void mm_init_compression(struct mm_master *); | ||
100 | |||
101 | #endif /* _MM_WRAP_H_ */ | 98 | #endif /* _MM_WRAP_H_ */ |