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 /kexgssc.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 'kexgssc.c')
-rw-r--r-- | kexgssc.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -144,7 +144,7 @@ kexgss_client(Kex *kex) { | |||
144 | 144 | ||
145 | /* If we've got an old receive buffer get rid of it */ | 145 | /* If we've got an old receive buffer get rid of it */ |
146 | if (token_ptr != GSS_C_NO_BUFFER) | 146 | if (token_ptr != GSS_C_NO_BUFFER) |
147 | xfree(recv_tok.value); | 147 | free(recv_tok.value); |
148 | 148 | ||
149 | if (maj_status == GSS_S_COMPLETE) { | 149 | if (maj_status == GSS_S_COMPLETE) { |
150 | /* If mutual state flag is not true, kex fails */ | 150 | /* If mutual state flag is not true, kex fails */ |
@@ -261,7 +261,7 @@ kexgss_client(Kex *kex) { | |||
261 | fatal("kexdh_client: BN_bin2bn failed"); | 261 | fatal("kexdh_client: BN_bin2bn failed"); |
262 | 262 | ||
263 | memset(kbuf, 0, klen); | 263 | memset(kbuf, 0, klen); |
264 | xfree(kbuf); | 264 | free(kbuf); |
265 | 265 | ||
266 | switch (kex->kex_type) { | 266 | switch (kex->kex_type) { |
267 | case KEX_GSS_GRP1_SHA1: | 267 | case KEX_GSS_GRP1_SHA1: |
@@ -304,11 +304,10 @@ kexgss_client(Kex *kex) { | |||
304 | if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok))) | 304 | if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok))) |
305 | packet_disconnect("Hash's MIC didn't verify"); | 305 | packet_disconnect("Hash's MIC didn't verify"); |
306 | 306 | ||
307 | xfree(msg_tok.value); | 307 | free(msg_tok.value); |
308 | 308 | ||
309 | DH_free(dh); | 309 | DH_free(dh); |
310 | if (serverhostkey) | 310 | free(serverhostkey); |
311 | xfree(serverhostkey); | ||
312 | BN_clear_free(dh_server_pub); | 311 | BN_clear_free(dh_server_pub); |
313 | 312 | ||
314 | /* save session id */ | 313 | /* save session id */ |