diff options
author | Damien Miller <djm@mindrot.org> | 2016-09-29 03:19:23 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-09-29 03:19:23 +1000 |
commit | 1cfd5c06efb121e58e8b6671548fda77ef4b4455 (patch) | |
tree | 50ef8285aad52b66f5ed6a15b4b1a33ec2a32372 /openbsd-compat | |
parent | 0082fba4efdd492f765ed4c53f0d0fbd3bdbdf7f (diff) |
Remove portability support for mmap
We no longer need to wrap/replace mmap for portability now that
pre-auth compression has been removed from OpenSSH.
Diffstat (limited to 'openbsd-compat')
-rw-r--r-- | openbsd-compat/Makefile.in | 2 | ||||
-rw-r--r-- | openbsd-compat/openbsd-compat.h | 1 | ||||
-rw-r--r-- | openbsd-compat/xmmap.c | 86 |
3 files changed, 1 insertions, 88 deletions
diff --git a/openbsd-compat/Makefile.in b/openbsd-compat/Makefile.in index 7f7368aa3..eedbd9eec 100644 --- a/openbsd-compat/Makefile.in +++ b/openbsd-compat/Makefile.in | |||
@@ -18,7 +18,7 @@ LDFLAGS=-L. @LDFLAGS@ | |||
18 | 18 | ||
19 | OPENBSD=base64.o basename.o bcrypt_pbkdf.o bindresvport.o blowfish.o daemon.o dirname.o fmt_scaled.o getcwd.o getgrouplist.o getopt_long.o getrrsetbyname.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o pwcache.o readpassphrase.o reallocarray.o realpath.o rresvport.o setenv.o setproctitle.o sha1.o sha2.o rmd160.o md5.o sigact.o strlcat.o strlcpy.o strmode.o strnlen.o strptime.o strsep.o strtonum.o strtoll.o strtoul.o strtoull.o timingsafe_bcmp.o vis.o blowfish.o bcrypt_pbkdf.o explicit_bzero.o | 19 | OPENBSD=base64.o basename.o bcrypt_pbkdf.o bindresvport.o blowfish.o daemon.o dirname.o fmt_scaled.o getcwd.o getgrouplist.o getopt_long.o getrrsetbyname.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o pwcache.o readpassphrase.o reallocarray.o realpath.o rresvport.o setenv.o setproctitle.o sha1.o sha2.o rmd160.o md5.o sigact.o strlcat.o strlcpy.o strmode.o strnlen.o strptime.o strsep.o strtonum.o strtoll.o strtoul.o strtoull.o timingsafe_bcmp.o vis.o blowfish.o bcrypt_pbkdf.o explicit_bzero.o |
20 | 20 | ||
21 | COMPAT=arc4random.o bsd-asprintf.o bsd-closefrom.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o getrrsetbyname-ldns.o bsd-err.o bsd-misc.o bsd-nextstep.o bsd-openpty.o bsd-poll.o bsd-setres_id.o bsd-snprintf.o bsd-statvfs.o bsd-waitpid.o fake-rfc2553.o openssl-compat.o xmmap.o xcrypt.o kludge-fd_set.o | 21 | COMPAT=arc4random.o bsd-asprintf.o bsd-closefrom.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o getrrsetbyname-ldns.o bsd-err.o bsd-misc.o bsd-nextstep.o bsd-openpty.o bsd-poll.o bsd-setres_id.o bsd-snprintf.o bsd-statvfs.o bsd-waitpid.o fake-rfc2553.o openssl-compat.o xcrypt.o kludge-fd_set.o |
22 | 22 | ||
23 | PORTS=port-aix.o port-irix.o port-linux.o port-solaris.o port-tun.o port-uw.o | 23 | PORTS=port-aix.o port-irix.o port-linux.o port-solaris.o port-tun.o port-uw.o |
24 | 24 | ||
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index 0de07e9c3..2e56203e1 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h | |||
@@ -297,7 +297,6 @@ int bcrypt_pbkdf(const char *, size_t, const u_int8_t *, size_t, | |||
297 | void explicit_bzero(void *p, size_t n); | 297 | void explicit_bzero(void *p, size_t n); |
298 | #endif | 298 | #endif |
299 | 299 | ||
300 | void *xmmap(size_t size); | ||
301 | char *xcrypt(const char *password, const char *salt); | 300 | char *xcrypt(const char *password, const char *salt); |
302 | char *shadow_pw(struct passwd *pw); | 301 | char *shadow_pw(struct passwd *pw); |
303 | 302 | ||
diff --git a/openbsd-compat/xmmap.c b/openbsd-compat/xmmap.c deleted file mode 100644 index 262a79095..000000000 --- a/openbsd-compat/xmmap.c +++ /dev/null | |||
@@ -1,86 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2002 Tim Rice. All rights reserved. | ||
3 | * MAP_FAILED code by Solar Designer. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions | ||
7 | * are met: | ||
8 | * 1. Redistributions of source code must retain the above copyright | ||
9 | * notice, this list of conditions and the following disclaimer. | ||
10 | * 2. Redistributions in binary form must reproduce the above copyright | ||
11 | * notice, this list of conditions and the following disclaimer in the | ||
12 | * documentation and/or other materials provided with the distribution. | ||
13 | * | ||
14 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
15 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
16 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
17 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
18 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
19 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
20 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
21 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
22 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
24 | */ | ||
25 | |||
26 | #include "includes.h" | ||
27 | |||
28 | #include <sys/types.h> | ||
29 | #ifdef HAVE_SYS_MMAN_H | ||
30 | #include <sys/mman.h> | ||
31 | #endif | ||
32 | #include <sys/stat.h> | ||
33 | |||
34 | #ifdef HAVE_FCNTL_H | ||
35 | # include <fcntl.h> | ||
36 | #endif | ||
37 | #include <errno.h> | ||
38 | #include <stdarg.h> | ||
39 | #include <stdlib.h> | ||
40 | #include <string.h> | ||
41 | #include <unistd.h> | ||
42 | |||
43 | #include "log.h" | ||
44 | |||
45 | void * | ||
46 | xmmap(size_t size) | ||
47 | { | ||
48 | #ifdef HAVE_MMAP | ||
49 | void *address; | ||
50 | |||
51 | # ifdef MAP_ANON | ||
52 | address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_ANON|MAP_SHARED, | ||
53 | -1, (off_t)0); | ||
54 | # else | ||
55 | address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_SHARED, | ||
56 | open("/dev/zero", O_RDWR), (off_t)0); | ||
57 | # endif | ||
58 | |||
59 | #define MM_SWAP_TEMPLATE "/var/run/sshd.mm.XXXXXXXX" | ||
60 | if (address == (void *)MAP_FAILED) { | ||
61 | char tmpname[sizeof(MM_SWAP_TEMPLATE)] = MM_SWAP_TEMPLATE; | ||
62 | int tmpfd; | ||
63 | mode_t old_umask; | ||
64 | |||
65 | old_umask = umask(0177); | ||
66 | tmpfd = mkstemp(tmpname); | ||
67 | umask(old_umask); | ||
68 | if (tmpfd == -1) | ||
69 | fatal("mkstemp(\"%s\"): %s", | ||
70 | MM_SWAP_TEMPLATE, strerror(errno)); | ||
71 | unlink(tmpname); | ||
72 | if (ftruncate(tmpfd, size) != 0) | ||
73 | fatal("%s: ftruncate: %s", __func__, strerror(errno)); | ||
74 | address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_SHARED, | ||
75 | tmpfd, (off_t)0); | ||
76 | close(tmpfd); | ||
77 | } | ||
78 | |||
79 | return (address); | ||
80 | #else | ||
81 | fatal("%s: UsePrivilegeSeparation=yes and Compression=yes not supported", | ||
82 | __func__); | ||
83 | #endif /* HAVE_MMAP */ | ||
84 | |||
85 | } | ||
86 | |||