Fix missing version string when Popen communicate returns byte strings.

[libdcp.git] / src / decrypted_kdm.cc

diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc
index 96d5f225430cb7d4b6880eb98eeceea4c5130ff4..0fa95f9a714399acd27927586a64d782faa82326 100644 (file)
--- 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)
 {
@@ -98,7 +101,11 @@ string
 DecryptedKDM::get_uuid (unsigned char ** p)
 {
        char buffer[37];
+#ifdef LIBDCP_WINDOWS
+       __mingw_snprintf (
+#else
        snprintf (
+#endif
                buffer, sizeof(buffer), "%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx",
                (*p)[0], (*p)[1], (*p)[2], (*p)[3], (*p)[4], (*p)[5], (*p)[6], (*p)[7],
                (*p)[8], (*p)[9], (*p)[10], (*p)[11], (*p)[12], (*p)[13], (*p)[14], (*p)[15]
@@ -146,7 +153,11 @@ DecryptedKDM::DecryptedKDM (EncryptedKDM const & kdm, string private_key)
                int const decrypted_len = RSA_private_decrypt (cipher_value_len, cipher_value, decrypted, rsa, RSA_PKCS1_OAEP_PADDING);
                if (decrypted_len == -1) {
                        delete[] decrypted;
-                       throw KDMDecryptionError (ERR_error_string (ERR_get_error(), 0));
+#if OPENSSL_VERSION_NUMBER > 0x10100000L
+                       throw KDMDecryptionError (ERR_error_string (ERR_get_error(), 0), cipher_value_len, RSA_bits(rsa));
+#else
+                       throw KDMDecryptionError (ERR_error_string (ERR_get_error(), 0), cipher_value_len, rsa->n->dmax);
+#endif
                }
 
                unsigned char* p = decrypted;
@@ -167,13 +178,14 @@ DecryptedKDM::DecryptedKDM (EncryptedKDM const & kdm, string private_key)
                        /* 93 is not-valid-after (a string) [25 bytes] */
                        p += 25;
                        /* 118 is the key [ASDCP::KeyLen bytes] */
-                       add_key (optional<string>(), key_id, Key (p), cpl_id);
+                       add_key (optional<string>(), key_id, Key (p), cpl_id, INTEROP);
                        break;
                }
                case 138:
                {
                        /* 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;
@@ -188,7 +200,7 @@ DecryptedKDM::DecryptedKDM (EncryptedKDM const & kdm, string private_key)
                        /* 97 is not-valid-after (a string) [25 bytes] */
                        p += 25;
                        /* 112 is the key [ASDCP::KeyLen bytes] */
-                       add_key (key_type, key_id, Key (p), cpl_id);
+                       add_key (key_type, key_id, Key (p), cpl_id, SMPTE);
                        break;
                }
                default:
@@ -238,7 +250,7 @@ DecryptedKDM::DecryptedKDM (
        , _issue_date (issue_date)
 {
        for (map<shared_ptr<const ReelMXF>, Key>::const_iterator i = keys.begin(); i != keys.end(); ++i) {
-               add_key (i->first->key_type(), i->first->key_id().get(), i->second, cpl_id);
+               add_key (i->first->key_type(), i->first->key_id().get(), i->second, cpl_id, SMPTE);
        }
 }
 
@@ -262,7 +274,7 @@ DecryptedKDM::DecryptedKDM (
        BOOST_FOREACH(shared_ptr<const ReelAsset> i, cpl->reel_assets ()) {
                shared_ptr<const ReelMXF> mxf = boost::dynamic_pointer_cast<const ReelMXF> (i);
                if (mxf && mxf->key_id ()) {
-                       add_key (mxf->key_type(), mxf->key_id().get(), key, cpl->id ());
+                       add_key (mxf->key_type(), mxf->key_id().get(), key, cpl->id(), SMPTE);
                        did_one = true;
                }
        }
@@ -278,9 +290,9 @@ DecryptedKDM::DecryptedKDM (
  *  @param cpl_id ID of CPL that the key is for.
  */
 void
-DecryptedKDM::add_key (optional<string> type, string key_id, Key key, string cpl_id)
+DecryptedKDM::add_key (optional<string> type, string key_id, Key key, string cpl_id, Standard standard)
 {
-       _keys.push_back (DecryptedKDMKey (type, key_id, key, cpl_id));
+       _keys.push_back (DecryptedKDMKey (type, key_id, key, cpl_id, standard));
 }
 
 void
@@ -290,8 +302,17 @@ DecryptedKDM::add_key (DecryptedKDMKey key)
 }
 
 EncryptedKDM
-DecryptedKDM::encrypt (shared_ptr<const CertificateChain> signer, Certificate recipient, vector<Certificate> trusted_devices, Formulation formulation) const
+DecryptedKDM::encrypt (
+       shared_ptr<const CertificateChain> signer,
+       Certificate recipient,
+       vector<Certificate> trusted_devices,
+       Formulation formulation,
+       bool disable_forensic_marking_picture,
+       optional<int> disable_forensic_marking_audio
+       ) const
 {
+       DCP_ASSERT (!_keys.empty ());
+
        list<pair<string, string> > key_ids;
        list<string> keys;
        BOOST_FOREACH (DecryptedKDMKey const & i, _keys) {
@@ -303,9 +324,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;
@@ -355,6 +374,8 @@ DecryptedKDM::encrypt (shared_ptr<const CertificateChain> signer, Certificate re
                _not_valid_before,
                _not_valid_after,
                formulation,
+               disable_forensic_marking_picture,
+               disable_forensic_marking_audio,
                key_ids,
                keys
                );