moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

socks_sspi.c: Clean up and removal of obsolete minor status

Browse Source 
Removed obsolete minor status variable and parameter of status function
which was never used or set at all. Also Curl_sspi_strerror does support
only one status and there is no need for a second sub status.
This commit is contained in:
Marc Hoersken 2012-06-12 08:50:10 +02:00 committed by Yang Tse
parent 7bf910482e
commit 38f05cea46
1 changed files with 30 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
lib/socks_sspi.c
View File

@ -51,18 +51,15 @@
* Helper sspi error functions. * Helper sspi error functions.
*/ */
static int check_sspi_err(struct connectdata *conn, static int check_sspi_err(struct connectdata *conn,
SECURITY_STATUS major_status, SECURITY_STATUS status,
SECURITY_STATUS minor_status,
const char* function) const char* function)
{ {
(void)minor_status; if(status != SEC_E_OK &&
status != SEC_I_COMPLETE_AND_CONTINUE &&
if(major_status != SEC_E_OK && status != SEC_I_COMPLETE_NEEDED &&
major_status != SEC_I_COMPLETE_AND_CONTINUE && status != SEC_I_CONTINUE_NEEDED) {
major_status != SEC_I_COMPLETE_NEEDED &&
major_status != SEC_I_CONTINUE_NEEDED) {
failf(conn->data, "SSPI error: %s failed: %s\n", function, failf(conn->data, "SSPI error: %s failed: %s\n", function,
Curl_sspi_strerror(conn, major_status)); Curl_sspi_strerror(conn, status));
return 1; return 1;
} }
return 0; return 0;
@ -79,8 +76,8 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
ssize_t written; ssize_t written;
int result; int result;
/* Needs GSSAPI authentication */ /* Needs GSSAPI authentication */
SECURITY_STATUS sspi_major_status, sspi_minor_status=0; SECURITY_STATUS sspi_status;
unsigned long sspi_ret_flags=0; unsigned long sspi_ret_flags = 0;
int gss_enc; int gss_enc;
SecBuffer sspi_send_token, sspi_recv_token, sspi_w_token[3]; SecBuffer sspi_send_token, sspi_recv_token, sspi_w_token[3];
SecBufferDesc input_desc, output_desc, wrap_desc; SecBufferDesc input_desc, output_desc, wrap_desc;
@ -90,7 +87,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
PCtxtHandle context_handle = NULL; PCtxtHandle context_handle = NULL;
SecPkgCredentials_Names names; SecPkgCredentials_Names names;
TimeStamp expiry; TimeStamp expiry;
char *service_name=NULL; char *service_name = NULL;
unsigned short us_length; unsigned short us_length;
ULONG qop; ULONG qop;
unsigned char socksreq[4]; /* room for gssapi exchange header only */ unsigned char socksreq[4]; /* room for gssapi exchange header only */
@ -142,8 +139,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
cred_handle.dwLower = 0; cred_handle.dwLower = 0;
cred_handle.dwUpper = 0; cred_handle.dwUpper = 0;
sspi_major_status = sspi_status = s_pSecFn->AcquireCredentialsHandleA( NULL,
s_pSecFn->AcquireCredentialsHandleA( NULL,
(char *)"Kerberos", (char *)"Kerberos",
SECPKG_CRED_OUTBOUND, SECPKG_CRED_OUTBOUND,
NULL, NULL,
@ -153,8 +149,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
&cred_handle, &cred_handle,
&expiry); &expiry);
if(check_sspi_err(conn, sspi_major_status,sspi_minor_status, if(check_sspi_err(conn, sspi_status, "AcquireCredentialsHandleA")) {
"AcquireCredentialsHandleA") ) {
failf(data, "Failed to acquire credentials."); failf(data, "Failed to acquire credentials.");
free(service_name); free(service_name);
service_name=NULL; service_name=NULL;
@ -166,7 +161,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
/* errors, keep sending it... */ /* errors, keep sending it... */
for(;;) { for(;;) {
sspi_major_status = s_pSecFn->InitializeSecurityContextA( sspi_status = s_pSecFn->InitializeSecurityContextA(
&cred_handle, &cred_handle,
context_handle, context_handle,
service_name, service_name,
@ -189,8 +184,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
sspi_recv_token.cbBuffer = 0; sspi_recv_token.cbBuffer = 0;
} }
if(check_sspi_err(conn,sspi_major_status,sspi_minor_status, if(check_sspi_err(conn, sspi_status, "InitializeSecurityContextA")) {
"InitializeSecurityContextA") ) {
free(service_name); free(service_name);
service_name=NULL; service_name=NULL;
s_pSecFn->FreeCredentialsHandle(&cred_handle); s_pSecFn->FreeCredentialsHandle(&cred_handle);
@ -239,7 +233,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
s_pSecFn->FreeContextBuffer(sspi_recv_token.pvBuffer); s_pSecFn->FreeContextBuffer(sspi_recv_token.pvBuffer);
sspi_recv_token.pvBuffer = NULL; sspi_recv_token.pvBuffer = NULL;
sspi_recv_token.cbBuffer = 0; sspi_recv_token.cbBuffer = 0;
if(sspi_major_status != SEC_I_CONTINUE_NEEDED) break; if(sspi_status != SEC_I_CONTINUE_NEEDED) break;
/* analyse response */ /* analyse response */
@ -315,13 +309,11 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
service_name=NULL; service_name=NULL;
/* Everything is good so far, user was authenticated! */ /* Everything is good so far, user was authenticated! */
sspi_major_status = sspi_status = s_pSecFn->QueryCredentialsAttributes( &cred_handle,
s_pSecFn->QueryCredentialsAttributes( &cred_handle,
SECPKG_CRED_ATTR_NAMES, SECPKG_CRED_ATTR_NAMES,
&names); &names);
s_pSecFn->FreeCredentialsHandle(&cred_handle); s_pSecFn->FreeCredentialsHandle(&cred_handle);
if(check_sspi_err(conn,sspi_major_status,sspi_minor_status, if(check_sspi_err(conn, sspi_status, "QueryCredentialAttributes")) {
"QueryCredentialAttributes") ) {
s_pSecFn->DeleteSecurityContext(&sspi_context); s_pSecFn->DeleteSecurityContext(&sspi_context);
s_pSecFn->FreeContextBuffer(names.sUserName); s_pSecFn->FreeContextBuffer(names.sUserName);
failf(data, "Failed to determine user name."); failf(data, "Failed to determine user name.");
@ -383,11 +375,10 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
memcpy(socksreq+2, &us_length, sizeof(short)); memcpy(socksreq+2, &us_length, sizeof(short));
} }
else { else {
sspi_major_status = s_pSecFn->QueryContextAttributesA( &sspi_context, sspi_status = s_pSecFn->QueryContextAttributesA( &sspi_context,
SECPKG_ATTR_SIZES, SECPKG_ATTR_SIZES,
&sspi_sizes); &sspi_sizes);
if(check_sspi_err(conn,sspi_major_status,sspi_minor_status, if(check_sspi_err(conn, sspi_status, "QueryContextAttributesA")) {
"QueryContextAttributesA")) {
s_pSecFn->DeleteSecurityContext(&sspi_context); s_pSecFn->DeleteSecurityContext(&sspi_context);
failf(data, "Failed to query security context attributes."); failf(data, "Failed to query security context attributes.");
return CURLE_COULDNT_CONNECT; return CURLE_COULDNT_CONNECT;
@ -420,12 +411,11 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
s_pSecFn->DeleteSecurityContext(&sspi_context); s_pSecFn->DeleteSecurityContext(&sspi_context);
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
} }
sspi_major_status = s_pSecFn->EncryptMessage( &sspi_context, sspi_status = s_pSecFn->EncryptMessage( &sspi_context,
KERB_WRAP_NO_ENCRYPT, KERB_WRAP_NO_ENCRYPT,
&wrap_desc, &wrap_desc,
0); 0);
if(check_sspi_err(conn,sspi_major_status,sspi_minor_status, if(check_sspi_err(conn, sspi_status, "EncryptMessage")) {
"EncryptMessage") ) {
s_pSecFn->FreeContextBuffer(sspi_w_token[0].pvBuffer); s_pSecFn->FreeContextBuffer(sspi_w_token[0].pvBuffer);
s_pSecFn->FreeContextBuffer(sspi_w_token[1].pvBuffer); s_pSecFn->FreeContextBuffer(sspi_w_token[1].pvBuffer);
s_pSecFn->FreeContextBuffer(sspi_w_token[2].pvBuffer); s_pSecFn->FreeContextBuffer(sspi_w_token[2].pvBuffer);
@ -547,13 +537,12 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
sspi_w_token[1].cbBuffer = 0; sspi_w_token[1].cbBuffer = 0;
sspi_w_token[1].pvBuffer = NULL; sspi_w_token[1].pvBuffer = NULL;
sspi_major_status = s_pSecFn->DecryptMessage( &sspi_context, sspi_status = s_pSecFn->DecryptMessage( &sspi_context,
&wrap_desc, &wrap_desc,
0, 0,
&qop); &qop);
if(check_sspi_err(conn,sspi_major_status,sspi_minor_status, if(check_sspi_err(conn, sspi_status, "DecryptMessage")) {
"DecryptMessage")) {
s_pSecFn->FreeContextBuffer(sspi_w_token[0].pvBuffer); s_pSecFn->FreeContextBuffer(sspi_w_token[0].pvBuffer);
s_pSecFn->FreeContextBuffer(sspi_w_token[1].pvBuffer); s_pSecFn->FreeContextBuffer(sspi_w_token[1].pvBuffer);
s_pSecFn->DeleteSecurityContext(&sspi_context); s_pSecFn->DeleteSecurityContext(&sspi_context);