mirrors
/
xrdp
mirror of https://github.com/neutrinolabs/xrdp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove compiler warning

This commit is contained in:
jsorg71 2007-09-15 08:14:49 +00:00
parent 9751b97a8f
commit 38ec8c903c
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libxrdp/xrdp_rdp.c
View File

@ -22,7 +22,8 @@
#include "libxrdp.h" #include "libxrdp.h"
static char g_unknown1[172] = /* some compilers need unsigned char to avoid warnings */
static tui8 g_unknown1[172] =
{ 0xff, 0x02, 0xb6, 0x00, 0x28, 0x00, 0x00, 0x00, { 0xff, 0x02, 0xb6, 0x00, 0x28, 0x00, 0x00, 0x00,
0x27, 0x00, 0x27, 0x00, 0x03, 0x00, 0x04, 0x00, 0x27, 0x00, 0x27, 0x00, 0x03, 0x00, 0x04, 0x00,
0x00, 0x00, 0x26, 0x00, 0x01, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x26, 0x00, 0x01, 0x00, 0x1e, 0x00,
@ -46,8 +47,9 @@ static char g_unknown1[172] =
0x29, 0x00, 0x01, 0x00, 0x2a, 0x00, 0x05, 0x00, 0x29, 0x00, 0x01, 0x00, 0x2a, 0x00, 0x05, 0x00,
0x2b, 0x00, 0x2a, 0x00 }; 0x2b, 0x00, 0x2a, 0x00 };
/* some compilers need unsigned char to avoid warnings */
/* /*
static char g_unknown2[8] = static tui8 g_unknown2[8] =
{ 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x04, 0x00 }; { 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x04, 0x00 };
*/ */

23
libxrdp/xrdp_sec.c
View File

@ -22,17 +22,20 @@
#include "libxrdp.h" #include "libxrdp.h"
static char g_pad_54[40] = /* some compilers need unsigned char to avoid warnings */
static tui8 g_pad_54[40] =
{ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, { 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
54, 54, 54, 54, 54, 54, 54, 54 }; 54, 54, 54, 54, 54, 54, 54, 54 };
static char g_pad_92[48] = /* some compilers need unsigned char to avoid warnings */
static tui8 g_pad_92[48] =
{ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, { 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92 }; 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, 92 };
static char g_lic1[322] = /* some compilers need unsigned char to avoid warnings */
static tui8 g_lic1[322] =
{ 0x80, 0x00, 0x3e, 0x01, 0x01, 0x02, 0x3e, 0x01, { 0x80, 0x00, 0x3e, 0x01, 0x01, 0x02, 0x3e, 0x01,
0x7b, 0x3c, 0x31, 0xa6, 0xae, 0xe8, 0x74, 0xf6, 0x7b, 0x3c, 0x31, 0xa6, 0xae, 0xe8, 0x74, 0xf6,
0xb4, 0xa5, 0x03, 0x90, 0xe7, 0xc2, 0xc7, 0x39, 0xb4, 0xa5, 0x03, 0x90, 0xe7, 0xc2, 0xc7, 0x39,
@ -75,13 +78,15 @@ static char g_lic1[322] =
0x6f, 0x73, 0x6f, 0x66, 0x74, 0x2e, 0x63, 0x6f, 0x6f, 0x73, 0x6f, 0x66, 0x74, 0x2e, 0x63, 0x6f,
0x6d, 0x00 }; 0x6d, 0x00 };
static char g_lic2[20] = /* some compilers need unsigned char to avoid warnings */
static tui8 g_lic2[20] =
{ 0x80, 0x00, 0x10, 0x00, 0xff, 0x02, 0x10, 0x00, { 0x80, 0x00, 0x10, 0x00, 0xff, 0x02, 0x10, 0x00,
0x07, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
0x28, 0x14, 0x00, 0x00 }; 0x28, 0x14, 0x00, 0x00 };
/* mce */ /* mce */
static char g_lic3[20] = /* some compilers need unsigned char to avoid warnings */
static tui8 g_lic3[20] =
{ 0x80, 0x02, 0x10, 0x00, 0xff, 0x03, 0x10, 0x00, { 0x80, 0x02, 0x10, 0x00, 0xff, 0x03, 0x10, 0x00,
0x07, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
0xf3, 0x99, 0x00, 0x00 }; 0xf3, 0x99, 0x00, 0x00 };
@ -313,12 +318,12 @@ xrdp_sec_update(char* key, char* update_key, int key_len)
rc4_info = ssl_rc4_info_create(); rc4_info = ssl_rc4_info_create();
ssl_sha1_clear(sha1_info); ssl_sha1_clear(sha1_info);
ssl_sha1_transform(sha1_info, update_key, key_len); ssl_sha1_transform(sha1_info, update_key, key_len);
ssl_sha1_transform(sha1_info, g_pad_54, 40); ssl_sha1_transform(sha1_info, (char*)g_pad_54, 40);
ssl_sha1_transform(sha1_info, key, key_len); ssl_sha1_transform(sha1_info, key, key_len);
ssl_sha1_complete(sha1_info, shasig); ssl_sha1_complete(sha1_info, shasig);
ssl_md5_clear(md5_info); ssl_md5_clear(md5_info);
ssl_md5_transform(md5_info, update_key, key_len); ssl_md5_transform(md5_info, update_key, key_len);
ssl_md5_transform(md5_info, g_pad_92, 48); ssl_md5_transform(md5_info, (char*)g_pad_92, 48);
ssl_md5_transform(md5_info, shasig, 20); ssl_md5_transform(md5_info, shasig, 20);
ssl_md5_complete(md5_info, key); ssl_md5_complete(md5_info, key);
ssl_rc4_set_key(rc4_info, key, key_len); ssl_rc4_set_key(rc4_info, key, key_len);
@ -724,13 +729,13 @@ xrdp_sec_sign(struct xrdp_sec* self, char* out, int out_len,
md5_info = ssl_md5_info_create(); md5_info = ssl_md5_info_create();
ssl_sha1_clear(sha1_info); ssl_sha1_clear(sha1_info);
ssl_sha1_transform(sha1_info, self->sign_key, self->rc4_key_len); ssl_sha1_transform(sha1_info, self->sign_key, self->rc4_key_len);
ssl_sha1_transform(sha1_info, g_pad_54, 40); ssl_sha1_transform(sha1_info, (char*)g_pad_54, 40);
ssl_sha1_transform(sha1_info, lenhdr, 4); ssl_sha1_transform(sha1_info, lenhdr, 4);
ssl_sha1_transform(sha1_info, data, data_len); ssl_sha1_transform(sha1_info, data, data_len);
ssl_sha1_complete(sha1_info, shasig); ssl_sha1_complete(sha1_info, shasig);
ssl_md5_clear(md5_info); ssl_md5_clear(md5_info);
ssl_md5_transform(md5_info, self->sign_key, self->rc4_key_len); ssl_md5_transform(md5_info, self->sign_key, self->rc4_key_len);
ssl_md5_transform(md5_info, g_pad_92, 48); ssl_md5_transform(md5_info, (char*)g_pad_92, 48);
ssl_md5_transform(md5_info, shasig, 20); ssl_md5_transform(md5_info, shasig, 20);
ssl_md5_complete(md5_info, md5sig); ssl_md5_complete(md5_info, md5sig);
g_memcpy(out, md5sig, out_len); g_memcpy(out, md5sig, out_len);