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 /auth-skey.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 'auth-skey.c')
-rw-r--r-- | auth-skey.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/auth-skey.c b/auth-skey.c index f676dbec9..cb43dba48 100644 --- a/auth-skey.c +++ b/auth-skey.c | |||
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: auth-skey.c,v 1.27 2007/01/21 01:41:54 stevesk Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
3 | * | 4 | * |
@@ -21,15 +22,23 @@ | |||
21 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
23 | */ | 24 | */ |
25 | |||
24 | #include "includes.h" | 26 | #include "includes.h" |
25 | RCSID("$OpenBSD: auth-skey.c,v 1.20 2002/06/30 21:59:45 deraadt Exp $"); | ||
26 | 27 | ||
27 | #ifdef SKEY | 28 | #ifdef SKEY |
28 | 29 | ||
30 | #include <sys/types.h> | ||
31 | |||
32 | #include <pwd.h> | ||
33 | #include <stdio.h> | ||
34 | |||
29 | #include <skey.h> | 35 | #include <skey.h> |
30 | 36 | ||
31 | #include "xmalloc.h" | 37 | #include "xmalloc.h" |
38 | #include "key.h" | ||
39 | #include "hostfile.h" | ||
32 | #include "auth.h" | 40 | #include "auth.h" |
41 | #include "ssh-gss.h" | ||
33 | #include "monitor_wrap.h" | 42 | #include "monitor_wrap.h" |
34 | 43 | ||
35 | static void * | 44 | static void * |
@@ -43,26 +52,20 @@ skey_query(void *ctx, char **name, char **infotxt, | |||
43 | u_int* numprompts, char ***prompts, u_int **echo_on) | 52 | u_int* numprompts, char ***prompts, u_int **echo_on) |
44 | { | 53 | { |
45 | Authctxt *authctxt = ctx; | 54 | Authctxt *authctxt = ctx; |
46 | char challenge[1024], *p; | 55 | char challenge[1024]; |
47 | int len; | ||
48 | struct skey skey; | 56 | struct skey skey; |
49 | 57 | ||
50 | if (_compat_skeychallenge(&skey, authctxt->user, challenge, | 58 | if (_compat_skeychallenge(&skey, authctxt->user, challenge, |
51 | sizeof(challenge)) == -1) | 59 | sizeof(challenge)) == -1) |
52 | return -1; | 60 | return -1; |
53 | 61 | ||
54 | *name = xstrdup(""); | 62 | *name = xstrdup(""); |
55 | *infotxt = xstrdup(""); | 63 | *infotxt = xstrdup(""); |
56 | *numprompts = 1; | 64 | *numprompts = 1; |
57 | *prompts = xmalloc(*numprompts * sizeof(char *)); | 65 | *prompts = xcalloc(*numprompts, sizeof(char *)); |
58 | *echo_on = xmalloc(*numprompts * sizeof(u_int)); | 66 | *echo_on = xcalloc(*numprompts, sizeof(u_int)); |
59 | (*echo_on)[0] = 0; | 67 | |
60 | 68 | xasprintf(*prompts, "%s%s", challenge, SKEY_PROMPT); | |
61 | len = strlen(challenge) + strlen(SKEY_PROMPT) + 1; | ||
62 | p = xmalloc(len); | ||
63 | strlcpy(p, challenge, len); | ||
64 | strlcat(p, SKEY_PROMPT, len); | ||
65 | (*prompts)[0] = p; | ||
66 | 69 | ||
67 | return 0; | 70 | return 0; |
68 | } | 71 | } |