diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-02-14 16:30:19 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-02-14 16:30:19 +0000 |
| commit | b8ae635ba057c68eb1d883e62df353f73def3c57 (patch) | |
| tree | c8e0b4118a10e19b89bfe30b672e0a362112da19 /src | |
| parent | 297de9fa11c6cc296be22b227b33dcd13e2b0462 (diff) | |
Check SMPTE structure ID when reading KDMs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/decrypted_kdm.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc index 96d5f225..7113afb8 100644 --- a/src/decrypted_kdm.cc +++ b/src/decrypted_kdm.cc @@ -61,6 +61,9 @@ using boost::shared_ptr; using boost::optional; using namespace dcp; +/* Magic value specified by SMPTE S430-1-2006 */ +static uint8_t smpte_structure_id[] = { 0xf1, 0xdc, 0x12, 0x44, 0x60, 0x16, 0x9a, 0x0e, 0x85, 0xbc, 0x30, 0x06, 0x42, 0xf8, 0x66, 0xab }; + static void put (uint8_t ** d, string s) { @@ -174,6 +177,7 @@ DecryptedKDM::DecryptedKDM (EncryptedKDM const & kdm, string private_key) { /* SMPTE */ /* 0 is structure id (fixed sequence specified by standard) [16 bytes] */ + DCP_ASSERT (memcmp (p, smpte_structure_id, 16) == 0); p += 16; /* 16 is is signer thumbprint [20 bytes] */ p += 20; @@ -303,9 +307,7 @@ DecryptedKDM::encrypt (shared_ptr<const CertificateChain> signer, Certificate re uint8_t block[138]; uint8_t* p = block; - /* Magic value specified by SMPTE S430-1-2006 */ - uint8_t structure_id[] = { 0xf1, 0xdc, 0x12, 0x44, 0x60, 0x16, 0x9a, 0x0e, 0x85, 0xbc, 0x30, 0x06, 0x42, 0xf8, 0x66, 0xab }; - put (&p, structure_id, 16); + put (&p, smpte_structure_id, 16); base64_decode (signer->leaf().thumbprint (), p, 20); p += 20; |