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 /kexdhc.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 'kexdhc.c')
-rw-r--r-- | kexdhc.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexdhc.c,v 1.12 2010/11/10 01:33:07 djm Exp $ */ | 1 | /* $OpenBSD: kexdhc.c,v 1.13 2013/05/17 00:13:13 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -125,7 +125,7 @@ kexdh_client(Kex *kex) | |||
125 | if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) | 125 | if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) |
126 | fatal("kexdh_client: BN_bin2bn failed"); | 126 | fatal("kexdh_client: BN_bin2bn failed"); |
127 | memset(kbuf, 0, klen); | 127 | memset(kbuf, 0, klen); |
128 | xfree(kbuf); | 128 | free(kbuf); |
129 | 129 | ||
130 | /* calc and verify H */ | 130 | /* calc and verify H */ |
131 | kex_dh_hash( | 131 | kex_dh_hash( |
@@ -139,14 +139,14 @@ kexdh_client(Kex *kex) | |||
139 | shared_secret, | 139 | shared_secret, |
140 | &hash, &hashlen | 140 | &hash, &hashlen |
141 | ); | 141 | ); |
142 | xfree(server_host_key_blob); | 142 | free(server_host_key_blob); |
143 | BN_clear_free(dh_server_pub); | 143 | BN_clear_free(dh_server_pub); |
144 | DH_free(dh); | 144 | DH_free(dh); |
145 | 145 | ||
146 | if (key_verify(server_host_key, signature, slen, hash, hashlen) != 1) | 146 | if (key_verify(server_host_key, signature, slen, hash, hashlen) != 1) |
147 | fatal("key_verify failed for server_host_key"); | 147 | fatal("key_verify failed for server_host_key"); |
148 | key_free(server_host_key); | 148 | key_free(server_host_key); |
149 | xfree(signature); | 149 | free(signature); |
150 | 150 | ||
151 | /* save session id */ | 151 | /* save session id */ |
152 | if (kex->session_id == NULL) { | 152 | if (kex->session_id == NULL) { |