diff options
author | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
commit | 327155e6824b3ee13837bdde04e4eb47e147ff46 (patch) | |
tree | 8f8743122403c7a2e6ed919156711fb1520c657f /kexgexc.c | |
parent | 0334ce32304e9ba2a10ee5ca49ca6e8ff3ba6cf4 (diff) | |
parent | 74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.3).
- sftp(1): add support for resuming partial downloads using the "reget"
command and on the sftp commandline or on the "get" commandline using
the "-a" (append) option (closes: #158590).
- ssh(1): add an "IgnoreUnknown" configuration option to selectively
suppress errors arising from unknown configuration directives (closes:
#436052).
- sftp(1): update progressmeter when data is acknowledged, not when it's
sent (partially addresses #708372).
- ssh(1): do not fatally exit when attempting to cleanup multiplexing-
created channels that are incompletely opened (closes: #651357).
Diffstat (limited to 'kexgexc.c')
-rw-r--r-- | kexgexc.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexgexc.c,v 1.12 2010/11/10 01:33:07 djm Exp $ */ | 1 | /* $OpenBSD: kexgexc.c,v 1.13 2013/05/17 00:13:13 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Niels Provos. All rights reserved. | 3 | * Copyright (c) 2000 Niels Provos. All rights reserved. |
4 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
@@ -163,7 +163,7 @@ kexgex_client(Kex *kex) | |||
163 | if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) | 163 | if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) |
164 | fatal("kexgex_client: BN_bin2bn failed"); | 164 | fatal("kexgex_client: BN_bin2bn failed"); |
165 | memset(kbuf, 0, klen); | 165 | memset(kbuf, 0, klen); |
166 | xfree(kbuf); | 166 | free(kbuf); |
167 | 167 | ||
168 | if (datafellows & SSH_OLD_DHGEX) | 168 | if (datafellows & SSH_OLD_DHGEX) |
169 | min = max = -1; | 169 | min = max = -1; |
@@ -186,13 +186,13 @@ kexgex_client(Kex *kex) | |||
186 | 186 | ||
187 | /* have keys, free DH */ | 187 | /* have keys, free DH */ |
188 | DH_free(dh); | 188 | DH_free(dh); |
189 | xfree(server_host_key_blob); | 189 | free(server_host_key_blob); |
190 | BN_clear_free(dh_server_pub); | 190 | BN_clear_free(dh_server_pub); |
191 | 191 | ||
192 | if (key_verify(server_host_key, signature, slen, hash, hashlen) != 1) | 192 | if (key_verify(server_host_key, signature, slen, hash, hashlen) != 1) |
193 | fatal("key_verify failed for server_host_key"); | 193 | fatal("key_verify failed for server_host_key"); |
194 | key_free(server_host_key); | 194 | key_free(server_host_key); |
195 | xfree(signature); | 195 | free(signature); |
196 | 196 | ||
197 | /* save session id */ | 197 | /* save session id */ |
198 | if (kex->session_id == NULL) { | 198 | if (kex->session_id == NULL) { |