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_mm.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_mm.h')
-rw-r--r-- | monitor_mm.h | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/monitor_mm.h b/monitor_mm.h deleted file mode 100644 index f1fae7e3b..000000000 --- a/monitor_mm.h +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | /* $OpenBSD: monitor_mm.h,v 1.6 2014/01/04 17:50:55 tedu Exp $ */ | ||
2 | |||
3 | /* | ||
4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | ||
5 | * All rights reserved. | ||
6 | * | ||
7 | * Redistribution and use in source and binary forms, with or without | ||
8 | * modification, are permitted provided that the following conditions | ||
9 | * are met: | ||
10 | * 1. Redistributions of source code must retain the above copyright | ||
11 | * notice, this list of conditions and the following disclaimer. | ||
12 | * 2. Redistributions in binary form must reproduce the above copyright | ||
13 | * notice, this list of conditions and the following disclaimer in the | ||
14 | * documentation and/or other materials provided with the distribution. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
17 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
18 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
19 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
20 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
21 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
22 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
23 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
25 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | #ifndef _MM_H_ | ||
29 | #define _MM_H_ | ||
30 | |||
31 | struct mm_share { | ||
32 | RB_ENTRY(mm_share) next; | ||
33 | void *address; | ||
34 | size_t size; | ||
35 | }; | ||
36 | |||
37 | struct mm_master { | ||
38 | RB_HEAD(mmtree, mm_share) rb_free; | ||
39 | struct mmtree rb_allocated; | ||
40 | void *address; | ||
41 | size_t size; | ||
42 | |||
43 | struct mm_master *mmalloc; /* Used to completely share */ | ||
44 | }; | ||
45 | |||
46 | RB_PROTOTYPE(mmtree, mm_share, next, mm_compare) | ||
47 | |||
48 | #define MM_MINSIZE 128 | ||
49 | |||
50 | #define MM_ADDRESS_END(x) (void *)((char *)(x)->address + (x)->size) | ||
51 | |||
52 | struct mm_master *mm_create(struct mm_master *, size_t); | ||
53 | void mm_destroy(struct mm_master *); | ||
54 | |||
55 | void mm_share_sync(struct mm_master **, struct mm_master **); | ||
56 | |||
57 | void *mm_malloc(struct mm_master *, size_t); | ||
58 | void *mm_xmalloc(struct mm_master *, size_t); | ||
59 | void mm_free(struct mm_master *, void *); | ||
60 | |||
61 | void mm_memvalid(struct mm_master *, void *, size_t); | ||
62 | #endif /* _MM_H_ */ | ||