diff options
author | Colin Watson <cjwatson@debian.org> | 2007-06-12 16:16:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2007-06-12 16:16:35 +0000 |
commit | b7e40fa9da0b5491534a429dadb321eab5a77558 (patch) | |
tree | bed1da11e9f829925797aa093e379fc0b5868ecd /xmalloc.c | |
parent | 4f84beedf1005e44ff33c854abd6b711ffc0adb7 (diff) | |
parent | 086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff) |
* New upstream release (closes: #395507, #397961, #420035). Important
changes not previously backported to 4.3p2:
- 4.4/4.4p1 (http://www.openssh.org/txt/release-4.4):
+ On portable OpenSSH, fix a GSSAPI authentication abort that could be
used to determine the validity of usernames on some platforms.
+ Implemented conditional configuration in sshd_config(5) using the
"Match" directive. This allows some configuration options to be
selectively overridden if specific criteria (based on user, group,
hostname and/or address) are met. So far a useful subset of
post-authentication options are supported and more are expected to
be added in future releases.
+ Add support for Diffie-Hellman group exchange key agreement with a
final hash of SHA256.
+ Added a "ForceCommand" directive to sshd_config(5). Similar to the
command="..." option accepted in ~/.ssh/authorized_keys, this forces
the execution of the specified command regardless of what the user
requested. This is very useful in conjunction with the new "Match"
option.
+ Add a "PermitOpen" directive to sshd_config(5). This mirrors the
permitopen="..." authorized_keys option, allowing fine-grained
control over the port-forwardings that a user is allowed to
establish.
+ Add optional logging of transactions to sftp-server(8).
+ ssh(1) will now record port numbers for hosts stored in
~/.ssh/known_hosts when a non-standard port has been requested
(closes: #50612).
+ Add an "ExitOnForwardFailure" option to cause ssh(1) to exit (with a
non-zero exit code) when requested port forwardings could not be
established.
+ Extend sshd_config(5) "SubSystem" declarations to allow the
specification of command-line arguments.
+ Replacement of all integer overflow susceptible invocations of
malloc(3) and realloc(3) with overflow-checking equivalents.
+ Many manpage fixes and improvements.
+ Add optional support for OpenSSL hardware accelerators (engines),
enabled using the --with-ssl-engine configure option.
+ Tokens in configuration files may be double-quoted in order to
contain spaces (closes: #319639).
+ Move a debug() call out of a SIGCHLD handler, fixing a hang when the
session exits very quickly (closes: #307890).
+ Fix some incorrect buffer allocation calculations (closes: #410599).
+ ssh-add doesn't ask for a passphrase if key file permissions are too
liberal (closes: #103677).
+ Likewise, ssh doesn't ask either (closes: #99675).
- 4.6/4.6p1 (http://www.openssh.org/txt/release-4.6):
+ sshd now allows the enabling and disabling of authentication methods
on a per user, group, host and network basis via the Match directive
in sshd_config.
+ Fixed an inconsistent check for a terminal when displaying scp
progress meter (closes: #257524).
+ Fix "hang on exit" when background processes are running at the time
of exit on a ttyful/login session (closes: #88337).
* Update to current GSSAPI patch from
http://www.sxw.org.uk/computing/patches/openssh-4.6p1-gsskex-20070312.patch;
install ChangeLog.gssapi.
Diffstat (limited to 'xmalloc.c')
-rw-r--r-- | xmalloc.c | 48 |
1 files changed, 45 insertions, 3 deletions
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: xmalloc.c,v 1.27 2006/08/03 03:34:42 deraadt Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -13,7 +14,12 @@ | |||
13 | */ | 14 | */ |
14 | 15 | ||
15 | #include "includes.h" | 16 | #include "includes.h" |
16 | RCSID("$OpenBSD: xmalloc.c,v 1.16 2001/07/23 18:21:46 stevesk Exp $"); | 17 | |
18 | #include <sys/param.h> | ||
19 | #include <stdarg.h> | ||
20 | #include <stdio.h> | ||
21 | #include <stdlib.h> | ||
22 | #include <string.h> | ||
17 | 23 | ||
18 | #include "xmalloc.h" | 24 | #include "xmalloc.h" |
19 | #include "log.h" | 25 | #include "log.h" |
@@ -32,18 +38,38 @@ xmalloc(size_t size) | |||
32 | } | 38 | } |
33 | 39 | ||
34 | void * | 40 | void * |
35 | xrealloc(void *ptr, size_t new_size) | 41 | xcalloc(size_t nmemb, size_t size) |
42 | { | ||
43 | void *ptr; | ||
44 | |||
45 | if (size == 0 || nmemb == 0) | ||
46 | fatal("xcalloc: zero size"); | ||
47 | if (SIZE_T_MAX / nmemb < size) | ||
48 | fatal("xcalloc: nmemb * size > SIZE_T_MAX"); | ||
49 | ptr = calloc(nmemb, size); | ||
50 | if (ptr == NULL) | ||
51 | fatal("xcalloc: out of memory (allocating %lu bytes)", | ||
52 | (u_long)(size * nmemb)); | ||
53 | return ptr; | ||
54 | } | ||
55 | |||
56 | void * | ||
57 | xrealloc(void *ptr, size_t nmemb, size_t size) | ||
36 | { | 58 | { |
37 | void *new_ptr; | 59 | void *new_ptr; |
60 | size_t new_size = nmemb * size; | ||
38 | 61 | ||
39 | if (new_size == 0) | 62 | if (new_size == 0) |
40 | fatal("xrealloc: zero size"); | 63 | fatal("xrealloc: zero size"); |
64 | if (SIZE_T_MAX / nmemb < size) | ||
65 | fatal("xrealloc: nmemb * size > SIZE_T_MAX"); | ||
41 | if (ptr == NULL) | 66 | if (ptr == NULL) |
42 | new_ptr = malloc(new_size); | 67 | new_ptr = malloc(new_size); |
43 | else | 68 | else |
44 | new_ptr = realloc(ptr, new_size); | 69 | new_ptr = realloc(ptr, new_size); |
45 | if (new_ptr == NULL) | 70 | if (new_ptr == NULL) |
46 | fatal("xrealloc: out of memory (new_size %lu bytes)", (u_long) new_size); | 71 | fatal("xrealloc: out of memory (new_size %lu bytes)", |
72 | (u_long) new_size); | ||
47 | return new_ptr; | 73 | return new_ptr; |
48 | } | 74 | } |
49 | 75 | ||
@@ -66,3 +92,19 @@ xstrdup(const char *str) | |||
66 | strlcpy(cp, str, len); | 92 | strlcpy(cp, str, len); |
67 | return cp; | 93 | return cp; |
68 | } | 94 | } |
95 | |||
96 | int | ||
97 | xasprintf(char **ret, const char *fmt, ...) | ||
98 | { | ||
99 | va_list ap; | ||
100 | int i; | ||
101 | |||
102 | va_start(ap, fmt); | ||
103 | i = vasprintf(ret, fmt, ap); | ||
104 | va_end(ap); | ||
105 | |||
106 | if (i < 0 || *ret == NULL) | ||
107 | fatal("xasprintf: could not allocate memory"); | ||
108 | |||
109 | return (i); | ||
110 | } | ||