diff options
-rw-r--r-- | auth2-gss.c | 2 | ||||
-rw-r--r-- | gss-genr.c | 6 | ||||
-rw-r--r-- | kexgssc.c | 9 | ||||
-rw-r--r-- | kexgsss.c | 11 | ||||
-rw-r--r-- | monitor.c | 8 | ||||
-rw-r--r-- | sshconnect2.c | 2 |
6 files changed, 19 insertions, 19 deletions
diff --git a/auth2-gss.c b/auth2-gss.c index 3c3cbb966..b8db8204f 100644 --- a/auth2-gss.c +++ b/auth2-gss.c | |||
@@ -81,7 +81,7 @@ userauth_gsskeyex(Authctxt *authctxt) | |||
81 | authctxt->pw)); | 81 | authctxt->pw)); |
82 | 82 | ||
83 | buffer_free(&b); | 83 | buffer_free(&b); |
84 | xfree(mic.value); | 84 | free(mic.value); |
85 | 85 | ||
86 | return (authenticated); | 86 | return (authenticated); |
87 | } | 87 | } |
diff --git a/gss-genr.c b/gss-genr.c index 630c263da..3069347c2 100644 --- a/gss-genr.c +++ b/gss-genr.c | |||
@@ -101,8 +101,8 @@ ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check, | |||
101 | 101 | ||
102 | if (gss_enc2oid != NULL) { | 102 | if (gss_enc2oid != NULL) { |
103 | for (i = 0; gss_enc2oid[i].encoded != NULL; i++) | 103 | for (i = 0; gss_enc2oid[i].encoded != NULL; i++) |
104 | xfree(gss_enc2oid[i].encoded); | 104 | free(gss_enc2oid[i].encoded); |
105 | xfree(gss_enc2oid); | 105 | free(gss_enc2oid); |
106 | } | 106 | } |
107 | 107 | ||
108 | gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) * | 108 | gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) * |
@@ -159,7 +159,7 @@ ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check, | |||
159 | buffer_free(&buf); | 159 | buffer_free(&buf); |
160 | 160 | ||
161 | if (strlen(mechs) == 0) { | 161 | if (strlen(mechs) == 0) { |
162 | xfree(mechs); | 162 | free(mechs); |
163 | mechs = NULL; | 163 | mechs = NULL; |
164 | } | 164 | } |
165 | 165 | ||
@@ -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 */ |
@@ -78,9 +78,10 @@ kexgss_server(Kex *kex) | |||
78 | * in the GSSAPI code are no longer available. This kludges them back | 78 | * in the GSSAPI code are no longer available. This kludges them back |
79 | * into life | 79 | * into life |
80 | */ | 80 | */ |
81 | if (!ssh_gssapi_oid_table_ok()) | 81 | if (!ssh_gssapi_oid_table_ok()) { |
82 | if ((mechs = ssh_gssapi_server_mechanisms())) | 82 | mechs = ssh_gssapi_server_mechanisms(); |
83 | xfree(mechs); | 83 | free(mechs); |
84 | } | ||
84 | 85 | ||
85 | debug2("%s: Identifying %s", __func__, kex->name); | 86 | debug2("%s: Identifying %s", __func__, kex->name); |
86 | oid = ssh_gssapi_id_kex(NULL, kex->name, kex->kex_type); | 87 | oid = ssh_gssapi_id_kex(NULL, kex->name, kex->kex_type); |
@@ -158,7 +159,7 @@ kexgss_server(Kex *kex) | |||
158 | maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok, | 159 | maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok, |
159 | &send_tok, &ret_flags)); | 160 | &send_tok, &ret_flags)); |
160 | 161 | ||
161 | xfree(recv_tok.value); | 162 | free(recv_tok.value); |
162 | 163 | ||
163 | if (maj_status != GSS_S_COMPLETE && send_tok.length == 0) | 164 | if (maj_status != GSS_S_COMPLETE && send_tok.length == 0) |
164 | fatal("Zero length token output when incomplete"); | 165 | fatal("Zero length token output when incomplete"); |
@@ -207,7 +208,7 @@ kexgss_server(Kex *kex) | |||
207 | fatal("kexgss_server: BN_bin2bn failed"); | 208 | fatal("kexgss_server: BN_bin2bn failed"); |
208 | 209 | ||
209 | memset(kbuf, 0, klen); | 210 | memset(kbuf, 0, klen); |
210 | xfree(kbuf); | 211 | free(kbuf); |
211 | 212 | ||
212 | switch (kex->kex_type) { | 213 | switch (kex->kex_type) { |
213 | case KEX_GSS_GRP1_SHA1: | 214 | case KEX_GSS_GRP1_SHA1: |
@@ -2220,7 +2220,7 @@ mm_answer_gss_sign(int socket, Buffer *m) | |||
2220 | } | 2220 | } |
2221 | major = ssh_gssapi_sign(gsscontext, &data, &hash); | 2221 | major = ssh_gssapi_sign(gsscontext, &data, &hash); |
2222 | 2222 | ||
2223 | xfree(data.value); | 2223 | free(data.value); |
2224 | 2224 | ||
2225 | buffer_clear(m); | 2225 | buffer_clear(m); |
2226 | buffer_put_int(m, major); | 2226 | buffer_put_int(m, major); |
@@ -2250,9 +2250,9 @@ mm_answer_gss_updatecreds(int socket, Buffer *m) { | |||
2250 | 2250 | ||
2251 | ok = ssh_gssapi_update_creds(&store); | 2251 | ok = ssh_gssapi_update_creds(&store); |
2252 | 2252 | ||
2253 | xfree(store.filename); | 2253 | free(store.filename); |
2254 | xfree(store.envvar); | 2254 | free(store.envvar); |
2255 | xfree(store.envval); | 2255 | free(store.envval); |
2256 | 2256 | ||
2257 | buffer_clear(m); | 2257 | buffer_clear(m); |
2258 | buffer_put_int(m, ok); | 2258 | buffer_put_int(m, ok); |
diff --git a/sshconnect2.c b/sshconnect2.c index 8c20eed93..0b13530ce 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -229,7 +229,7 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) | |||
229 | orig = myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]; | 229 | orig = myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]; |
230 | xasprintf(&myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS], | 230 | xasprintf(&myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS], |
231 | "%s,null", orig); | 231 | "%s,null", orig); |
232 | xfree(gss); | 232 | free(gss); |
233 | } | 233 | } |
234 | #endif | 234 | #endif |
235 | 235 | ||