summaryrefslogtreecommitdiff
path: root/kexgexc.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 /kexgexc.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 'kexgexc.c')
-rw-r--r--kexgexc.c22
1 files changed, 17 insertions, 5 deletions
diff --git a/kexgexc.c b/kexgexc.c
index a6ff8757d..adb973d5b 100644
--- a/kexgexc.c
+++ b/kexgexc.c
@@ -1,3 +1,4 @@
1/* $OpenBSD: kexgexc.c,v 1.11 2006/11/06 21:25:28 markus Exp $ */
1/* 2/*
2 * Copyright (c) 2000 Niels Provos. All rights reserved. 3 * Copyright (c) 2000 Niels Provos. All rights reserved.
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 4 * Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -24,10 +25,18 @@
24 */ 25 */
25 26
26#include "includes.h" 27#include "includes.h"
27RCSID("$OpenBSD: kexgexc.c,v 1.3 2005/11/04 05:15:59 djm Exp $"); 28
29#include <sys/types.h>
30
31#include <stdarg.h>
32#include <stdio.h>
33#include <string.h>
34#include <signal.h>
28 35
29#include "xmalloc.h" 36#include "xmalloc.h"
37#include "buffer.h"
30#include "key.h" 38#include "key.h"
39#include "cipher.h"
31#include "kex.h" 40#include "kex.h"
32#include "log.h" 41#include "log.h"
33#include "packet.h" 42#include "packet.h"
@@ -42,7 +51,8 @@ kexgex_client(Kex *kex)
42 BIGNUM *p = NULL, *g = NULL; 51 BIGNUM *p = NULL, *g = NULL;
43 Key *server_host_key; 52 Key *server_host_key;
44 u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL; 53 u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL;
45 u_int klen, kout, slen, sbloblen, hashlen; 54 u_int klen, slen, sbloblen, hashlen;
55 int kout;
46 int min, max, nbits; 56 int min, max, nbits;
47 DH *dh; 57 DH *dh;
48 58
@@ -120,7 +130,7 @@ kexgex_client(Kex *kex)
120 if (kex->verify_host_key(server_host_key) == -1) 130 if (kex->verify_host_key(server_host_key) == -1)
121 fatal("server_host_key verification failed"); 131 fatal("server_host_key verification failed");
122 132
123 /* DH paramter f, server public DH key */ 133 /* DH parameter f, server public DH key */
124 if ((dh_server_pub = BN_new()) == NULL) 134 if ((dh_server_pub = BN_new()) == NULL)
125 fatal("dh_server_pub == NULL"); 135 fatal("dh_server_pub == NULL");
126 packet_get_bignum2(dh_server_pub); 136 packet_get_bignum2(dh_server_pub);
@@ -141,13 +151,15 @@ kexgex_client(Kex *kex)
141 151
142 klen = DH_size(dh); 152 klen = DH_size(dh);
143 kbuf = xmalloc(klen); 153 kbuf = xmalloc(klen);
144 kout = DH_compute_key(kbuf, dh_server_pub, dh); 154 if ((kout = DH_compute_key(kbuf, dh_server_pub, dh)) < 0)
155 fatal("DH_compute_key: failed");
145#ifdef DEBUG_KEXDH 156#ifdef DEBUG_KEXDH
146 dump_digest("shared secret", kbuf, kout); 157 dump_digest("shared secret", kbuf, kout);
147#endif 158#endif
148 if ((shared_secret = BN_new()) == NULL) 159 if ((shared_secret = BN_new()) == NULL)
149 fatal("kexgex_client: BN_new failed"); 160 fatal("kexgex_client: BN_new failed");
150 BN_bin2bn(kbuf, kout, shared_secret); 161 if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)
162 fatal("kexgex_client: BN_bin2bn failed");
151 memset(kbuf, 0, klen); 163 memset(kbuf, 0, klen);
152 xfree(kbuf); 164 xfree(kbuf);
153 165