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 /ssh-rsa.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 'ssh-rsa.c')
-rw-r--r-- | ssh-rsa.c | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-rsa.c,v 1.39 2006/08/03 03:34:42 deraadt Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org> | 3 | * Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org> |
3 | * | 4 | * |
@@ -13,16 +14,20 @@ | |||
13 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | 14 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
15 | */ | 16 | */ |
17 | |||
16 | #include "includes.h" | 18 | #include "includes.h" |
17 | RCSID("$OpenBSD: ssh-rsa.c,v 1.32 2005/06/17 02:44:33 djm Exp $"); | 19 | |
20 | #include <sys/types.h> | ||
18 | 21 | ||
19 | #include <openssl/evp.h> | 22 | #include <openssl/evp.h> |
20 | #include <openssl/err.h> | 23 | #include <openssl/err.h> |
21 | 24 | ||
25 | #include <stdarg.h> | ||
26 | #include <string.h> | ||
27 | |||
22 | #include "xmalloc.h" | 28 | #include "xmalloc.h" |
23 | #include "log.h" | 29 | #include "log.h" |
24 | #include "buffer.h" | 30 | #include "buffer.h" |
25 | #include "bufaux.h" | ||
26 | #include "key.h" | 31 | #include "key.h" |
27 | #include "compat.h" | 32 | #include "compat.h" |
28 | #include "ssh.h" | 33 | #include "ssh.h" |
@@ -62,6 +67,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp, | |||
62 | 67 | ||
63 | if (ok != 1) { | 68 | if (ok != 1) { |
64 | int ecode = ERR_get_error(); | 69 | int ecode = ERR_get_error(); |
70 | |||
65 | error("ssh_rsa_sign: RSA_sign failed: %s", | 71 | error("ssh_rsa_sign: RSA_sign failed: %s", |
66 | ERR_error_string(ecode, NULL)); | 72 | ERR_error_string(ecode, NULL)); |
67 | xfree(sig); | 73 | xfree(sig); |
@@ -144,7 +150,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen, | |||
144 | u_int diff = modlen - len; | 150 | u_int diff = modlen - len; |
145 | debug("ssh_rsa_verify: add padding: modlen %u > len %u", | 151 | debug("ssh_rsa_verify: add padding: modlen %u > len %u", |
146 | modlen, len); | 152 | modlen, len); |
147 | sigblob = xrealloc(sigblob, modlen); | 153 | sigblob = xrealloc(sigblob, 1, modlen); |
148 | memmove(sigblob + diff, sigblob, len); | 154 | memmove(sigblob + diff, sigblob, len); |
149 | memset(sigblob, 0, diff); | 155 | memset(sigblob, 0, diff); |
150 | len = modlen; | 156 | len = modlen; |
@@ -220,7 +226,6 @@ openssh_RSA_verify(int type, u_char *hash, u_int hashlen, | |||
220 | break; | 226 | break; |
221 | default: | 227 | default: |
222 | goto done; | 228 | goto done; |
223 | break; | ||
224 | } | 229 | } |
225 | if (hashlen != hlen) { | 230 | if (hashlen != hlen) { |
226 | error("bad hashlen"); | 231 | error("bad hashlen"); |