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 /kex.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 'kex.h')
-rw-r--r-- | kex.h | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.h,v 1.38 2005/11/04 05:15:59 djm Exp $ */ | 1 | /* $OpenBSD: kex.h,v 1.44 2006/08/03 03:34:42 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
@@ -26,14 +26,13 @@ | |||
26 | #ifndef KEX_H | 26 | #ifndef KEX_H |
27 | #define KEX_H | 27 | #define KEX_H |
28 | 28 | ||
29 | #include <signal.h> | ||
29 | #include <openssl/evp.h> | 30 | #include <openssl/evp.h> |
30 | #include "buffer.h" | ||
31 | #include "cipher.h" | ||
32 | #include "key.h" | ||
33 | 31 | ||
34 | #define KEX_DH1 "diffie-hellman-group1-sha1" | 32 | #define KEX_DH1 "diffie-hellman-group1-sha1" |
35 | #define KEX_DH14 "diffie-hellman-group14-sha1" | 33 | #define KEX_DH14 "diffie-hellman-group14-sha1" |
36 | #define KEX_DHGEX_SHA1 "diffie-hellman-group-exchange-sha1" | 34 | #define KEX_DHGEX_SHA1 "diffie-hellman-group-exchange-sha1" |
35 | #define KEX_DHGEX_SHA256 "diffie-hellman-group-exchange-sha256" | ||
37 | 36 | ||
38 | #define COMP_NONE 0 | 37 | #define COMP_NONE 0 |
39 | #define COMP_ZLIB 1 | 38 | #define COMP_ZLIB 1 |
@@ -63,7 +62,9 @@ enum kex_exchange { | |||
63 | KEX_DH_GRP1_SHA1, | 62 | KEX_DH_GRP1_SHA1, |
64 | KEX_DH_GRP14_SHA1, | 63 | KEX_DH_GRP14_SHA1, |
65 | KEX_DH_GEX_SHA1, | 64 | KEX_DH_GEX_SHA1, |
65 | KEX_DH_GEX_SHA256, | ||
66 | KEX_GSS_GRP1_SHA1, | 66 | KEX_GSS_GRP1_SHA1, |
67 | KEX_GSS_GRP14_SHA1, | ||
67 | KEX_GSS_GEX_SHA1, | 68 | KEX_GSS_GEX_SHA1, |
68 | KEX_MAX | 69 | KEX_MAX |
69 | }; | 70 | }; |
@@ -114,7 +115,7 @@ struct Kex { | |||
114 | int kex_type; | 115 | int kex_type; |
115 | Buffer my; | 116 | Buffer my; |
116 | Buffer peer; | 117 | Buffer peer; |
117 | int done; | 118 | sig_atomic_t done; |
118 | int flags; | 119 | int flags; |
119 | const EVP_MD *evp_md; | 120 | const EVP_MD *evp_md; |
120 | #ifdef GSSAPI | 121 | #ifdef GSSAPI |
@@ -154,7 +155,7 @@ kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int, | |||
154 | BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *); | 155 | BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *); |
155 | void | 156 | void |
156 | kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *, | 157 | kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *, |
157 | int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, | 158 | int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, |
158 | BIGNUM *, BIGNUM *, u_char **, u_int *); | 159 | BIGNUM *, BIGNUM *, u_char **, u_int *); |
159 | 160 | ||
160 | void | 161 | void |