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 /auth2-chall.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 'auth2-chall.c')
-rw-r--r-- | auth2-chall.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/auth2-chall.c b/auth2-chall.c index b147cadf3..51059c2bd 100644 --- a/auth2-chall.c +++ b/auth2-chall.c | |||
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-chall.c,v 1.32 2007/01/03 03:01:40 stevesk Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
3 | * Copyright (c) 2001 Per Allansson. All rights reserved. | 4 | * Copyright (c) 2001 Per Allansson. All rights reserved. |
@@ -22,14 +23,22 @@ | |||
22 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 23 | * (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 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 | */ | 25 | */ |
26 | |||
25 | #include "includes.h" | 27 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2-chall.c,v 1.24 2005/07/17 07:17:54 djm Exp $"); | ||
27 | 28 | ||
29 | #include <sys/types.h> | ||
30 | |||
31 | #include <stdarg.h> | ||
32 | #include <stdio.h> | ||
33 | #include <string.h> | ||
34 | |||
35 | #include "xmalloc.h" | ||
28 | #include "ssh2.h" | 36 | #include "ssh2.h" |
37 | #include "key.h" | ||
38 | #include "hostfile.h" | ||
29 | #include "auth.h" | 39 | #include "auth.h" |
30 | #include "buffer.h" | 40 | #include "buffer.h" |
31 | #include "packet.h" | 41 | #include "packet.h" |
32 | #include "xmalloc.h" | ||
33 | #include "dispatch.h" | 42 | #include "dispatch.h" |
34 | #include "log.h" | 43 | #include "log.h" |
35 | #include "servconf.h" | 44 | #include "servconf.h" |
@@ -197,7 +206,7 @@ auth2_challenge_stop(Authctxt *authctxt) | |||
197 | { | 206 | { |
198 | /* unregister callback */ | 207 | /* unregister callback */ |
199 | dispatch_set(SSH2_MSG_USERAUTH_INFO_RESPONSE, NULL); | 208 | dispatch_set(SSH2_MSG_USERAUTH_INFO_RESPONSE, NULL); |
200 | if (authctxt->kbdintctxt != NULL) { | 209 | if (authctxt->kbdintctxt != NULL) { |
201 | kbdint_free(authctxt->kbdintctxt); | 210 | kbdint_free(authctxt->kbdintctxt); |
202 | authctxt->kbdintctxt = NULL; | 211 | authctxt->kbdintctxt = NULL; |
203 | } | 212 | } |
@@ -291,7 +300,7 @@ input_userauth_info_response(int type, u_int32_t seq, void *ctxt) | |||
291 | if (nresp > 100) | 300 | if (nresp > 100) |
292 | fatal("input_userauth_info_response: too many replies"); | 301 | fatal("input_userauth_info_response: too many replies"); |
293 | if (nresp > 0) { | 302 | if (nresp > 0) { |
294 | response = xmalloc(nresp * sizeof(char *)); | 303 | response = xcalloc(nresp, sizeof(char *)); |
295 | for (i = 0; i < nresp; i++) | 304 | for (i = 0; i < nresp; i++) |
296 | response[i] = packet_get_string(NULL); | 305 | response[i] = packet_get_string(NULL); |
297 | } | 306 | } |