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 /auth1.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 'auth1.c')
-rw-r--r-- | auth1.c | 22 |
1 files changed, 20 insertions, 2 deletions
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: auth1.c,v 1.70 2006/08/03 03:34:41 deraadt Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
3 | * All rights reserved | 4 | * All rights reserved |
@@ -10,7 +11,14 @@ | |||
10 | */ | 11 | */ |
11 | 12 | ||
12 | #include "includes.h" | 13 | #include "includes.h" |
13 | RCSID("$OpenBSD: auth1.c,v 1.62 2005/07/16 01:35:24 djm Exp $"); | 14 | |
15 | #include <sys/types.h> | ||
16 | |||
17 | #include <stdarg.h> | ||
18 | #include <stdio.h> | ||
19 | #include <string.h> | ||
20 | #include <unistd.h> | ||
21 | #include <pwd.h> | ||
14 | 22 | ||
15 | #include "xmalloc.h" | 23 | #include "xmalloc.h" |
16 | #include "rsa.h" | 24 | #include "rsa.h" |
@@ -20,10 +28,15 @@ RCSID("$OpenBSD: auth1.c,v 1.62 2005/07/16 01:35:24 djm Exp $"); | |||
20 | #include "log.h" | 28 | #include "log.h" |
21 | #include "servconf.h" | 29 | #include "servconf.h" |
22 | #include "compat.h" | 30 | #include "compat.h" |
31 | #include "key.h" | ||
32 | #include "hostfile.h" | ||
23 | #include "auth.h" | 33 | #include "auth.h" |
24 | #include "channels.h" | 34 | #include "channels.h" |
25 | #include "session.h" | 35 | #include "session.h" |
26 | #include "uidswap.h" | 36 | #include "uidswap.h" |
37 | #ifdef GSSAPI | ||
38 | #include "ssh-gss.h" | ||
39 | #endif | ||
27 | #include "monitor_wrap.h" | 40 | #include "monitor_wrap.h" |
28 | #include "buffer.h" | 41 | #include "buffer.h" |
29 | 42 | ||
@@ -77,7 +90,7 @@ static const struct AuthMethod1 | |||
77 | { | 90 | { |
78 | int i; | 91 | int i; |
79 | 92 | ||
80 | for(i = 0; auth1_methods[i].name != NULL; i++) | 93 | for (i = 0; auth1_methods[i].name != NULL; i++) |
81 | if (auth1_methods[i].type == type) | 94 | if (auth1_methods[i].type == type) |
82 | return (&(auth1_methods[i])); | 95 | return (&(auth1_methods[i])); |
83 | 96 | ||
@@ -96,6 +109,7 @@ get_authname(int type) | |||
96 | return (buf); | 109 | return (buf); |
97 | } | 110 | } |
98 | 111 | ||
112 | /*ARGSUSED*/ | ||
99 | static int | 113 | static int |
100 | auth1_process_password(Authctxt *authctxt, char *info, size_t infolen) | 114 | auth1_process_password(Authctxt *authctxt, char *info, size_t infolen) |
101 | { | 115 | { |
@@ -120,6 +134,7 @@ auth1_process_password(Authctxt *authctxt, char *info, size_t infolen) | |||
120 | return (authenticated); | 134 | return (authenticated); |
121 | } | 135 | } |
122 | 136 | ||
137 | /*ARGSUSED*/ | ||
123 | static int | 138 | static int |
124 | auth1_process_rsa(Authctxt *authctxt, char *info, size_t infolen) | 139 | auth1_process_rsa(Authctxt *authctxt, char *info, size_t infolen) |
125 | { | 140 | { |
@@ -137,6 +152,7 @@ auth1_process_rsa(Authctxt *authctxt, char *info, size_t infolen) | |||
137 | return (authenticated); | 152 | return (authenticated); |
138 | } | 153 | } |
139 | 154 | ||
155 | /*ARGSUSED*/ | ||
140 | static int | 156 | static int |
141 | auth1_process_rhosts_rsa(Authctxt *authctxt, char *info, size_t infolen) | 157 | auth1_process_rhosts_rsa(Authctxt *authctxt, char *info, size_t infolen) |
142 | { | 158 | { |
@@ -175,6 +191,7 @@ auth1_process_rhosts_rsa(Authctxt *authctxt, char *info, size_t infolen) | |||
175 | return (authenticated); | 191 | return (authenticated); |
176 | } | 192 | } |
177 | 193 | ||
194 | /*ARGSUSED*/ | ||
178 | static int | 195 | static int |
179 | auth1_process_tis_challenge(Authctxt *authctxt, char *info, size_t infolen) | 196 | auth1_process_tis_challenge(Authctxt *authctxt, char *info, size_t infolen) |
180 | { | 197 | { |
@@ -193,6 +210,7 @@ auth1_process_tis_challenge(Authctxt *authctxt, char *info, size_t infolen) | |||
193 | return (-1); | 210 | return (-1); |
194 | } | 211 | } |
195 | 212 | ||
213 | /*ARGSUSED*/ | ||
196 | static int | 214 | static int |
197 | auth1_process_tis_response(Authctxt *authctxt, char *info, size_t infolen) | 215 | auth1_process_tis_response(Authctxt *authctxt, char *info, size_t infolen) |
198 | { | 216 | { |