diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-18 20:13:41 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-18 20:13:41 +0100 |
| commit | 8e4f704c6624c42093306918a8904e2159bde141 (patch) | |
| tree | 3dbacecdfbe9454d674ad469d89fb10d8eb0e521 /src | |
| parent | b2e68c20550fce629d9ebaf1fca5244d1e2ca517 (diff) | |
Bv2.1 8.7: CPLs with encrypted content must be signed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/verify.cc | 11 | ||||
| -rw-r--r-- | src/verify.h | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/verify.cc b/src/verify.cc index 58e777fb..3f15668f 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -1300,6 +1300,15 @@ dcp::verify ( } check_extension_metadata (cpl, notes); + + if (cpl->encrypted()) { + cxml::Document doc ("CompositionPlaylist"); + DCP_ASSERT (cpl->file()); + doc.read_file (cpl->file().get()); + if (!doc.optional_node_child("Signature")) { + notes.push_back ({VerificationNote::VERIFY_BV21_ERROR, VerificationNote::CPL_WITH_ENCRYPTED_CONTENT_NOT_SIGNED, cpl->file().get()}); + } + } } } @@ -1441,6 +1450,8 @@ dcp::note_to_string (dcp::VerificationNote note) return "The CPL metadata must contain <ExtensionMetadata>"; case dcp::VerificationNote::INVALID_EXTENSION_METADATA: return String::compose("The <ExtensionMetadata> is malformed in some way: %1", note.note().get()); + case dcp::VerificationNote::CPL_WITH_ENCRYPTED_CONTENT_NOT_SIGNED: + return String::compose("The CPL %1, which has encrypted content, is not signed", note.file()->filename()); } return ""; diff --git a/src/verify.h b/src/verify.h index 60100435..833efa72 100644 --- a/src/verify.h +++ b/src/verify.h @@ -173,6 +173,8 @@ public: MISSING_EXTENSION_METADATA, /** <ExtensionMetadata> must have a particular form Bv2.1_8.6.3 */ INVALID_EXTENSION_METADATA, + /** CPLs containing encrypted content must be signed Bv2.1_8.7 */ + CPL_WITH_ENCRYPTED_CONTENT_NOT_SIGNED }; VerificationNote (Type type, Code code) |