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-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 'auth-rsa.c')
-rw-r--r-- | auth-rsa.c | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/auth-rsa.c b/auth-rsa.c index d9c9652dc..69f9a5896 100644 --- a/auth-rsa.c +++ b/auth-rsa.c | |||
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: auth-rsa.c,v 1.72 2006/11/06 21:25:27 markus Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -14,23 +15,35 @@ | |||
14 | */ | 15 | */ |
15 | 16 | ||
16 | #include "includes.h" | 17 | #include "includes.h" |
17 | RCSID("$OpenBSD: auth-rsa.c,v 1.63 2005/06/17 02:44:32 djm Exp $"); | 18 | |
19 | #include <sys/types.h> | ||
20 | #include <sys/stat.h> | ||
18 | 21 | ||
19 | #include <openssl/rsa.h> | 22 | #include <openssl/rsa.h> |
20 | #include <openssl/md5.h> | 23 | #include <openssl/md5.h> |
21 | 24 | ||
25 | #include <pwd.h> | ||
26 | #include <stdio.h> | ||
27 | #include <stdarg.h> | ||
28 | #include <string.h> | ||
29 | |||
30 | #include "xmalloc.h" | ||
22 | #include "rsa.h" | 31 | #include "rsa.h" |
23 | #include "packet.h" | 32 | #include "packet.h" |
24 | #include "xmalloc.h" | ||
25 | #include "ssh1.h" | 33 | #include "ssh1.h" |
26 | #include "uidswap.h" | 34 | #include "uidswap.h" |
27 | #include "match.h" | 35 | #include "match.h" |
36 | #include "buffer.h" | ||
28 | #include "auth-options.h" | 37 | #include "auth-options.h" |
29 | #include "pathnames.h" | 38 | #include "pathnames.h" |
30 | #include "log.h" | 39 | #include "log.h" |
31 | #include "servconf.h" | 40 | #include "servconf.h" |
32 | #include "auth.h" | 41 | #include "key.h" |
33 | #include "hostfile.h" | 42 | #include "hostfile.h" |
43 | #include "auth.h" | ||
44 | #ifdef GSSAPI | ||
45 | #include "ssh-gss.h" | ||
46 | #endif | ||
34 | #include "monitor_wrap.h" | 47 | #include "monitor_wrap.h" |
35 | #include "ssh.h" | 48 | #include "ssh.h" |
36 | #include "misc.h" | 49 | #include "misc.h" |
@@ -63,10 +76,12 @@ auth_rsa_generate_challenge(Key *key) | |||
63 | if ((challenge = BN_new()) == NULL) | 76 | if ((challenge = BN_new()) == NULL) |
64 | fatal("auth_rsa_generate_challenge: BN_new() failed"); | 77 | fatal("auth_rsa_generate_challenge: BN_new() failed"); |
65 | /* Generate a random challenge. */ | 78 | /* Generate a random challenge. */ |
66 | BN_rand(challenge, 256, 0, 0); | 79 | if (BN_rand(challenge, 256, 0, 0) == 0) |
80 | fatal("auth_rsa_generate_challenge: BN_rand failed"); | ||
67 | if ((ctx = BN_CTX_new()) == NULL) | 81 | if ((ctx = BN_CTX_new()) == NULL) |
68 | fatal("auth_rsa_generate_challenge: BN_CTX_new() failed"); | 82 | fatal("auth_rsa_generate_challenge: BN_CTX_new failed"); |
69 | BN_mod(challenge, challenge, key->rsa->n, ctx); | 83 | if (BN_mod(challenge, challenge, key->rsa->n, ctx) == 0) |
84 | fatal("auth_rsa_generate_challenge: BN_mod failed"); | ||
70 | BN_CTX_free(ctx); | 85 | BN_CTX_free(ctx); |
71 | 86 | ||
72 | return challenge; | 87 | return challenge; |
@@ -137,7 +152,7 @@ auth_rsa_challenge_dialog(Key *key) | |||
137 | /* Wait for a response. */ | 152 | /* Wait for a response. */ |
138 | packet_read_expect(SSH_CMSG_AUTH_RSA_RESPONSE); | 153 | packet_read_expect(SSH_CMSG_AUTH_RSA_RESPONSE); |
139 | for (i = 0; i < 16; i++) | 154 | for (i = 0; i < 16; i++) |
140 | response[i] = packet_get_char(); | 155 | response[i] = (u_char)packet_get_char(); |
141 | packet_check_eom(); | 156 | packet_check_eom(); |
142 | 157 | ||
143 | success = PRIVSEP(auth_rsa_verify_response(key, challenge, response)); | 158 | success = PRIVSEP(auth_rsa_verify_response(key, challenge, response)); |