fix some warnings
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@1239 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
parent
6fa3105441
commit
1ea625c969
4
disk.c
4
disk.c
@ -1016,13 +1016,13 @@ FsVolumeInfo(char *fpath)
|
|||||||
info.serial =
|
info.serial =
|
||||||
(buf[42] << 24) + (buf[41] << 16) +
|
(buf[42] << 24) + (buf[41] << 16) +
|
||||||
(buf[40] << 8) + buf[39];
|
(buf[40] << 8) + buf[39];
|
||||||
strncpy(info.label, buf + 43, 10);
|
strncpy(info.label, (char*)buf + 43, 10);
|
||||||
info.label[10] = '\0';
|
info.label[10] = '\0';
|
||||||
}
|
}
|
||||||
else if (lseek(fd, 32767, SEEK_SET) >= 0) /* ISO9660 */
|
else if (lseek(fd, 32767, SEEK_SET) >= 0) /* ISO9660 */
|
||||||
{
|
{
|
||||||
read(fd, buf, sizeof(buf));
|
read(fd, buf, sizeof(buf));
|
||||||
strncpy(info.label, buf + 41, 32);
|
strncpy(info.label, (char*)buf + 41, 32);
|
||||||
info.label[32] = '\0';
|
info.label[32] = '\0';
|
||||||
/* info.Serial = (buf[128]<<24)+(buf[127]<<16)+(buf[126]<<8)+buf[125]; */
|
/* info.Serial = (buf[128]<<24)+(buf[127]<<16)+(buf[126]<<8)+buf[125]; */
|
||||||
}
|
}
|
||||||
|
@ -225,7 +225,7 @@ licence_parse_authreq(STREAM s, uint8 ** token, uint8 ** signature)
|
|||||||
static void
|
static void
|
||||||
licence_process_authreq(STREAM s)
|
licence_process_authreq(STREAM s)
|
||||||
{
|
{
|
||||||
uint8 *in_token, *in_sig;
|
uint8 *in_token = NULL, *in_sig;
|
||||||
uint8 out_token[LICENCE_TOKEN_SIZE], decrypt_token[LICENCE_TOKEN_SIZE];
|
uint8 out_token[LICENCE_TOKEN_SIZE], decrypt_token[LICENCE_TOKEN_SIZE];
|
||||||
uint8 hwid[LICENCE_HWID_SIZE], crypt_hwid[LICENCE_HWID_SIZE];
|
uint8 hwid[LICENCE_HWID_SIZE], crypt_hwid[LICENCE_HWID_SIZE];
|
||||||
uint8 sealed_buffer[LICENCE_TOKEN_SIZE + LICENCE_HWID_SIZE];
|
uint8 sealed_buffer[LICENCE_TOKEN_SIZE + LICENCE_HWID_SIZE];
|
||||||
|
2
secure.c
2
secure.c
@ -726,7 +726,7 @@ sec_parse_crypt_info(STREAM s, uint32 * rc4_key_size,
|
|||||||
static void
|
static void
|
||||||
sec_process_crypt_info(STREAM s)
|
sec_process_crypt_info(STREAM s)
|
||||||
{
|
{
|
||||||
uint8 *server_random, *modulus, *exponent;
|
uint8 *server_random, *modulus = NULL, *exponent = NULL;
|
||||||
uint8 client_random[SEC_RANDOM_SIZE];
|
uint8 client_random[SEC_RANDOM_SIZE];
|
||||||
uint32 rc4_key_size;
|
uint32 rc4_key_size;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user