lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-12-05 01:02:39 +03:00
Code Activity

gssapi: Use SSH_STRING_FREE()

Browse Source 
Fixes T183

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
Andreas Schneider
2019-10-28 13:53:14 +01:00
parent 3ab8b76921
commit 3b8fcbad24
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gssapi.c
View File

@@ -208,7 +208,7 @@ int ssh_gssapi_handle_userauth(ssh_session session, const char *user, uint32_t n
return SSH_ERROR; return SSH_ERROR;
session->gssapi->state = SSH_GSSAPI_STATE_RCV_TOKEN; session->gssapi->state = SSH_GSSAPI_STATE_RCV_TOKEN;
rc = ssh_gssapi_send_response(session, oid_s); rc = ssh_gssapi_send_response(session, oid_s);
ssh_string_free(oid_s); SSH_STRING_FREE(oid_s);
return rc; return rc;
} else { } else {
return ssh_auth_reply_default(session,0); return ssh_auth_reply_default(session,0);
@@ -392,7 +392,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_gssapi_token_server){
return SSH_PACKET_USED; return SSH_PACKET_USED;
} }
ssh_packet_send(session); ssh_packet_send(session);
ssh_string_free(out_token); SSH_STRING_FREE(out_token);
} else { } else {
session->gssapi->state = SSH_GSSAPI_STATE_RCV_MIC; session->gssapi->state = SSH_GSSAPI_STATE_RCV_MIC;
} }
@@ -411,7 +411,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_gssapi_token_server){
"accepting token", "accepting token",
maj_stat, maj_stat,
min_stat); min_stat);
ssh_string_free(token); SSH_STRING_FREE(token);
if (client_name != GSS_C_NO_NAME){ if (client_name != GSS_C_NO_NAME){
session->gssapi->client_name = client_name; session->gssapi->client_name = client_name;
session->gssapi->canonic_user = ssh_gssapi_name_to_char(client_name); session->gssapi->canonic_user = ssh_gssapi_name_to_char(client_name);
@@ -560,7 +560,7 @@ end:
ssh_buffer_free(mic_buffer); ssh_buffer_free(mic_buffer);
} }
if (mic_token != NULL) { if (mic_token != NULL) {
ssh_string_free(mic_token); SSH_STRING_FREE(mic_token);
} }
return SSH_PACKET_USED; return SSH_PACKET_USED;
@@ -787,7 +787,7 @@ int ssh_gssapi_auth_mic(ssh_session session){
out: out:
for (i = 0; i < n_oids; i++) { for (i = 0; i < n_oids; i++) {
ssh_string_free(oids[i]); SSH_STRING_FREE(oids[i]);
} }
free(oids); free(oids);
if (rc != SSH_ERROR) { if (rc != SSH_ERROR) {
@@ -854,7 +854,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_gssapi_response){
goto error; goto error;
} }
session->gssapi->client.oid = ssh_gssapi_oid_from_string(oid_s); session->gssapi->client.oid = ssh_gssapi_oid_from_string(oid_s);
ssh_string_free(oid_s); SSH_STRING_FREE(oid_s);
if (!session->gssapi->client.oid) { if (!session->gssapi->client.oid) {
ssh_set_error(session, SSH_FATAL, "Invalid OID"); ssh_set_error(session, SSH_FATAL, "Invalid OID");
goto error; goto error;
@@ -984,7 +984,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_gssapi_token_client){
"accepting token", "accepting token",
maj_stat, maj_stat,
min_stat); min_stat);
ssh_string_free(token); SSH_STRING_FREE(token);
if (GSS_ERROR(maj_stat)){ if (GSS_ERROR(maj_stat)){
ssh_gssapi_log_error(SSH_LOG_PROTOCOL, ssh_gssapi_log_error(SSH_LOG_PROTOCOL,
"Gssapi error", "Gssapi error",