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 /kexdhs.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 'kexdhs.c')
-rw-r--r-- | kexdhs.c | 23 |
1 files changed, 18 insertions, 5 deletions
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: kexdhs.c,v 1.9 2006/11/06 21:25:28 markus Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
3 | * | 4 | * |
@@ -23,15 +24,25 @@ | |||
23 | */ | 24 | */ |
24 | 25 | ||
25 | #include "includes.h" | 26 | #include "includes.h" |
26 | RCSID("$OpenBSD: kexdhs.c,v 1.3 2005/11/04 05:15:59 djm Exp $"); | 27 | |
28 | #include <sys/types.h> | ||
29 | |||
30 | #include <stdarg.h> | ||
31 | #include <string.h> | ||
32 | #include <signal.h> | ||
27 | 33 | ||
28 | #include "xmalloc.h" | 34 | #include "xmalloc.h" |
35 | #include "buffer.h" | ||
29 | #include "key.h" | 36 | #include "key.h" |
37 | #include "cipher.h" | ||
30 | #include "kex.h" | 38 | #include "kex.h" |
31 | #include "log.h" | 39 | #include "log.h" |
32 | #include "packet.h" | 40 | #include "packet.h" |
33 | #include "dh.h" | 41 | #include "dh.h" |
34 | #include "ssh2.h" | 42 | #include "ssh2.h" |
43 | #ifdef GSSAPI | ||
44 | #include "ssh-gss.h" | ||
45 | #endif | ||
35 | #include "monitor_wrap.h" | 46 | #include "monitor_wrap.h" |
36 | 47 | ||
37 | void | 48 | void |
@@ -41,8 +52,8 @@ kexdh_server(Kex *kex) | |||
41 | DH *dh; | 52 | DH *dh; |
42 | Key *server_host_key; | 53 | Key *server_host_key; |
43 | u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL; | 54 | u_char *kbuf, *hash, *signature = NULL, *server_host_key_blob = NULL; |
44 | u_int sbloblen, klen, kout, hashlen; | 55 | u_int sbloblen, klen, hashlen, slen; |
45 | u_int slen; | 56 | int kout; |
46 | 57 | ||
47 | /* generate server DH public key */ | 58 | /* generate server DH public key */ |
48 | switch (kex->kex_type) { | 59 | switch (kex->kex_type) { |
@@ -90,13 +101,15 @@ kexdh_server(Kex *kex) | |||
90 | 101 | ||
91 | klen = DH_size(dh); | 102 | klen = DH_size(dh); |
92 | kbuf = xmalloc(klen); | 103 | kbuf = xmalloc(klen); |
93 | kout = DH_compute_key(kbuf, dh_client_pub, dh); | 104 | if ((kout = DH_compute_key(kbuf, dh_client_pub, dh)) < 0) |
105 | fatal("DH_compute_key: failed"); | ||
94 | #ifdef DEBUG_KEXDH | 106 | #ifdef DEBUG_KEXDH |
95 | dump_digest("shared secret", kbuf, kout); | 107 | dump_digest("shared secret", kbuf, kout); |
96 | #endif | 108 | #endif |
97 | if ((shared_secret = BN_new()) == NULL) | 109 | if ((shared_secret = BN_new()) == NULL) |
98 | fatal("kexdh_server: BN_new failed"); | 110 | fatal("kexdh_server: BN_new failed"); |
99 | BN_bin2bn(kbuf, kout, shared_secret); | 111 | if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) |
112 | fatal("kexdh_server: BN_bin2bn failed"); | ||
100 | memset(kbuf, 0, klen); | 113 | memset(kbuf, 0, klen); |
101 | xfree(kbuf); | 114 | xfree(kbuf); |
102 | 115 | ||