summaryrefslogtreecommitdiff
path: root/ssh-keysign.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2007-06-12 16:16:35 +0000
committerColin Watson <cjwatson@debian.org>2007-06-12 16:16:35 +0000
commitb7e40fa9da0b5491534a429dadb321eab5a77558 (patch)
treebed1da11e9f829925797aa093e379fc0b5868ecd /ssh-keysign.c
parent4f84beedf1005e44ff33c854abd6b711ffc0adb7 (diff)
parent086ea76990b1e6287c24b6db74adffd4605eb3b0 (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-keysign.c')
-rw-r--r--ssh-keysign.c22
1 files changed, 16 insertions, 6 deletions
diff --git a/ssh-keysign.c b/ssh-keysign.c
index dae3a2e8c..c4bc7e56e 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,3 +1,4 @@
1/* $OpenBSD: ssh-keysign.c,v 1.29 2006/08/03 03:34:42 deraadt Exp $ */
1/* 2/*
2 * Copyright (c) 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 2002 Markus Friedl. All rights reserved.
3 * 4 *
@@ -21,21 +22,30 @@
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"
25RCSID("$OpenBSD: ssh-keysign.c,v 1.19 2005/09/13 23:40:07 djm Exp $"); 27
28#include <fcntl.h>
29#ifdef HAVE_PATHS_H
30#include <paths.h>
31#endif
32#include <pwd.h>
33#include <stdarg.h>
34#include <stdlib.h>
35#include <string.h>
36#include <unistd.h>
26 37
27#include <openssl/evp.h> 38#include <openssl/evp.h>
28#include <openssl/rand.h> 39#include <openssl/rand.h>
29#include <openssl/rsa.h> 40#include <openssl/rsa.h>
30 41
42#include "xmalloc.h"
31#include "log.h" 43#include "log.h"
32#include "key.h" 44#include "key.h"
33#include "ssh.h" 45#include "ssh.h"
34#include "ssh2.h" 46#include "ssh2.h"
35#include "misc.h" 47#include "misc.h"
36#include "xmalloc.h"
37#include "buffer.h" 48#include "buffer.h"
38#include "bufaux.h"
39#include "authfile.h" 49#include "authfile.h"
40#include "msg.h" 50#include "msg.h"
41#include "canohost.h" 51#include "canohost.h"
@@ -64,9 +74,9 @@ valid_request(struct passwd *pw, char *host, Key **ret, u_char *data,
64 buffer_init(&b); 74 buffer_init(&b);
65 buffer_append(&b, data, datalen); 75 buffer_append(&b, data, datalen);
66 76
67 /* session id, currently limited to SHA1 (20 bytes) */ 77 /* session id, currently limited to SHA1 (20 bytes) or SHA256 (32) */
68 p = buffer_get_string(&b, &len); 78 p = buffer_get_string(&b, &len);
69 if (len != 20) 79 if (len != 20 && len != 32)
70 fail++; 80 fail++;
71 xfree(p); 81 xfree(p);
72 82
@@ -140,7 +150,7 @@ main(int argc, char **argv)
140{ 150{
141 Buffer b; 151 Buffer b;
142 Options options; 152 Options options;
143 Key *keys[2], *key; 153 Key *keys[2], *key = NULL;
144 struct passwd *pw; 154 struct passwd *pw;
145 int key_fd[2], i, found, version = 2, fd; 155 int key_fd[2], i, found, version = 2, fd;
146 u_char *signature, *data; 156 u_char *signature, *data;