|
@@ -48,7 +48,7 @@ static int check_gss_err(struct SessionHandle *data,
|
|
|
const char* function)
|
|
|
{
|
|
|
if(GSS_ERROR(major_status)) {
|
|
|
- OM_uint32 maj_stat,min_stat;
|
|
|
+ OM_uint32 maj_stat, min_stat;
|
|
|
OM_uint32 msg_ctx = 0;
|
|
|
gss_buffer_desc status_string;
|
|
|
char buf[1024];
|
|
@@ -131,7 +131,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
|
|
|
*/
|
|
|
|
|
|
/* prepare service name */
|
|
|
- if(strchr(serviceptr,'/')) {
|
|
|
+ if(strchr(serviceptr, '/')) {
|
|
|
service.value = malloc(strlen(serviceptr));
|
|
|
if(!service.value)
|
|
|
return CURLE_OUT_OF_MEMORY;
|
|
@@ -155,8 +155,8 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
|
|
|
|
|
|
gss_release_buffer(&gss_status, &service); /* clear allocated memory */
|
|
|
|
|
|
- if(check_gss_err(data,gss_major_status,
|
|
|
- gss_minor_status,"gss_import_name()")) {
|
|
|
+ if(check_gss_err(data, gss_major_status,
|
|
|
+ gss_minor_status, "gss_import_name()")) {
|
|
|
failf(data, "Failed to create service name.");
|
|
|
gss_release_name(&gss_status, &server);
|
|
|
return CURLE_COULDNT_CONNECT;
|
|
@@ -178,8 +178,8 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
|
|
|
|
|
|
if(gss_token != GSS_C_NO_BUFFER)
|
|
|
gss_release_buffer(&gss_status, &gss_recv_token);
|
|
|
- if(check_gss_err(data,gss_major_status,
|
|
|
- gss_minor_status,"gss_init_sec_context")) {
|
|
|
+ if(check_gss_err(data, gss_major_status,
|
|
|
+ gss_minor_status, "gss_init_sec_context")) {
|
|
|
gss_release_name(&gss_status, &server);
|
|
|
gss_release_buffer(&gss_status, &gss_recv_token);
|
|
|
gss_release_buffer(&gss_status, &gss_send_token);
|
|
@@ -192,7 +192,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
|
|
|
socksreq[0] = 1; /* GSS-API subnegotiation version */
|
|
|
socksreq[1] = 1; /* authentication message type */
|
|
|
us_length = htons((short)gss_send_token.length);
|
|
|
- memcpy(socksreq+2,&us_length,sizeof(short));
|
|
|
+ memcpy(socksreq+2, &us_length, sizeof(short));
|
|
|
|
|
|
code = Curl_write_plain(conn, sock, (char *)socksreq, 4, &written);
|
|
|
if(code || (4 != written)) {
|
|
@@ -291,8 +291,8 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
|
|
|
gss_major_status = gss_inquire_context (&gss_minor_status, gss_context,
|
|
|
&gss_client_name, NULL, NULL, NULL,
|
|
|
NULL, NULL, NULL);
|
|
|
- if(check_gss_err(data,gss_major_status,
|
|
|
- gss_minor_status,"gss_inquire_context")) {
|
|
|
+ if(check_gss_err(data, gss_major_status,
|
|
|
+ gss_minor_status, "gss_inquire_context")) {
|
|
|
gss_delete_sec_context(&gss_status, &gss_context, NULL);
|
|
|
gss_release_name(&gss_status, &gss_client_name);
|
|
|
failf(data, "Failed to determine user name.");
|
|
@@ -300,8 +300,8 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
|
|
|
}
|
|
|
gss_major_status = gss_display_name(&gss_minor_status, gss_client_name,
|
|
|
&gss_send_token, NULL);
|
|
|
- if(check_gss_err(data,gss_major_status,
|
|
|
- gss_minor_status,"gss_display_name")) {
|
|
|
+ if(check_gss_err(data, gss_major_status,
|
|
|
+ gss_minor_status, "gss_display_name")) {
|
|
|
gss_delete_sec_context(&gss_status, &gss_context, NULL);
|
|
|
gss_release_name(&gss_status, &gss_client_name);
|
|
|
gss_release_buffer(&gss_status, &gss_send_token);
|
|
@@ -372,7 +372,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
|
|
|
*/
|
|
|
if(data->set.socks5_gssapi_nec) {
|
|
|
us_length = htons((short)1);
|
|
|
- memcpy(socksreq+2,&us_length,sizeof(short));
|
|
|
+ memcpy(socksreq+2, &us_length, sizeof(short));
|
|
|
}
|
|
|
else {
|
|
|
gss_send_token.length = 1;
|
|
@@ -387,7 +387,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
|
|
|
GSS_C_QOP_DEFAULT, &gss_send_token,
|
|
|
&gss_conf_state, &gss_w_token);
|
|
|
|
|
|
- if(check_gss_err(data,gss_major_status,gss_minor_status,"gss_wrap")) {
|
|
|
+ if(check_gss_err(data, gss_major_status, gss_minor_status, "gss_wrap")) {
|
|
|
gss_release_buffer(&gss_status, &gss_send_token);
|
|
|
gss_release_buffer(&gss_status, &gss_w_token);
|
|
|
gss_delete_sec_context(&gss_status, &gss_context, NULL);
|
|
@@ -397,7 +397,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
|
|
|
gss_release_buffer(&gss_status, &gss_send_token);
|
|
|
|
|
|
us_length = htons((short)gss_w_token.length);
|
|
|
- memcpy(socksreq+2,&us_length,sizeof(short));
|
|
|
+ memcpy(socksreq+2, &us_length, sizeof(short));
|
|
|
}
|
|
|
|
|
|
code = Curl_write_plain(conn, sock, (char *)socksreq, 4, &written);
|
|
@@ -475,7 +475,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
|
|
|
&gss_recv_token, &gss_w_token,
|
|
|
0, GSS_C_QOP_DEFAULT);
|
|
|
|
|
|
- if(check_gss_err(data,gss_major_status,gss_minor_status,"gss_unwrap")) {
|
|
|
+ if(check_gss_err(data, gss_major_status, gss_minor_status, "gss_unwrap")) {
|
|
|
gss_release_buffer(&gss_status, &gss_recv_token);
|
|
|
gss_release_buffer(&gss_status, &gss_w_token);
|
|
|
gss_delete_sec_context(&gss_status, &gss_context, NULL);
|
|
@@ -492,7 +492,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
|
|
|
return CURLE_COULDNT_CONNECT;
|
|
|
}
|
|
|
|
|
|
- memcpy(socksreq,gss_w_token.value,gss_w_token.length);
|
|
|
+ memcpy(socksreq, gss_w_token.value, gss_w_token.length);
|
|
|
gss_release_buffer(&gss_status, &gss_w_token);
|
|
|
}
|
|
|
else {
|
|
@@ -504,7 +504,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
|
|
|
return CURLE_COULDNT_CONNECT;
|
|
|
}
|
|
|
|
|
|
- memcpy(socksreq,gss_recv_token.value,gss_recv_token.length);
|
|
|
+ memcpy(socksreq, gss_recv_token.value, gss_recv_token.length);
|
|
|
gss_release_buffer(&gss_status, &gss_recv_token);
|
|
|
}
|
|
|
|