summaryrefslogtreecommitdiff
path: root/kexgssc.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2013-09-14 15:56:58 +0100
committerColin Watson <cjwatson@debian.org>2013-09-14 15:56:58 +0100
commit74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (patch)
treead47f23400805ffa77a7821f2b2ec70649e58326 /kexgssc.c
parent8faf8c84430cf3c19705b1d9f8889d256e7fd1fd (diff)
Replace GSSAPI-specific instances of xfree with the equivalent calls to free.
Diffstat (limited to 'kexgssc.c')
-rw-r--r--kexgssc.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/kexgssc.c b/kexgssc.c
index 39be40531..616893c7e 100644
--- a/kexgssc.c
+++ b/kexgssc.c
@@ -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 */