Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
33ca5c1f by Steve Lhomme at 2026-02-04T08:31:11+00:00
srtp-aes: turn string of binary data into an array of values
Only sizeof() and memcmp() are used with these strings.
- - - - -
1 changed file:
- modules/access/rtp/test/srtp-aes.c
Changes:
=====================================
modules/access/rtp/test/srtp-aes.c
=====================================
@@ -37,21 +37,21 @@ static void fatal (const char *msg)
static void test_derivation (void)
{
static const uint8_t key[16] =
- "\xE1\xF9\x7A\x0D\x3E\x01\x8B\xE0\xD6\x4F\xA3\x2C\x06\xDE\x41\x39";
+ {0xE1, 0xF9, 0x7A, 0x0D, 0x3E, 0x01, 0x8B, 0xE0, 0xD6, 0x4F, 0xA3,
0x2C, 0x06, 0xDE, 0x41, 0x39 };
static const uint8_t salt[14] =
- "\x0E\xC6\x75\xAD\x49\x8A\xFE\xEB\xB6\x96\x0B\x3A\xAB\xE6";
+ {0x0E, 0xC6, 0x75, 0xAD, 0x49, 0x8A, 0xFE, 0xEB, 0xB6, 0x96, 0x0B,
0x3A, 0xAB, 0xE6 };
static const uint8_t good_cipher[16] =
- "\xC6\x1E\x7A\x93\x74\x4F\x39\xEE\x10\x73\x4A\xFE\x3F\xF7\xA0\x87";
+ {0xC6, 0x1E, 0x7A, 0x93, 0x74, 0x4F, 0x39, 0xEE, 0x10, 0x73, 0x4A,
0xFE, 0x3F, 0xF7, 0xA0, 0x87 };
static const uint8_t good_salt[14] =
- "\x30\xCB\xBC\x08\x86\x3D\x8C\x85\xD4\x9D\xB3\x4A\x9A\xE1";
+ {0x30, 0xCB, 0xBC, 0x08, 0x86, 0x3D, 0x8C, 0x85, 0xD4, 0x9D, 0xB3,
0x4A, 0x9A, 0xE1 };
static const uint8_t good_auth[94] =
- "\xCE\xBE\x32\x1F\x6F\xF7\x71\x6B\x6F\xD4\xAB\x49\xAF\x25\x6A\x15"
- "\x6D\x38\xBA\xA4\x8F\x0A\x0A\xCF\x3C\x34\xE2\x35\x9E\x6C\xDB\xCE"
- "\xE0\x49\x64\x6C\x43\xD9\x32\x7A\xD1\x75\x57\x8E\xF7\x22\x70\x98"
- "\x63\x71\xC1\x0C\x9A\x36\x9A\xC2\xF9\x4A\x8C\x5F\xBC\xDD\xDC\x25"
- "\x6D\x6E\x91\x9A\x48\xB6\x10\xEF\x17\xC2\x04\x1E\x47\x40\x35\x76"
- "\x6B\x68\x64\x2C\x59\xBB\xFC\x2F\x34\xDB\x60\xDB\xDF\xB2";
+ {0xCE, 0xBE, 0x32, 0x1F, 0x6F, 0xF7, 0x71, 0x6B, 0x6F, 0xD4, 0xAB,
0x49, 0xAF, 0x25, 0x6A, 0x15,
+ 0x6D, 0x38, 0xBA, 0xA4, 0x8F, 0x0A, 0x0A, 0xCF, 0x3C, 0x34, 0xE2,
0x35, 0x9E, 0x6C, 0xDB, 0xCE,
+ 0xE0, 0x49, 0x64, 0x6C, 0x43, 0xD9, 0x32, 0x7A, 0xD1, 0x75, 0x57,
0x8E, 0xF7, 0x22, 0x70, 0x98,
+ 0x63, 0x71, 0xC1, 0x0C, 0x9A, 0x36, 0x9A, 0xC2, 0xF9, 0x4A, 0x8C,
0x5F, 0xBC, 0xDD, 0xDC, 0x25,
+ 0x6D, 0x6E, 0x91, 0x9A, 0x48, 0xB6, 0x10, 0xEF, 0x17, 0xC2, 0x04,
0x1E, 0x47, 0x40, 0x35, 0x76,
+ 0x6B, 0x68, 0x64, 0x2C, 0x59, 0xBB, 0xFC, 0x2F, 0x34, 0xDB, 0x60,
0xDB, 0xDF, 0xB2 };
static const uint8_t r[6] = { 0, 0, 0, 0, 0, 0 };
gcry_cipher_hd_t prf;
@@ -95,7 +95,7 @@ static void test_derivation (void)
static void test_keystream (void)
{
static const uint8_t key[16] =
- "\x2B\x7E\x15\x16\x28\xAE\xD2\xA6\xAB\xF7\x15\x88\x09\xCF\x4F\x3C";
+ {0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6, 0xAB, 0xF7, 0x15,
0x88, 0x09, 0xCF, 0x4F, 0x3C };
const uint32_t salt[4]=
{ htonl (0xf0f1f2f3), htonl (0xf4f5f6f7),
htonl (0xf8f9fafb), htonl (0xfcfd0000) };
@@ -122,13 +122,13 @@ static void test_keystream (void)
gcry_cipher_close (hd);
static const uint8_t good_start[48] =
- "\xE0\x3E\xAD\x09\x35\xC9\x5E\x80\xE1\x66\xB1\x6D\xD9\x2B\x4E\xB4"
- "\xD2\x35\x13\x16\x2B\x02\xD0\xF7\x2A\x43\xA2\xFE\x4A\x5F\x97\xAB"
- "\x41\xE9\x5B\x3B\xB0\xA2\xE8\xDD\x47\x79\x01\xE4\xFC\xA8\x94\xC0";
+ {0xE0, 0x3E, 0xAD, 0x09, 0x35, 0xC9, 0x5E, 0x80, 0xE1, 0x66, 0xB1,
0x6D, 0xD9, 0x2B, 0x4E, 0xB4,
+ 0xD2, 0x35, 0x13, 0x16, 0x2B, 0x02, 0xD0, 0xF7, 0x2A, 0x43, 0xA2,
0xFE, 0x4A, 0x5F, 0x97, 0xAB,
+ 0x41, 0xE9, 0x5B, 0x3B, 0xB0, 0xA2, 0xE8, 0xDD, 0x47, 0x79, 0x01,
0xE4, 0xFC, 0xA8, 0x94, 0xC0 };
static const uint8_t good_end[48] =
- "\xEC\x8C\xDF\x73\x98\x60\x7C\xB0\xF2\xD2\x16\x75\xEA\x9E\xA1\xE4"
- "\x36\x2B\x7C\x3C\x67\x73\x51\x63\x18\xA0\x77\xD7\xFC\x50\x73\xAE"
- "\x6A\x2C\xC3\x78\x78\x89\x37\x4F\xBE\xB4\xC8\x1B\x17\xBA\x6C\x44";
+ {0xEC, 0x8C, 0xDF, 0x73, 0x98, 0x60, 0x7C, 0xB0, 0xF2, 0xD2, 0x16,
0x75, 0xEA, 0x9E, 0xA1, 0xE4,
+ 0x36, 0x2B, 0x7C, 0x3C, 0x67, 0x73, 0x51, 0x63, 0x18, 0xA0, 0x77,
0xD7, 0xFC, 0x50, 0x73, 0xAE,
+ 0x6A, 0x2C, 0xC3, 0x78, 0x78, 0x89, 0x37, 0x4F, 0xBE, 0xB4, 0xC8,
0x1B, 0x17, 0xBA, 0x6C, 0x44 };
printf (" key stream: ");
printhex (buf, sizeof (good_start));
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/33ca5c1f9b145f570ac092c48aabb341b7d61eae
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/33ca5c1f9b145f570ac092c48aabb341b7d61eae
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
