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 /buffer.h | |
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 'buffer.h')
-rw-r--r-- | buffer.h | 43 |
1 files changed, 39 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: buffer.h,v 1.13 2005/03/14 11:46:56 markus Exp $ */ | 1 | /* $OpenBSD: buffer.h,v 1.16 2006/08/03 03:34:41 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -23,9 +23,6 @@ typedef struct { | |||
23 | u_int end; /* Offset of last byte containing data. */ | 23 | u_int end; /* Offset of last byte containing data. */ |
24 | } Buffer; | 24 | } Buffer; |
25 | 25 | ||
26 | #define BUFFER_MAX_CHUNK 0x100000 | ||
27 | #define BUFFER_MAX_LEN 0xa00000 | ||
28 | |||
29 | void buffer_init(Buffer *); | 26 | void buffer_init(Buffer *); |
30 | void buffer_clear(Buffer *); | 27 | void buffer_clear(Buffer *); |
31 | void buffer_free(Buffer *); | 28 | void buffer_free(Buffer *); |
@@ -36,6 +33,8 @@ void *buffer_ptr(Buffer *); | |||
36 | void buffer_append(Buffer *, const void *, u_int); | 33 | void buffer_append(Buffer *, const void *, u_int); |
37 | void *buffer_append_space(Buffer *, u_int); | 34 | void *buffer_append_space(Buffer *, u_int); |
38 | 35 | ||
36 | int buffer_check_alloc(Buffer *, u_int); | ||
37 | |||
39 | void buffer_get(Buffer *, void *, u_int); | 38 | void buffer_get(Buffer *, void *, u_int); |
40 | 39 | ||
41 | void buffer_consume(Buffer *, u_int); | 40 | void buffer_consume(Buffer *, u_int); |
@@ -47,4 +46,40 @@ int buffer_get_ret(Buffer *, void *, u_int); | |||
47 | int buffer_consume_ret(Buffer *, u_int); | 46 | int buffer_consume_ret(Buffer *, u_int); |
48 | int buffer_consume_end_ret(Buffer *, u_int); | 47 | int buffer_consume_end_ret(Buffer *, u_int); |
49 | 48 | ||
49 | #include <openssl/bn.h> | ||
50 | |||
51 | void buffer_put_bignum(Buffer *, const BIGNUM *); | ||
52 | void buffer_put_bignum2(Buffer *, const BIGNUM *); | ||
53 | void buffer_get_bignum(Buffer *, BIGNUM *); | ||
54 | void buffer_get_bignum2(Buffer *, BIGNUM *); | ||
55 | |||
56 | u_short buffer_get_short(Buffer *); | ||
57 | void buffer_put_short(Buffer *, u_short); | ||
58 | |||
59 | u_int buffer_get_int(Buffer *); | ||
60 | void buffer_put_int(Buffer *, u_int); | ||
61 | |||
62 | u_int64_t buffer_get_int64(Buffer *); | ||
63 | void buffer_put_int64(Buffer *, u_int64_t); | ||
64 | |||
65 | int buffer_get_char(Buffer *); | ||
66 | void buffer_put_char(Buffer *, int); | ||
67 | |||
68 | void *buffer_get_string(Buffer *, u_int *); | ||
69 | void buffer_put_string(Buffer *, const void *, u_int); | ||
70 | void buffer_put_cstring(Buffer *, const char *); | ||
71 | |||
72 | #define buffer_skip_string(b) \ | ||
73 | do { u_int l = buffer_get_int(b); buffer_consume(b, l); } while (0) | ||
74 | |||
75 | int buffer_put_bignum_ret(Buffer *, const BIGNUM *); | ||
76 | int buffer_get_bignum_ret(Buffer *, BIGNUM *); | ||
77 | int buffer_put_bignum2_ret(Buffer *, const BIGNUM *); | ||
78 | int buffer_get_bignum2_ret(Buffer *, BIGNUM *); | ||
79 | int buffer_get_short_ret(u_short *, Buffer *); | ||
80 | int buffer_get_int_ret(u_int *, Buffer *); | ||
81 | int buffer_get_int64_ret(u_int64_t *, Buffer *); | ||
82 | void *buffer_get_string_ret(Buffer *, u_int *); | ||
83 | int buffer_get_char_ret(char *, Buffer *); | ||
84 | |||
50 | #endif /* BUFFER_H */ | 85 | #endif /* BUFFER_H */ |