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 /bufaux.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 'bufaux.c')
-rw-r--r-- | bufaux.c | 187 |
1 files changed, 15 insertions, 172 deletions
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: bufaux.c,v 1.44 2006/08/03 03:34:41 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 |
@@ -37,176 +38,18 @@ | |||
37 | */ | 38 | */ |
38 | 39 | ||
39 | #include "includes.h" | 40 | #include "includes.h" |
40 | RCSID("$OpenBSD: bufaux.c,v 1.37 2005/11/05 05:01:15 djm Exp $"); | ||
41 | 41 | ||
42 | #include <openssl/bn.h> | 42 | #include <sys/types.h> |
43 | #include "bufaux.h" | ||
44 | #include "xmalloc.h" | ||
45 | #include "getput.h" | ||
46 | #include "log.h" | ||
47 | |||
48 | /* | ||
49 | * Stores an BIGNUM in the buffer with a 2-byte msb first bit count, followed | ||
50 | * by (bits+7)/8 bytes of binary data, msb first. | ||
51 | */ | ||
52 | int | ||
53 | buffer_put_bignum_ret(Buffer *buffer, const BIGNUM *value) | ||
54 | { | ||
55 | int bits = BN_num_bits(value); | ||
56 | int bin_size = (bits + 7) / 8; | ||
57 | u_char *buf = xmalloc(bin_size); | ||
58 | int oi; | ||
59 | char msg[2]; | ||
60 | |||
61 | /* Get the value of in binary */ | ||
62 | oi = BN_bn2bin(value, buf); | ||
63 | if (oi != bin_size) { | ||
64 | error("buffer_put_bignum_ret: BN_bn2bin() failed: oi %d != bin_size %d", | ||
65 | oi, bin_size); | ||
66 | xfree(buf); | ||
67 | return (-1); | ||
68 | } | ||
69 | |||
70 | /* Store the number of bits in the buffer in two bytes, msb first. */ | ||
71 | PUT_16BIT(msg, bits); | ||
72 | buffer_append(buffer, msg, 2); | ||
73 | /* Store the binary data. */ | ||
74 | buffer_append(buffer, (char *)buf, oi); | ||
75 | |||
76 | memset(buf, 0, bin_size); | ||
77 | xfree(buf); | ||
78 | |||
79 | return (0); | ||
80 | } | ||
81 | |||
82 | void | ||
83 | buffer_put_bignum(Buffer *buffer, const BIGNUM *value) | ||
84 | { | ||
85 | if (buffer_put_bignum_ret(buffer, value) == -1) | ||
86 | fatal("buffer_put_bignum: buffer error"); | ||
87 | } | ||
88 | 43 | ||
89 | /* | 44 | #include <openssl/bn.h> |
90 | * Retrieves an BIGNUM from the buffer. | ||
91 | */ | ||
92 | int | ||
93 | buffer_get_bignum_ret(Buffer *buffer, BIGNUM *value) | ||
94 | { | ||
95 | u_int bits, bytes; | ||
96 | u_char buf[2], *bin; | ||
97 | |||
98 | /* Get the number for bits. */ | ||
99 | if (buffer_get_ret(buffer, (char *) buf, 2) == -1) { | ||
100 | error("buffer_get_bignum_ret: invalid length"); | ||
101 | return (-1); | ||
102 | } | ||
103 | bits = GET_16BIT(buf); | ||
104 | /* Compute the number of binary bytes that follow. */ | ||
105 | bytes = (bits + 7) / 8; | ||
106 | if (bytes > 8 * 1024) { | ||
107 | error("buffer_get_bignum_ret: cannot handle BN of size %d", bytes); | ||
108 | return (-1); | ||
109 | } | ||
110 | if (buffer_len(buffer) < bytes) { | ||
111 | error("buffer_get_bignum_ret: input buffer too small"); | ||
112 | return (-1); | ||
113 | } | ||
114 | bin = buffer_ptr(buffer); | ||
115 | BN_bin2bn(bin, bytes, value); | ||
116 | if (buffer_consume_ret(buffer, bytes) == -1) { | ||
117 | error("buffer_get_bignum_ret: buffer_consume failed"); | ||
118 | return (-1); | ||
119 | } | ||
120 | return (0); | ||
121 | } | ||
122 | |||
123 | void | ||
124 | buffer_get_bignum(Buffer *buffer, BIGNUM *value) | ||
125 | { | ||
126 | if (buffer_get_bignum_ret(buffer, value) == -1) | ||
127 | fatal("buffer_get_bignum: buffer error"); | ||
128 | } | ||
129 | |||
130 | /* | ||
131 | * Stores an BIGNUM in the buffer in SSH2 format. | ||
132 | */ | ||
133 | int | ||
134 | buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value) | ||
135 | { | ||
136 | u_int bytes; | ||
137 | u_char *buf; | ||
138 | int oi; | ||
139 | u_int hasnohigh = 0; | ||
140 | |||
141 | if (BN_is_zero(value)) { | ||
142 | buffer_put_int(buffer, 0); | ||
143 | return 0; | ||
144 | } | ||
145 | if (value->neg) { | ||
146 | error("buffer_put_bignum2_ret: negative numbers not supported"); | ||
147 | return (-1); | ||
148 | } | ||
149 | bytes = BN_num_bytes(value) + 1; /* extra padding byte */ | ||
150 | if (bytes < 2) { | ||
151 | error("buffer_put_bignum2_ret: BN too small"); | ||
152 | return (-1); | ||
153 | } | ||
154 | buf = xmalloc(bytes); | ||
155 | buf[0] = 0x00; | ||
156 | /* Get the value of in binary */ | ||
157 | oi = BN_bn2bin(value, buf+1); | ||
158 | if (oi < 0 || (u_int)oi != bytes - 1) { | ||
159 | error("buffer_put_bignum2_ret: BN_bn2bin() failed: " | ||
160 | "oi %d != bin_size %d", oi, bytes); | ||
161 | xfree(buf); | ||
162 | return (-1); | ||
163 | } | ||
164 | hasnohigh = (buf[1] & 0x80) ? 0 : 1; | ||
165 | buffer_put_string(buffer, buf+hasnohigh, bytes-hasnohigh); | ||
166 | memset(buf, 0, bytes); | ||
167 | xfree(buf); | ||
168 | return (0); | ||
169 | } | ||
170 | |||
171 | void | ||
172 | buffer_put_bignum2(Buffer *buffer, const BIGNUM *value) | ||
173 | { | ||
174 | if (buffer_put_bignum2_ret(buffer, value) == -1) | ||
175 | fatal("buffer_put_bignum2: buffer error"); | ||
176 | } | ||
177 | |||
178 | int | ||
179 | buffer_get_bignum2_ret(Buffer *buffer, BIGNUM *value) | ||
180 | { | ||
181 | u_int len; | ||
182 | u_char *bin; | ||
183 | |||
184 | if ((bin = buffer_get_string_ret(buffer, &len)) == NULL) { | ||
185 | error("buffer_get_bignum2_ret: invalid bignum"); | ||
186 | return (-1); | ||
187 | } | ||
188 | 45 | ||
189 | if (len > 0 && (bin[0] & 0x80)) { | 46 | #include <string.h> |
190 | error("buffer_get_bignum2_ret: negative numbers not supported"); | 47 | #include <stdarg.h> |
191 | xfree(bin); | ||
192 | return (-1); | ||
193 | } | ||
194 | if (len > 8 * 1024) { | ||
195 | error("buffer_get_bignum2_ret: cannot handle BN of size %d", len); | ||
196 | xfree(bin); | ||
197 | return (-1); | ||
198 | } | ||
199 | BN_bin2bn(bin, len, value); | ||
200 | xfree(bin); | ||
201 | return (0); | ||
202 | } | ||
203 | 48 | ||
204 | void | 49 | #include "xmalloc.h" |
205 | buffer_get_bignum2(Buffer *buffer, BIGNUM *value) | 50 | #include "buffer.h" |
206 | { | 51 | #include "log.h" |
207 | if (buffer_get_bignum2_ret(buffer, value) == -1) | 52 | #include "misc.h" |
208 | fatal("buffer_get_bignum2: buffer error"); | ||
209 | } | ||
210 | 53 | ||
211 | /* | 54 | /* |
212 | * Returns integers from the buffer (msb first). | 55 | * Returns integers from the buffer (msb first). |
@@ -219,7 +62,7 @@ buffer_get_short_ret(u_short *ret, Buffer *buffer) | |||
219 | 62 | ||
220 | if (buffer_get_ret(buffer, (char *) buf, 2) == -1) | 63 | if (buffer_get_ret(buffer, (char *) buf, 2) == -1) |
221 | return (-1); | 64 | return (-1); |
222 | *ret = GET_16BIT(buf); | 65 | *ret = get_u16(buf); |
223 | return (0); | 66 | return (0); |
224 | } | 67 | } |
225 | 68 | ||
@@ -241,7 +84,7 @@ buffer_get_int_ret(u_int *ret, Buffer *buffer) | |||
241 | 84 | ||
242 | if (buffer_get_ret(buffer, (char *) buf, 4) == -1) | 85 | if (buffer_get_ret(buffer, (char *) buf, 4) == -1) |
243 | return (-1); | 86 | return (-1); |
244 | *ret = GET_32BIT(buf); | 87 | *ret = get_u32(buf); |
245 | return (0); | 88 | return (0); |
246 | } | 89 | } |
247 | 90 | ||
@@ -263,7 +106,7 @@ buffer_get_int64_ret(u_int64_t *ret, Buffer *buffer) | |||
263 | 106 | ||
264 | if (buffer_get_ret(buffer, (char *) buf, 8) == -1) | 107 | if (buffer_get_ret(buffer, (char *) buf, 8) == -1) |
265 | return (-1); | 108 | return (-1); |
266 | *ret = GET_64BIT(buf); | 109 | *ret = get_u64(buf); |
267 | return (0); | 110 | return (0); |
268 | } | 111 | } |
269 | 112 | ||
@@ -286,7 +129,7 @@ buffer_put_short(Buffer *buffer, u_short value) | |||
286 | { | 129 | { |
287 | char buf[2]; | 130 | char buf[2]; |
288 | 131 | ||
289 | PUT_16BIT(buf, value); | 132 | put_u16(buf, value); |
290 | buffer_append(buffer, buf, 2); | 133 | buffer_append(buffer, buf, 2); |
291 | } | 134 | } |
292 | 135 | ||
@@ -295,7 +138,7 @@ buffer_put_int(Buffer *buffer, u_int value) | |||
295 | { | 138 | { |
296 | char buf[4]; | 139 | char buf[4]; |
297 | 140 | ||
298 | PUT_32BIT(buf, value); | 141 | put_u32(buf, value); |
299 | buffer_append(buffer, buf, 4); | 142 | buffer_append(buffer, buf, 4); |
300 | } | 143 | } |
301 | 144 | ||
@@ -304,7 +147,7 @@ buffer_put_int64(Buffer *buffer, u_int64_t value) | |||
304 | { | 147 | { |
305 | char buf[8]; | 148 | char buf[8]; |
306 | 149 | ||
307 | PUT_64BIT(buf, value); | 150 | put_u64(buf, value); |
308 | buffer_append(buffer, buf, 8); | 151 | buffer_append(buffer, buf, 8); |
309 | } | 152 | } |
310 | 153 | ||