moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

spnego: Small code tidy up

Browse Source 
* Prefer dereference of string pointer rather than strlen()
* Free challenge pointer in one place
* Additional comments
This commit is contained in:
Steve Holme 2016-04-03 17:32:10 +01:00
parent 1d451bdd99
commit 7a7cdf264d
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/vauth/spnego_gssapi.c
View File

@ -87,8 +87,8 @@ CURLcode Curl_auth_decode_spnego_message(struct SessionHandle *data,
return CURLE_LOGIN_DENIED; return CURLE_LOGIN_DENIED;
} }
/* Generate our SPN */
if(!nego->spn) { if(!nego->spn) {
/* Generate our SPN */
char *spn = Curl_auth_build_gssapi_spn(service, host); char *spn = Curl_auth_build_gssapi_spn(service, host);
if(!spn) if(!spn)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
@ -113,7 +113,7 @@ CURLcode Curl_auth_decode_spnego_message(struct SessionHandle *data,
free(spn); free(spn);
} }
if(chlg64 && strlen(chlg64)) { if(chlg64 && *chlg64) {
/* Decode the base-64 encoded challenge message */ /* Decode the base-64 encoded challenge message */
if(*chlg64 != '=') { if(*chlg64 != '=') {
result = Curl_base64_decode(chlg64, &chlg, &chlglen); result = Curl_base64_decode(chlg64, &chlg, &chlglen);
@ -144,6 +144,8 @@ CURLcode Curl_auth_decode_spnego_message(struct SessionHandle *data,
&output_token, &output_token,
TRUE, TRUE,
NULL); NULL);
/* Free the decoded challenge as it is not required anymore */
Curl_safefree(input_token.value); Curl_safefree(input_token.value);
nego->status = major_status; nego->status = major_status;

13
lib/vauth/spnego_sspi.c
View File

@ -88,8 +88,8 @@ CURLcode Curl_auth_decode_spnego_message(struct SessionHandle *data,
return CURLE_LOGIN_DENIED; return CURLE_LOGIN_DENIED;
} }
/* Generate our SPN */
if(!nego->spn) { if(!nego->spn) {
/* Generate our SPN */
nego->spn = Curl_auth_build_spn(service, host); nego->spn = Curl_auth_build_spn(service, host);
if(!nego->spn) if(!nego->spn)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
@ -115,6 +115,7 @@ CURLcode Curl_auth_decode_spnego_message(struct SessionHandle *data,
} }
if(!nego->credentials) { if(!nego->credentials) {
/* Do we have credientials to use or are we using single sign-on? */
if(user && *user) { if(user && *user) {
/* Populate our identity structure */ /* Populate our identity structure */
result = Curl_create_sspi_identity(user, password, &nego->identity); result = Curl_create_sspi_identity(user, password, &nego->identity);
@ -153,7 +154,7 @@ CURLcode Curl_auth_decode_spnego_message(struct SessionHandle *data,
memset(nego->context, 0, sizeof(CtxtHandle)); memset(nego->context, 0, sizeof(CtxtHandle));
} }
if(chlg64 && strlen(chlg64)) { if(chlg64 && *chlg64) {
/* Decode the base-64 encoded challenge message */ /* Decode the base-64 encoded challenge message */
if(*chlg64 != '=') { if(*chlg64 != '=') {
result = Curl_base64_decode(chlg64, &chlg, &chlglen); result = Curl_base64_decode(chlg64, &chlg, &chlglen);
@ -197,8 +198,10 @@ CURLcode Curl_auth_decode_spnego_message(struct SessionHandle *data,
&resp_desc, &attrs, &resp_desc, &attrs,
&expiry); &expiry);
if(GSS_ERROR(nego->status)) { /* Free the decoded challenge as it is not required anymore */
free(chlg); free(chlg);
if(GSS_ERROR(nego->status)) {
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
} }
@ -206,16 +209,12 @@ CURLcode Curl_auth_decode_spnego_message(struct SessionHandle *data,
nego->status == SEC_I_COMPLETE_AND_CONTINUE) { nego->status == SEC_I_COMPLETE_AND_CONTINUE) {
nego->status = s_pSecFn->CompleteAuthToken(nego->context, &resp_desc); nego->status = s_pSecFn->CompleteAuthToken(nego->context, &resp_desc);
if(GSS_ERROR(nego->status)) { if(GSS_ERROR(nego->status)) {
free(chlg);
return CURLE_RECV_ERROR; return CURLE_RECV_ERROR;
} }
} }
nego->output_token_length = resp_buf.cbBuffer; nego->output_token_length = resp_buf.cbBuffer;
/* Free the decoded challenge */
free(chlg);
return result; return result;
} }