kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Run indent-all script.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/rdesktop/trunk@1721 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Henrik Andersson 2013-06-20 12:57:00 +00:00
parent e6b10f6bcb
commit adbb6cf0fc
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cssp.c
View File

@ -36,7 +36,7 @@ s_realloc(STREAM s, unsigned int size)
{
unsigned char *data;
if(s->size >= size)
if (s->size >= size)
return;
data = s->data;
@ -263,7 +263,7 @@ cssp_encode_tspasswordcreds(char *username, char *password, char *domain)
memset(&message, 0, sizeof(message));
// domainName [0]
s_realloc(&tmp, strlen(domain)*sizeof(uint16));
s_realloc(&tmp, strlen(domain) * sizeof(uint16));
s_reset(&tmp);
for (i = 0; i < strlen(domain); i++)
out_uint16_le(&tmp, domain[i]);
@ -277,7 +277,7 @@ cssp_encode_tspasswordcreds(char *username, char *password, char *domain)
s_free(h1);
// userName [1]
s_realloc(&tmp, strlen(username)*sizeof(uint16));
s_realloc(&tmp, strlen(username) * sizeof(uint16));
s_reset(&tmp);
for (i = 0; i < strlen(username); i++)
out_uint16_le(&tmp, username[i]);
@ -291,7 +291,7 @@ cssp_encode_tspasswordcreds(char *username, char *password, char *domain)
s_free(h1);
// password [2]
s_realloc(&tmp, strlen(password)*sizeof(uint16));
s_realloc(&tmp, strlen(password) * sizeof(uint16));
s_reset(&tmp);
for (i = 0; i < strlen(password); i++)
out_uint16_le(&tmp, password[i]);
@ -593,7 +593,7 @@ cssp_send_tsrequest(STREAM token, STREAM auth, STREAM pubkey)
h3 = ber_wrap_hdr_data(BER_TAG_SEQUENCE | BER_TAG_CONSTRUCTED, h4);
h2 = ber_wrap_hdr_data(BER_TAG_SEQUENCE | BER_TAG_CONSTRUCTED, h3);
h1 = ber_wrap_hdr_data(BER_TAG_CTXT_SPECIFIC | BER_TAG_CONSTRUCTED | 1, h2);
s_realloc(&message, s_length(&message) + s_length(h1));
s_realloc(&message, s_length(&message) + s_length(h1));
out_uint8p(&message, h1->data, s_length(h1));
s_mark_end(&message);
s_free(h5);
@ -609,7 +609,7 @@ cssp_send_tsrequest(STREAM token, STREAM auth, STREAM pubkey)
h2 = ber_wrap_hdr_data(BER_TAG_OCTET_STRING, auth);
h1 = ber_wrap_hdr_data(BER_TAG_CTXT_SPECIFIC | BER_TAG_CONSTRUCTED | 2, h2);
s_realloc(&message, s_length(&message) + s_length(h1));
s_realloc(&message, s_length(&message) + s_length(h1));
out_uint8p(&message, h1->data, s_length(h1));
s_free(h2);
@ -622,7 +622,7 @@ cssp_send_tsrequest(STREAM token, STREAM auth, STREAM pubkey)
h2 = ber_wrap_hdr_data(BER_TAG_OCTET_STRING, pubkey);
h1 = ber_wrap_hdr_data(BER_TAG_CTXT_SPECIFIC | BER_TAG_CONSTRUCTED | 3, h2);
s_realloc(&message, s_length(&message) + s_length(h1));
s_realloc(&message, s_length(&message) + s_length(h1));
out_uint8p(&message, h1->data, s_length(h1));
s_mark_end(&message);
s_free(h2);
@ -915,7 +915,7 @@ cssp_connect(char *server, char *user, char *domain, char *password, STREAM s)
return True;
bail_out:
bail_out:
xfree(token.data);
return False;
}

8
rdesktop.c
View File

@ -1113,7 +1113,8 @@ main(int argc, char *argv[])
/* check if auto reconnect cookie has timed out */
if (time(NULL) - g_reconnect_random_ts > RECONNECT_TIMEOUT)
{
fprintf(stderr, "Tried to reconnect for %d minutes, giving up.\n", RECONNECT_TIMEOUT/60);
fprintf(stderr, "Tried to reconnect for %d minutes, giving up.\n",
RECONNECT_TIMEOUT / 60);
return EX_PROTOCOL;
}
@ -1155,8 +1156,9 @@ main(int argc, char *argv[])
/* handle network error and start autoreconnect */
if (g_network_error)
{
fprintf(stderr, "Disconnected due to network error, retrying to reconnect for %d minutes.\n",
RECONNECT_TIMEOUT/60);
fprintf(stderr,
"Disconnected due to network error, retrying to reconnect for %d minutes.\n",
RECONNECT_TIMEOUT / 60);
g_network_error = False;
g_reconnect_loop = True;
continue;

2
tcp.c
View File

@ -310,7 +310,7 @@ tcp_tls_connect(void)
/* create process context */
if (g_ssl_ctx == NULL)
{
g_ssl_ctx = SSL_CTX_new(TLSv1_client_method());
g_ssl_ctx = SSL_CTX_new(TLSv1_client_method());
if (g_ssl_ctx == NULL)
{
error("tcp_tls_connect: SSL_CTX_new() failed to create TLS v1.0 context\n");