diff --git a/libfreerdp/core/gcc.c b/libfreerdp/core/gcc.c index 20a483d4f..e655342cb 100644 --- a/libfreerdp/core/gcc.c +++ b/libfreerdp/core/gcc.c @@ -339,8 +339,8 @@ static DWORD rdp_version_common(wLog* log, DWORD serverVersion, DWORD clientVers */ static const BYTE t124_02_98_oid[6] = { 0, 0, 20, 124, 0, 1 }; -static const BYTE h221_cs_key[4] = "Duca"; -static const BYTE h221_sc_key[4] = "McDn"; +static const BYTE h221_cs_key[4] = { 'D', 'u', 'c', 'a' }; +static const BYTE h221_sc_key[4] = { 'M', 'c', 'D', 'n' }; /** * Read a GCC Conference Create Request. diff --git a/libfreerdp/core/mcs.c b/libfreerdp/core/mcs.c index dc0a990ea..dcbbde009 100644 --- a/libfreerdp/core/mcs.c +++ b/libfreerdp/core/mcs.c @@ -166,8 +166,8 @@ * */ -static const BYTE callingDomainSelector[1] = "\x01"; -static const BYTE calledDomainSelector[1] = "\x01"; +static const BYTE callingDomainSelector[1] = { 0x01 }; +static const BYTE calledDomainSelector[1] = { 0x01 }; /* static const char* const mcs_result_enumerated[] = diff --git a/libfreerdp/core/security.c b/libfreerdp/core/security.c index af67bd737..cd6e26af7 100644 --- a/libfreerdp/core/security.c +++ b/libfreerdp/core/security.c @@ -33,19 +33,17 @@ static const BYTE BB[] = { 'B', 'B' }; static const BYTE CCC[] = { 'C', 'C', 'C' }; /* 0x36 repeated 40 times */ -static const BYTE pad1[40] = { "\x36\x36\x36\x36\x36\x36\x36\x36" - "\x36\x36\x36\x36\x36\x36\x36\x36" - "\x36\x36\x36\x36\x36\x36\x36\x36" - "\x36\x36\x36\x36\x36\x36\x36\x36" - "\x36\x36\x36\x36\x36\x36\x36\x36" }; +static const BYTE pad1[40] = { 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, + 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36 }; /* 0x5C repeated 48 times */ -static const BYTE pad2[48] = { "\x5C\x5C\x5C\x5C\x5C\x5C\x5C\x5C" - "\x5C\x5C\x5C\x5C\x5C\x5C\x5C\x5C" - "\x5C\x5C\x5C\x5C\x5C\x5C\x5C\x5C" - "\x5C\x5C\x5C\x5C\x5C\x5C\x5C\x5C" - "\x5C\x5C\x5C\x5C\x5C\x5C\x5C\x5C" - "\x5C\x5C\x5C\x5C\x5C\x5C\x5C\x5C" }; +static const BYTE pad2[48] = { 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, + 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, + 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, + 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, + 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C, 0x5C }; static const BYTE fips_reverse_table[256] = { 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0, diff --git a/libfreerdp/core/utils.c b/libfreerdp/core/utils.c index 94074babd..78f3ca5f1 100644 --- a/libfreerdp/core/utils.c +++ b/libfreerdp/core/utils.c @@ -320,7 +320,7 @@ const char* utils_is_vsock(const char* hostname) if (!hostname) return NULL; - const char vsock[8] = "vsock://"; + const char vsock[8] = { 'v', 's', 'o', 'c', 'k', ':', '/', '/' }; if (strncmp(hostname, vsock, sizeof(vsock)) == 0) return &hostname[sizeof(vsock)]; return NULL;