Hopefully make all tests stable enough to be run with --random,
authorCarl Hetherington <cth@carlh.net>
Sat, 11 Jul 2020 19:11:48 +0000 (21:11 +0200)
committerCarl Hetherington <cth@carlh.net>
Sat, 11 Jul 2020 19:11:48 +0000 (21:11 +0200)
stopping test reference churn.

37 files changed:
test/dcp_test.cc
test/encryption_test.cc
test/recovery_test.cc
test/ref/DCP/dcp_test2/ASSETMAP.xml
test/ref/DCP/dcp_test2/audio.mxf
test/ref/DCP/dcp_test2/cpl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml [deleted file]
test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml [new file with mode: 0644]
test/ref/DCP/dcp_test2/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml [new file with mode: 0644]
test/ref/DCP/dcp_test2/pkl_9f19589a-01e5-4093-b23b-a32e143e5956.xml [deleted file]
test/ref/DCP/dcp_test2/video.mxf
test/ref/DCP/dcp_test5/ASSETMAP.xml
test/ref/DCP/dcp_test5/audio.mxf
test/ref/DCP/dcp_test5/cpl_3a8a01d1-0e1c-4ff0-977d-63d32995a1fd.xml [deleted file]
test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml [new file with mode: 0644]
test/ref/DCP/dcp_test5/pkl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml [new file with mode: 0644]
test/ref/DCP/dcp_test5/pkl_7574c611-f8de-4d20-98c4-2eb7dc87080a.xml [deleted file]
test/ref/DCP/dcp_test5/video.mxf
test/ref/DCP/dcp_test7/ASSETMAP
test/ref/DCP/dcp_test7/audio.mxf
test/ref/DCP/dcp_test7/cpl_1d513f84-5856-4f91-a88a-4d452cc6a28a.xml [deleted file]
test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml [new file with mode: 0644]
test/ref/DCP/dcp_test7/pkl_a800aea0-904b-4bd0-9250-374fdb46528b.xml [deleted file]
test/ref/DCP/dcp_test7/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml [new file with mode: 0644]
test/ref/DCP/dcp_test7/video.mxf
test/ref/DCP/encryption_test/ASSETMAP.xml
test/ref/DCP/encryption_test/audio.mxf
test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml [new file with mode: 0644]
test/ref/DCP/encryption_test/cpl_b3eba4a0-f542-4937-b972-1cc4667ed01a.xml [deleted file]
test/ref/DCP/encryption_test/pkl_59730183-23bc-491e-906b-1dd453ff9d11.xml [deleted file]
test/ref/DCP/encryption_test/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml [new file with mode: 0644]
test/ref/DCP/encryption_test/video.mxf
test/ref/write_interop_subtitle_test3/ASSETMAP
test/ref/write_interop_subtitle_test3/subs.xml
test/test.cc
test/test.h
test/verify_test.cc
test/write_subtitle_test.cc

index 87879af777a6081c35a2969a2eea175d7fc0d8c5..54ecab00cf616e48d8244a9b506c6b8ad3435a10 100644 (file)
@@ -57,8 +57,6 @@ using boost::shared_ptr;
 static shared_ptr<dcp::DCP>
 make_simple (boost::filesystem::path path)
 {
-       Kumu::cth_test = true;
-
        /* Some known metadata */
        dcp::XMLMetadata xml_meta;
        xml_meta.annotation_text = "A Test DCP";
@@ -123,6 +121,8 @@ make_simple (boost::filesystem::path path)
 /** Test creation of a 2D SMPTE DCP from very simple inputs */
 BOOST_AUTO_TEST_CASE (dcp_test1)
 {
+       RNGFixer fixer;
+
        dcp::XMLMetadata xml_meta;
        xml_meta.annotation_text = "Created by libdcp";
        xml_meta.issuer = "OpenDCP 0.0.25";
@@ -135,7 +135,7 @@ BOOST_AUTO_TEST_CASE (dcp_test1)
 /** Test creation of a 3D DCP from very simple inputs */
 BOOST_AUTO_TEST_CASE (dcp_test2)
 {
-       Kumu::cth_test = true;
+       RNGFixer fix;
 
        /* Some known metadata */
        dcp::XMLMetadata xml_meta;
@@ -236,7 +236,7 @@ BOOST_AUTO_TEST_CASE (dcp_test4)
 /** Test creation of a 2D DCP with an Atmos track */
 BOOST_AUTO_TEST_CASE (dcp_test5)
 {
-       Kumu::cth_test = true;
+       RNGFixer fix;
 
        /* Some known metadata */
        dcp::XMLMetadata xml_meta;
@@ -325,6 +325,8 @@ BOOST_AUTO_TEST_CASE (dcp_test6)
 /** Test creation of a 2D Interop DCP from very simple inputs */
 BOOST_AUTO_TEST_CASE (dcp_test7)
 {
+       RNGFixer fix;
+
        dcp::XMLMetadata xml_meta;
        xml_meta.annotation_text = "Created by libdcp";
        xml_meta.issuer = "OpenDCP 0.0.25";
index c35907510efd074dd52f040abf41ddb1acb51e93..2af802704c6e542a9b1be079102c8329e0643333 100644 (file)
@@ -65,7 +65,7 @@ BOOST_AUTO_TEST_CASE (encryption_test)
        boost::filesystem::remove_all ("build/test/signer");
        boost::filesystem::create_directory ("build/test/signer");
 
-       Kumu::cth_test = true;
+       RNGFixer fix;
 
        dcp::MXFMetadata mxf_metadata;
        mxf_metadata.company_name = "OpenDCP";
index 03961e339b38bd532b5cd007d6497eb6c6dc75af..afeba6d72c96e88ddb5eb574ceb5dab6e2137634 100644 (file)
@@ -33,6 +33,7 @@
 
 #include "mono_picture_asset_writer.h"
 #include "mono_picture_asset.h"
+#include "test.h"
 #include <asdcp/KM_util.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
@@ -43,7 +44,7 @@ using boost::shared_ptr;
 /** Check that recovery from a partially-written MXF works */
 BOOST_AUTO_TEST_CASE (recovery)
 {
-       Kumu::cth_test = true;
+       RNGFixer fix;
 
        string const picture = "test/data/32x32_red_square.j2c";
        int const size = boost::filesystem::file_size (picture);
@@ -55,11 +56,6 @@ BOOST_AUTO_TEST_CASE (recovery)
                fclose (f);
        }
 
-#ifdef LIBDCP_POSIX
-       /* XXX: fix this posix-only stuff */
-       Kumu::ResetTestRNG ();
-#endif
-
        boost::filesystem::remove_all ("build/test/baz");
        boost::filesystem::create_directories ("build/test/baz");
        shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
index 446b84bcbbbad315b4638d8a8b1490853bfe6094..7fa49616a2cbecd435c559cc9b8c0ab38fd3e00c 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM">
-  <Id>urn:uuid:41eebce6-86f2-4939-b27a-81e4dd3606e9</Id>
+  <Id>urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d</Id>
   <AnnotationText>Created by libdcp</AnnotationText>
   <Creator>OpenDCP 0.0.25</Creator>
   <VolumeCount>1</VolumeCount>
@@ -8,11 +8,11 @@
   <Issuer>OpenDCP 0.0.25</Issuer>
   <AssetList>
     <Asset>
-      <Id>urn:uuid:9f19589a-01e5-4093-b23b-a32e143e5956</Id>
+      <Id>urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55</Id>
       <PackingList>true</PackingList>
       <ChunkList>
         <Chunk>
-          <Path>pkl_9f19589a-01e5-4093-b23b-a32e143e5956.xml</Path>
+          <Path>pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1186</Length>
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d</Id>
+      <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
       <ChunkList>
         <Chunk>
-          <Path>cpl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml</Path>
+          <Path>cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1770</Length>
@@ -31,7 +31,7 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:63c3aece-c581-4603-b612-75e43f0c0430</Id>
+      <Id>urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470</Id>
       <ChunkList>
         <Chunk>
           <Path>video.mxf</Path>
@@ -42,7 +42,7 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:e5c3091b-f61e-459c-9faf-210bd4d3c7bf</Id>
+      <Id>urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85</Id>
       <ChunkList>
         <Chunk>
           <Path>audio.mxf</Path>
index d5f5f7455676695d743619ad382a91f70c2d826a..d249b939e361071d50a5ef3960e01aa7fd7b4933 100644 (file)
Binary files a/test/ref/DCP/dcp_test2/audio.mxf and b/test/ref/DCP/dcp_test2/audio.mxf differ
diff --git a/test/ref/DCP/dcp_test2/cpl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml b/test/ref/DCP/dcp_test2/cpl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml
deleted file mode 100644 (file)
index f68a8a3..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL">
-  <Id>urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d</Id>
-  <AnnotationText>A Test DCP</AnnotationText>
-  <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
-  <Issuer>OpenDCP 0.0.25</Issuer>
-  <Creator>OpenDCP 0.0.25</Creator>
-  <ContentTitleText>A Test DCP</ContentTitleText>
-  <ContentKind>feature</ContentKind>
-  <ContentVersion>
-    <Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id>
-    <LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText>
-  </ContentVersion>
-  <RatingList/>
-  <ReelList>
-    <Reel>
-      <Id>urn:uuid:646747f3-51ee-47ec-a0a2-5f8c415818e8</Id>
-      <AssetList>
-        <MainSound>
-          <Id>urn:uuid:e5c3091b-f61e-459c-9faf-210bd4d3c7bf</Id>
-          <AnnotationText></AnnotationText>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>24</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>24</Duration>
-          <Hash>yOPZZcSUfpF0dwuq4awCqOGjbaE=</Hash>
-        </MainSound>
-        <msp-cpl:MainStereoscopicPicture xmlns:msp-cpl="http://www.smpte-ra.org/schemas/429-10/2008/Main-Stereo-Picture-CPL">
-          <Id>urn:uuid:63c3aece-c581-4603-b612-75e43f0c0430</Id>
-          <AnnotationText></AnnotationText>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>24</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>24</Duration>
-          <Hash>OEAL0t1jvySBWib02IdWNHkPWsA=</Hash>
-          <FrameRate>48 1</FrameRate>
-          <ScreenAspectRatio>32 32</ScreenAspectRatio>
-        </msp-cpl:MainStereoscopicPicture>
-      </AssetList>
-    </Reel>
-  </ReelList>
-</CompositionPlaylist>
diff --git a/test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
new file mode 100644 (file)
index 0000000..61922e1
--- /dev/null
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL">
+  <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
+  <AnnotationText>A Test DCP</AnnotationText>
+  <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
+  <Issuer>OpenDCP 0.0.25</Issuer>
+  <Creator>OpenDCP 0.0.25</Creator>
+  <ContentTitleText>A Test DCP</ContentTitleText>
+  <ContentKind>feature</ContentKind>
+  <ContentVersion>
+    <Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id>
+    <LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText>
+  </ContentVersion>
+  <RatingList/>
+  <ReelList>
+    <Reel>
+      <Id>urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09</Id>
+      <AssetList>
+        <MainSound>
+          <Id>urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85</Id>
+          <AnnotationText></AnnotationText>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>24</IntrinsicDuration>
+          <EntryPoint>0</EntryPoint>
+          <Duration>24</Duration>
+          <Hash>fnl4pJDAQk/xQ54W4R+l6S7PB7E=</Hash>
+        </MainSound>
+        <msp-cpl:MainStereoscopicPicture xmlns:msp-cpl="http://www.smpte-ra.org/schemas/429-10/2008/Main-Stereo-Picture-CPL">
+          <Id>urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470</Id>
+          <AnnotationText></AnnotationText>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>24</IntrinsicDuration>
+          <EntryPoint>0</EntryPoint>
+          <Duration>24</Duration>
+          <Hash>ErlJmAfNakirQq9kVrnPj7fIOw0=</Hash>
+          <FrameRate>48 1</FrameRate>
+          <ScreenAspectRatio>32 32</ScreenAspectRatio>
+        </msp-cpl:MainStereoscopicPicture>
+      </AssetList>
+    </Reel>
+  </ReelList>
+</CompositionPlaylist>
diff --git a/test/ref/DCP/dcp_test2/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml b/test/ref/DCP/dcp_test2/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml
new file mode 100644 (file)
index 0000000..6708f74
--- /dev/null
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL">
+  <Id>urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55</Id>
+  <AnnotationText>Created by libdcp</AnnotationText>
+  <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
+  <Issuer>OpenDCP 0.0.25</Issuer>
+  <Creator>OpenDCP 0.0.25</Creator>
+  <AssetList>
+    <Asset>
+      <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
+      <AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText>
+      <Hash>pqdZpLFIn6kcClkACI9VLGCzNgk=</Hash>
+      <Size>1770</Size>
+      <Type>text/xml</Type>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470</Id>
+      <AnnotationText>1fab8bb0-cfaf-4225-ad6d-01768bc10470</AnnotationText>
+      <Hash>ErlJmAfNakirQq9kVrnPj7fIOw0=</Hash>
+      <Size>35032</Size>
+      <Type>application/mxf</Type>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85</Id>
+      <AnnotationText>8b92bcee-62fc-4a33-a51a-816e9611ce85</AnnotationText>
+      <Hash>fnl4pJDAQk/xQ54W4R+l6S7PB7E=</Hash>
+      <Size>161326</Size>
+      <Type>application/mxf</Type>
+    </Asset>
+  </AssetList>
+</PackingList>
diff --git a/test/ref/DCP/dcp_test2/pkl_9f19589a-01e5-4093-b23b-a32e143e5956.xml b/test/ref/DCP/dcp_test2/pkl_9f19589a-01e5-4093-b23b-a32e143e5956.xml
deleted file mode 100644 (file)
index 44fc9cd..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL">
-  <Id>urn:uuid:9f19589a-01e5-4093-b23b-a32e143e5956</Id>
-  <AnnotationText>Created by libdcp</AnnotationText>
-  <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
-  <Issuer>OpenDCP 0.0.25</Issuer>
-  <Creator>OpenDCP 0.0.25</Creator>
-  <AssetList>
-    <Asset>
-      <Id>urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d</Id>
-      <AnnotationText>48db27c3-4964-46a2-8b02-3e5570efb42d</AnnotationText>
-      <Hash>SvHyFHgdvrcbyej6IQwUWX3kOfI=</Hash>
-      <Size>1770</Size>
-      <Type>text/xml</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:63c3aece-c581-4603-b612-75e43f0c0430</Id>
-      <AnnotationText>63c3aece-c581-4603-b612-75e43f0c0430</AnnotationText>
-      <Hash>OEAL0t1jvySBWib02IdWNHkPWsA=</Hash>
-      <Size>35032</Size>
-      <Type>application/mxf</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:e5c3091b-f61e-459c-9faf-210bd4d3c7bf</Id>
-      <AnnotationText>e5c3091b-f61e-459c-9faf-210bd4d3c7bf</AnnotationText>
-      <Hash>yOPZZcSUfpF0dwuq4awCqOGjbaE=</Hash>
-      <Size>161326</Size>
-      <Type>application/mxf</Type>
-    </Asset>
-  </AssetList>
-</PackingList>
index cd97d571994df90588156fac4f8e1cbc580427ee..01d0b908210de78f30d38f781476f38613007e7a 100644 (file)
Binary files a/test/ref/DCP/dcp_test2/video.mxf and b/test/ref/DCP/dcp_test2/video.mxf differ
index 03550fe5bf4d1711a114b655a03cda6920e50501..a5be569a142632819bea7bdde323afb77afecd32 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM">
-  <Id>urn:uuid:4e05cadd-460f-4573-a0e9-b6c416c4b958</Id>
+  <Id>urn:uuid:cd49971e-bf4c-4594-8474-54ebef09a40c</Id>
   <AnnotationText>Created by libdcp</AnnotationText>
   <Creator>OpenDCP 0.0.25</Creator>
   <VolumeCount>1</VolumeCount>
@@ -8,11 +8,11 @@
   <Issuer>OpenDCP 0.0.25</Issuer>
   <AssetList>
     <Asset>
-      <Id>urn:uuid:7574c611-f8de-4d20-98c4-2eb7dc87080a</Id>
+      <Id>urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d</Id>
       <PackingList>true</PackingList>
       <ChunkList>
         <Chunk>
-          <Path>pkl_7574c611-f8de-4d20-98c4-2eb7dc87080a.xml</Path>
+          <Path>pkl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1186</Length>
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:3a8a01d1-0e1c-4ff0-977d-63d32995a1fd</Id>
+      <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
       <ChunkList>
         <Chunk>
-          <Path>cpl_3a8a01d1-0e1c-4ff0-977d-63d32995a1fd.xml</Path>
+          <Path>cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>2152</Length>
@@ -31,7 +31,7 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:2527dbe5-41f7-4a22-a2d2-bd7cfeffbce1</Id>
+      <Id>urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470</Id>
       <ChunkList>
         <Chunk>
           <Path>video.mxf</Path>
@@ -42,7 +42,7 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:69827080-f731-4e4c-9c8a-ec568acdfacc</Id>
+      <Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id>
       <ChunkList>
         <Chunk>
           <Path>audio.mxf</Path>
index 56b909c5799ee3782c3977695294eb7c7c6b367e..62158f3f17a7c9ce30301abb294847a07f25cf54 100644 (file)
Binary files a/test/ref/DCP/dcp_test5/audio.mxf and b/test/ref/DCP/dcp_test5/audio.mxf differ
diff --git a/test/ref/DCP/dcp_test5/cpl_3a8a01d1-0e1c-4ff0-977d-63d32995a1fd.xml b/test/ref/DCP/dcp_test5/cpl_3a8a01d1-0e1c-4ff0-977d-63d32995a1fd.xml
deleted file mode 100644 (file)
index 5eb8e8e..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL">
-  <Id>urn:uuid:3a8a01d1-0e1c-4ff0-977d-63d32995a1fd</Id>
-  <AnnotationText>A Test DCP</AnnotationText>
-  <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
-  <Issuer>OpenDCP 0.0.25</Issuer>
-  <Creator>OpenDCP 0.0.25</Creator>
-  <ContentTitleText>A Test DCP</ContentTitleText>
-  <ContentKind>feature</ContentKind>
-  <ContentVersion>
-    <Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id>
-    <LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText>
-  </ContentVersion>
-  <RatingList/>
-  <ReelList>
-    <Reel>
-      <Id>urn:uuid:34acc068-e059-4fb9-90ca-461c57d17dae</Id>
-      <AssetList>
-        <MainPicture>
-          <Id>urn:uuid:2527dbe5-41f7-4a22-a2d2-bd7cfeffbce1</Id>
-          <AnnotationText></AnnotationText>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>24</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>24</Duration>
-          <Hash>K4HdTpPPOuFkq9VsRXau8+uPA1A=</Hash>
-          <FrameRate>24 1</FrameRate>
-          <ScreenAspectRatio>32 32</ScreenAspectRatio>
-        </MainPicture>
-        <MainSound>
-          <Id>urn:uuid:69827080-f731-4e4c-9c8a-ec568acdfacc</Id>
-          <AnnotationText></AnnotationText>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>24</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>24</Duration>
-          <Hash>466RYVbB8pyiP6RD6mjEjy4N8d4=</Hash>
-        </MainSound>
-        <axd:AuxData xmlns:axd="http://www.dolby.com/schemas/2012/AD">
-          <Id>urn:uuid:b68febcc-5ddf-489a-84a7-924f29fa2afd</Id>
-          <AnnotationText></AnnotationText>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>1489</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>1489</Duration>
-          <Hash>jo8pQSebhScPN4EVvvpIUWRrDeM=</Hash>
-          <axd:DataType>urn:smpte:ul:060e2b34.04010105.0e090604.00000000</axd:DataType>
-        </axd:AuxData>
-      </AssetList>
-    </Reel>
-  </ReelList>
-</CompositionPlaylist>
diff --git a/test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
new file mode 100644 (file)
index 0000000..4eafc4c
--- /dev/null
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL">
+  <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
+  <AnnotationText>A Test DCP</AnnotationText>
+  <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
+  <Issuer>OpenDCP 0.0.25</Issuer>
+  <Creator>OpenDCP 0.0.25</Creator>
+  <ContentTitleText>A Test DCP</ContentTitleText>
+  <ContentKind>feature</ContentKind>
+  <ContentVersion>
+    <Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id>
+    <LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText>
+  </ContentVersion>
+  <RatingList/>
+  <ReelList>
+    <Reel>
+      <Id>urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55</Id>
+      <AssetList>
+        <MainPicture>
+          <Id>urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470</Id>
+          <AnnotationText></AnnotationText>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>24</IntrinsicDuration>
+          <EntryPoint>0</EntryPoint>
+          <Duration>24</Duration>
+          <Hash>1uPB643nrQfpY+Y0AypGko+PiPE=</Hash>
+          <FrameRate>24 1</FrameRate>
+          <ScreenAspectRatio>32 32</ScreenAspectRatio>
+        </MainPicture>
+        <MainSound>
+          <Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id>
+          <AnnotationText></AnnotationText>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>24</IntrinsicDuration>
+          <EntryPoint>0</EntryPoint>
+          <Duration>24</Duration>
+          <Hash>ifmC1P7fjigb1oVxx6xs3Paz/GY=</Hash>
+        </MainSound>
+        <axd:AuxData xmlns:axd="http://www.dolby.com/schemas/2012/AD">
+          <Id>urn:uuid:b68febcc-5ddf-489a-84a7-924f29fa2afd</Id>
+          <AnnotationText></AnnotationText>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>1489</IntrinsicDuration>
+          <EntryPoint>0</EntryPoint>
+          <Duration>1489</Duration>
+          <Hash>jo8pQSebhScPN4EVvvpIUWRrDeM=</Hash>
+          <axd:DataType>urn:smpte:ul:060e2b34.04010105.0e090604.00000000</axd:DataType>
+        </axd:AuxData>
+      </AssetList>
+    </Reel>
+  </ReelList>
+</CompositionPlaylist>
diff --git a/test/ref/DCP/dcp_test5/pkl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml b/test/ref/DCP/dcp_test5/pkl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml
new file mode 100644 (file)
index 0000000..dd0f69e
--- /dev/null
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL">
+  <Id>urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d</Id>
+  <AnnotationText>Created by libdcp</AnnotationText>
+  <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
+  <Issuer>OpenDCP 0.0.25</Issuer>
+  <Creator>OpenDCP 0.0.25</Creator>
+  <AssetList>
+    <Asset>
+      <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
+      <AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText>
+      <Hash>yymWSY7jL4TWqI1Sy/Q2oUK1GX8=</Hash>
+      <Size>2152</Size>
+      <Type>text/xml</Type>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470</Id>
+      <AnnotationText>1fab8bb0-cfaf-4225-ad6d-01768bc10470</AnnotationText>
+      <Hash>1uPB643nrQfpY+Y0AypGko+PiPE=</Hash>
+      <Size>26080</Size>
+      <Type>application/mxf</Type>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id>
+      <AnnotationText>9482e87d-292d-4e0e-a98d-c61822b60fe9</AnnotationText>
+      <Hash>ifmC1P7fjigb1oVxx6xs3Paz/GY=</Hash>
+      <Size>161326</Size>
+      <Type>application/mxf</Type>
+    </Asset>
+  </AssetList>
+</PackingList>
diff --git a/test/ref/DCP/dcp_test5/pkl_7574c611-f8de-4d20-98c4-2eb7dc87080a.xml b/test/ref/DCP/dcp_test5/pkl_7574c611-f8de-4d20-98c4-2eb7dc87080a.xml
deleted file mode 100644 (file)
index bf029cd..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL">
-  <Id>urn:uuid:7574c611-f8de-4d20-98c4-2eb7dc87080a</Id>
-  <AnnotationText>Created by libdcp</AnnotationText>
-  <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
-  <Issuer>OpenDCP 0.0.25</Issuer>
-  <Creator>OpenDCP 0.0.25</Creator>
-  <AssetList>
-    <Asset>
-      <Id>urn:uuid:3a8a01d1-0e1c-4ff0-977d-63d32995a1fd</Id>
-      <AnnotationText>3a8a01d1-0e1c-4ff0-977d-63d32995a1fd</AnnotationText>
-      <Hash>/ZOIScc5e/LacNSwBp4/HMof2OQ=</Hash>
-      <Size>2152</Size>
-      <Type>text/xml</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:2527dbe5-41f7-4a22-a2d2-bd7cfeffbce1</Id>
-      <AnnotationText>2527dbe5-41f7-4a22-a2d2-bd7cfeffbce1</AnnotationText>
-      <Hash>K4HdTpPPOuFkq9VsRXau8+uPA1A=</Hash>
-      <Size>26080</Size>
-      <Type>application/mxf</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:69827080-f731-4e4c-9c8a-ec568acdfacc</Id>
-      <AnnotationText>69827080-f731-4e4c-9c8a-ec568acdfacc</AnnotationText>
-      <Hash>466RYVbB8pyiP6RD6mjEjy4N8d4=</Hash>
-      <Size>161326</Size>
-      <Type>application/mxf</Type>
-    </Asset>
-  </AssetList>
-</PackingList>
index ff6900b79fb55d3cba6a126954d8ec8555c94c1d..dde49093270bbb54d53833fb4e89bd5c87b879e1 100644 (file)
Binary files a/test/ref/DCP/dcp_test5/video.mxf and b/test/ref/DCP/dcp_test5/video.mxf differ
index 1def7fa3c963429c58d119b06273ca3b2a43aa24..92ef4e38fe5245139cf06018c2c53e1c9c5b0228 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AssetMap xmlns="http://www.digicine.com/PROTO-ASDCP-AM-20040311#">
-  <Id>urn:uuid:d1c42121-73a5-4d1d-b1c2-8165695d58ff</Id>
+  <Id>urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55</Id>
   <AnnotationText>Created by libdcp</AnnotationText>
   <VolumeCount>1</VolumeCount>
   <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
@@ -8,11 +8,11 @@
   <Creator>OpenDCP 0.0.25</Creator>
   <AssetList>
     <Asset>
-      <Id>urn:uuid:a800aea0-904b-4bd0-9250-374fdb46528b</Id>
+      <Id>urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09</Id>
       <PackingList>true</PackingList>
       <ChunkList>
         <Chunk>
-          <Path>pkl_a800aea0-904b-4bd0-9250-374fdb46528b.xml</Path>
+          <Path>pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1253</Length>
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:1d513f84-5856-4f91-a88a-4d452cc6a28a</Id>
+      <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
       <ChunkList>
         <Chunk>
-          <Path>cpl_1d513f84-5856-4f91-a88a-4d452cc6a28a.xml</Path>
+          <Path>cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1587</Length>
@@ -31,7 +31,7 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:cb2b7aa9-a378-4392-86f8-df013863fdd0</Id>
+      <Id>urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470</Id>
       <ChunkList>
         <Chunk>
           <Path>video.mxf</Path>
@@ -42,7 +42,7 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:e63718c9-fa72-4dd9-a144-8736591b08b6</Id>
+      <Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id>
       <ChunkList>
         <Chunk>
           <Path>audio.mxf</Path>
index ec96c55caa878b48eed6b7efa7c37247d9ed1b91..62158f3f17a7c9ce30301abb294847a07f25cf54 100644 (file)
Binary files a/test/ref/DCP/dcp_test7/audio.mxf and b/test/ref/DCP/dcp_test7/audio.mxf differ
diff --git a/test/ref/DCP/dcp_test7/cpl_1d513f84-5856-4f91-a88a-4d452cc6a28a.xml b/test/ref/DCP/dcp_test7/cpl_1d513f84-5856-4f91-a88a-4d452cc6a28a.xml
deleted file mode 100644 (file)
index 93a83a5..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.digicine.com/PROTO-ASDCP-CPL-20040511#">
-  <Id>urn:uuid:1d513f84-5856-4f91-a88a-4d452cc6a28a</Id>
-  <AnnotationText>A Test DCP</AnnotationText>
-  <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
-  <Issuer>OpenDCP 0.0.25</Issuer>
-  <Creator>OpenDCP 0.0.25</Creator>
-  <ContentTitleText>A Test DCP</ContentTitleText>
-  <ContentKind>feature</ContentKind>
-  <ContentVersion>
-    <Id>urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11</Id>
-    <LabelText>content-version-label-text</LabelText>
-  </ContentVersion>
-  <RatingList/>
-  <ReelList>
-    <Reel>
-      <Id>urn:uuid:f3452d7a-2f0d-4758-b0ab-63432f863752</Id>
-      <AssetList>
-        <MainPicture>
-          <Id>urn:uuid:cb2b7aa9-a378-4392-86f8-df013863fdd0</Id>
-          <AnnotationText></AnnotationText>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>24</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>24</Duration>
-          <Hash>OAQxUPOCyW+SkZkZ+GoSIhxkn8E=</Hash>
-          <FrameRate>24 1</FrameRate>
-          <ScreenAspectRatio>1.33</ScreenAspectRatio>
-        </MainPicture>
-        <MainSound>
-          <Id>urn:uuid:e63718c9-fa72-4dd9-a144-8736591b08b6</Id>
-          <AnnotationText></AnnotationText>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>24</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>24</Duration>
-          <Hash>f5srKV6hTI6FRxgXGnhLPQqn12w=</Hash>
-        </MainSound>
-      </AssetList>
-    </Reel>
-  </ReelList>
-</CompositionPlaylist>
diff --git a/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
new file mode 100644 (file)
index 0000000..24a8419
--- /dev/null
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CompositionPlaylist xmlns="http://www.digicine.com/PROTO-ASDCP-CPL-20040511#">
+  <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
+  <AnnotationText>A Test DCP</AnnotationText>
+  <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
+  <Issuer>OpenDCP 0.0.25</Issuer>
+  <Creator>OpenDCP 0.0.25</Creator>
+  <ContentTitleText>A Test DCP</ContentTitleText>
+  <ContentKind>feature</ContentKind>
+  <ContentVersion>
+    <Id>urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11</Id>
+    <LabelText>content-version-label-text</LabelText>
+  </ContentVersion>
+  <RatingList/>
+  <ReelList>
+    <Reel>
+      <Id>urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789</Id>
+      <AssetList>
+        <MainPicture>
+          <Id>urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470</Id>
+          <AnnotationText></AnnotationText>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>24</IntrinsicDuration>
+          <EntryPoint>0</EntryPoint>
+          <Duration>24</Duration>
+          <Hash>1uPB643nrQfpY+Y0AypGko+PiPE=</Hash>
+          <FrameRate>24 1</FrameRate>
+          <ScreenAspectRatio>1.33</ScreenAspectRatio>
+        </MainPicture>
+        <MainSound>
+          <Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id>
+          <AnnotationText></AnnotationText>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>24</IntrinsicDuration>
+          <EntryPoint>0</EntryPoint>
+          <Duration>24</Duration>
+          <Hash>ifmC1P7fjigb1oVxx6xs3Paz/GY=</Hash>
+        </MainSound>
+      </AssetList>
+    </Reel>
+  </ReelList>
+</CompositionPlaylist>
diff --git a/test/ref/DCP/dcp_test7/pkl_a800aea0-904b-4bd0-9250-374fdb46528b.xml b/test/ref/DCP/dcp_test7/pkl_a800aea0-904b-4bd0-9250-374fdb46528b.xml
deleted file mode 100644 (file)
index a12f44f..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.digicine.com/PROTO-ASDCP-PKL-20040311#">
-  <Id>urn:uuid:a800aea0-904b-4bd0-9250-374fdb46528b</Id>
-  <AnnotationText>Created by libdcp</AnnotationText>
-  <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
-  <Issuer>OpenDCP 0.0.25</Issuer>
-  <Creator>OpenDCP 0.0.25</Creator>
-  <AssetList>
-    <Asset>
-      <Id>urn:uuid:1d513f84-5856-4f91-a88a-4d452cc6a28a</Id>
-      <AnnotationText>1d513f84-5856-4f91-a88a-4d452cc6a28a</AnnotationText>
-      <Hash>PJ7NPfT/cZC6XfoLWX+wiaGH/yQ=</Hash>
-      <Size>1587</Size>
-      <Type>text/xml;asdcpKind=CPL</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:cb2b7aa9-a378-4392-86f8-df013863fdd0</Id>
-      <AnnotationText>cb2b7aa9-a378-4392-86f8-df013863fdd0</AnnotationText>
-      <Hash>OAQxUPOCyW+SkZkZ+GoSIhxkn8E=</Hash>
-      <Size>26080</Size>
-      <Type>application/x-smpte-mxf;asdcpKind=Picture</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:e63718c9-fa72-4dd9-a144-8736591b08b6</Id>
-      <AnnotationText>e63718c9-fa72-4dd9-a144-8736591b08b6</AnnotationText>
-      <Hash>f5srKV6hTI6FRxgXGnhLPQqn12w=</Hash>
-      <Size>161326</Size>
-      <Type>application/x-smpte-mxf;asdcpKind=Sound</Type>
-    </Asset>
-  </AssetList>
-</PackingList>
diff --git a/test/ref/DCP/dcp_test7/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml b/test/ref/DCP/dcp_test7/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml
new file mode 100644 (file)
index 0000000..70c4fb5
--- /dev/null
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PackingList xmlns="http://www.digicine.com/PROTO-ASDCP-PKL-20040311#">
+  <Id>urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09</Id>
+  <AnnotationText>Created by libdcp</AnnotationText>
+  <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
+  <Issuer>OpenDCP 0.0.25</Issuer>
+  <Creator>OpenDCP 0.0.25</Creator>
+  <AssetList>
+    <Asset>
+      <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
+      <AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText>
+      <Hash>W4fAVf4nVZNfwWd25Vu1WtsFnUQ=</Hash>
+      <Size>1587</Size>
+      <Type>text/xml;asdcpKind=CPL</Type>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470</Id>
+      <AnnotationText>1fab8bb0-cfaf-4225-ad6d-01768bc10470</AnnotationText>
+      <Hash>1uPB643nrQfpY+Y0AypGko+PiPE=</Hash>
+      <Size>26080</Size>
+      <Type>application/x-smpte-mxf;asdcpKind=Picture</Type>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id>
+      <AnnotationText>9482e87d-292d-4e0e-a98d-c61822b60fe9</AnnotationText>
+      <Hash>ifmC1P7fjigb1oVxx6xs3Paz/GY=</Hash>
+      <Size>161326</Size>
+      <Type>application/x-smpte-mxf;asdcpKind=Sound</Type>
+    </Asset>
+  </AssetList>
+</PackingList>
index 0a6b97971c09f531778e0083018de67b19c48ca5..dde49093270bbb54d53833fb4e89bd5c87b879e1 100644 (file)
Binary files a/test/ref/DCP/dcp_test7/video.mxf and b/test/ref/DCP/dcp_test7/video.mxf differ
index 78d5b99b2e9c86eadeb3c7d23a11743df6c5c1e9..3f189256c6051a2f733839ea4fabee45df5bad11 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM">
-  <Id>urn:uuid:b97ed576-395c-4ae6-91e4-99116765dabd</Id>
+  <Id>urn:uuid:5d51e8a1-b2a5-4da6-9b66-4615c3609440</Id>
   <AnnotationText>Created by libdcp</AnnotationText>
   <Creator>OpenDCP 0.0.25</Creator>
   <VolumeCount>1</VolumeCount>
@@ -8,11 +8,11 @@
   <Issuer>OpenDCP 0.0.25</Issuer>
   <AssetList>
     <Asset>
-      <Id>urn:uuid:59730183-23bc-491e-906b-1dd453ff9d11</Id>
+      <Id>urn:uuid:6af1e0c1-c441-47f8-a502-3efd46b1fa4f</Id>
       <PackingList>true</PackingList>
       <ChunkList>
         <Chunk>
-          <Path>pkl_59730183-23bc-491e-906b-1dd453ff9d11.xml</Path>
+          <Path>pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>8708</Length>
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:b3eba4a0-f542-4937-b972-1cc4667ed01a</Id>
+      <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
       <ChunkList>
         <Chunk>
-          <Path>cpl_b3eba4a0-f542-4937-b972-1cc4667ed01a.xml</Path>
+          <Path>cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>9310</Length>
@@ -31,7 +31,7 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:2d4e8308-7197-41b8-8a0a-07a939d74971</Id>
+      <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
       <ChunkList>
         <Chunk>
           <Path>video.mxf</Path>
@@ -42,7 +42,7 @@
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:99c2c0d0-7491-4ad0-86d5-4f0af19d71f6</Id>
+      <Id>urn:uuid:d5f633d3-cb6e-4c04-85ae-4b2da9422852</Id>
       <ChunkList>
         <Chunk>
           <Path>audio.mxf</Path>
index d97634608da5b9c3a65324858fe871d7518ca5c1..2e12edabcca6b96a14d022755b4392ef72489afe 100644 (file)
Binary files a/test/ref/DCP/encryption_test/audio.mxf and b/test/ref/DCP/encryption_test/audio.mxf differ
diff --git a/test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
new file mode 100644 (file)
index 0000000..a2dc3bf
--- /dev/null
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL">
+  <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
+  <AnnotationText>A Test DCP</AnnotationText>
+  <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
+  <Issuer>OpenDCP 0.0.25</Issuer>
+  <Creator>OpenDCP 0.0.25</Creator>
+  <ContentTitleText>A Test DCP</ContentTitleText>
+  <ContentKind>feature</ContentKind>
+  <ContentVersion>
+    <Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id>
+    <LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText>
+  </ContentVersion>
+  <RatingList/>
+  <ReelList>
+    <Reel>
+      <Id>urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bff</Id>
+      <AssetList>
+        <MainPicture>
+          <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
+          <AnnotationText></AnnotationText>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>24</IntrinsicDuration>
+          <EntryPoint>0</EntryPoint>
+          <Duration>24</Duration>
+          <KeyId>urn:uuid:6a9e31a6-50a4-4ecb-8683-fa667848470a</KeyId>
+          <Hash>EdbLFybsoLbZ3KB2jFtWZxMEMHI=</Hash>
+          <FrameRate>24 1</FrameRate>
+          <ScreenAspectRatio>32 32</ScreenAspectRatio>
+        </MainPicture>
+        <MainSound>
+          <Id>urn:uuid:d5f633d3-cb6e-4c04-85ae-4b2da9422852</Id>
+          <AnnotationText></AnnotationText>
+          <EditRate>24 1</EditRate>
+          <IntrinsicDuration>24</IntrinsicDuration>
+          <EntryPoint>0</EntryPoint>
+          <Duration>24</Duration>
+          <KeyId>urn:uuid:4c80356c-e9ac-4d81-b8fd-4806055c956d</KeyId>
+          <Hash>h7XEYV80a8CvQ5wS1OR3ldbkLM4=</Hash>
+        </MainSound>
+      </AssetList>
+    </Reel>
+  </ReelList>
+  <Signer xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
+    <dsig:X509Data>
+      <dsig:X509IssuerSerial>
+        <dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
+        <dsig:X509SerialNumber>7</dsig:X509SerialNumber>
+      </dsig:X509IssuerSerial>
+      <dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName>
+    </dsig:X509Data>
+  </Signer>
+  <dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
+    <dsig:SignedInfo>
+      <dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
+      <dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+      <dsig:Reference URI="">
+        <dsig:Transforms>
+          <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
+        </dsig:Transforms>
+        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+        <dsig:DigestValue>IANIEQpHSdKYpetv7vU8c9NL55g=</dsig:DigestValue>
+      </dsig:Reference>
+    </dsig:SignedInfo>
+    <dsig:SignatureValue>elcV7C8ITQPME2EnZCld1/NPFi5KXzSEWGDEchEfHryc6kLx2ZY1yl/uylaHgY0R
+Z37ida9b0wPySJzr5vbTRerIHF/S2asXtGC1kgo5MWtXgATUtUe031HJ+TJPi9bj
+SD0u1V+PciElYwPRHID27kpLVgdSoq6cNoYG2w4yNvtnyF5r+n+0IiCYNMlkVqGW
+gX2Lfa/Oy8bJbioOo5yHt+6sFSPAp7GJdTEtzOEiKAkaLpymAB7N3L3gW2qS6OnL
+2KspdXdR3WKqPEprf3A0OtWTjbfsuvsyleCl/gw4O2dMRFbc1R0OutsWVw1h8PXl
+UtAYFxwdlY7ile2ZCelQMA==</dsig:SignatureValue>
+    <dsig:KeyInfo>
+      <dsig:X509Data>
+        <dsig:X509IssuerSerial>
+          <dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
+          <dsig:X509SerialNumber>7</dsig:X509SerialNumber>
+        </dsig:X509IssuerSerial>
+        <dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
+bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt
+NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc
+NmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0PTAeFw0xNTA2MDUxMzIwMDhaFw0y
+NTA1MzExMzIwMDhaMIGEMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UECxML
+ZXhhbXBsZS5vcmcxLzAtBgNVBAMUJkNTLnNtcHRlLTQzMC0yLkxFQUYuTk9UX0ZP
+Ul9QUk9EVUNUSU9OMSUwIwYDVQQuExxRRlZseW03ZnVxbDZiUE9uWTM4YWFPMVpQ
+VzQ9MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA08vRdRvUh31Oi96E
+GHqfmYs2GhxKS7Y1AJpVGjPWQyZFYkwspzG9voK6rMbnXEQ5HRDJ0jZ5DaxS7zrm
+YIOsX6DQpl2kY8MTHXmWZFg623HID+XAowFqkTG7UtUpXsZ/vj+gOKu0PQPmdRLM
+Rg5Hs2yQxSS7/SizuG52CrAmsIeab9u/AOL10uLRmUBzLMaXt4uPz2i+3PXi+uVu
+lfy3tEQ3+QRNNsH2G6O6sURR+4nYB0cLLlINpHTdBixfGU/Eb9g/wpD3zrGcAV6Z
+XvxULNd4RcxH8Ys15QuvtdMGwW/8LW1/03WO5XeQRkcoPF44yV4XUeTE5weXYAaM
+ZH7hMwIDAQABo4HvMIHsMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgWgMB0GA1Ud
+DgQWBBRAVWXKbt+6qXps86djfxpo7Vk9bjCBrwYDVR0jBIGnMIGkgBTp5q3yvfdR
+LvVq+5ASiOYf5uOTzqGBiKSBhTCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDAS
+BgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5O
+T1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dN
+VkFMRlNlYz2CAQYwDQYJKoZIhvcNAQELBQADggEBAA4CsCDn8UKBcH7wroorNKbf
+ZVzwGSxNyCMTmDm38ZmriNpV7FCNTLek4xmf21ITafC9nNxpbWA7l9bG5dRnktwa
+JSlHZKDKKVEUHJYu/47YUlmt4YNVo+zN0iB/QLXoHu6yGw3/N7z4sBDyLGGPl5mh
+sAxuXpFr1ruTQVqx483L7ie/p0GV9vsoAJQTRTnIcvEs7rVHxIWEsiOE8AZozW72
+jIBKSy9jsxSGYgmMgbdkrs5c2hBvVim5i58PIzSCo/lI/5WRREESZIyZ9zIBSwIS
+cYueAupiCrOxzY6Xg3GZlMbbHElp4MnDeV3zv90UAuZXomorCOcnutqUe36J63E=</dsig:X509Certificate>
+      </dsig:X509Data>
+      <dsig:X509Data>
+        <dsig:X509IssuerSerial>
+          <dsig:X509IssuerName>dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
+          <dsig:X509SerialNumber>6</dsig:X509SerialNumber>
+        </dsig:X509IssuerSerial>
+        <dsig:X509Certificate>MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
+bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
+NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
+Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAxMTMy
+MDA4WjCBijEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
+b3JnMTUwMwYDVQQDFCwuc21wdGUtNDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1Jf
+UFJPRFVDVElPTjElMCMGA1UELhMcNmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0
+PTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjv758HrPTeThATXaFU
+JCyUlGbLxETJQ2lqXx5a9XL/FDNsMN11IZ9hhUfj/KV2aNDYJ2nsaInAeZ00kNgG
+OOPAqF0KainrO4vlYQB10nwcmfvI/BtqW4GFXBDYpIXvyF7ss4e4Zp52h+UVkfTY
+Dwf10W7vP8Gr1wKaIvFsuGbB35D3PfX+4lacF2cNMFSHLj+oiLug5vOpoo/QTS+o
+gBl2mGctSLaEBE9x/HO10Dy7WXrUpokPGcHhJzwOlbAnVt6X4kANVATf5ffy0UQE
+uROgsSUm+hK/HqmUXTE6Gy7Hi7sktdI6X3EnBdzse1vxNQTrKy6bMXswcgOkklnk
+5AECAwEAAaOB9TCB8jASBgNVHRMBAf8ECDAGAQH/AgECMAsGA1UdDwQEAwIBBjAd
+BgNVHQ4EFgQU6eat8r33US71avuQEojmH+bjk84wga8GA1UdIwSBpzCBpIAUDCnR
+dHFbcv4ANVUq2+wMVALFSeehgYikgYUwgYIxFDASBgNVBAoTC2V4YW1wbGUub3Jn
+MRQwEgYDVQQLEwtleGFtcGxlLm9yZzEtMCsGA1UEAxQkLnNtcHRlLTQzMC0yLlJP
+T1QuTk9UX0ZPUl9QUk9EVUNUSU9OMSUwIwYDVQQuExxEQ25SZEhGYmN2NEFOVlVx
+Mit3TVZBTEZTZWM9ggEFMA0GCSqGSIb3DQEBCwUAA4IBAQBGr/uVKvBE7yGcPdOG
+AaacD8zmEkb8BL+otrumW1BqAI0BIVghvuTDAKtk/cFy7Mbnnp/mTJ6h5F7lDON4
+YVBQ9gouw5+pLM61r/ZTF+shiWA4C4cwWb1X/gw82TXD2wXch9IJmcblrfrabHkB
+Y3wyyn5unqHm+uy/ZsNzoTmRcrxnPua5DyZKxGBHV0TEDzJMUMgluRcQwRs0HmG1
+vWeROkXRWyYiY2QAdpINuQUKUqjtFTtOGcA3I/Hd7vUiqqxNr9fL0H/HDvAbEmIw
++YSFJ9uFyESvls8Lv5tydwhnqJBIKk19/CDIwMAPZnyT1WT3XwnD5hVRYljpgjm5
+xwd0</dsig:X509Certificate>
+      </dsig:X509Data>
+      <dsig:X509Data>
+        <dsig:X509IssuerSerial>
+          <dsig:X509IssuerName>dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
+          <dsig:X509SerialNumber>5</dsig:X509SerialNumber>
+        </dsig:X509IssuerSerial>
+        <dsig:X509Certificate>MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
+bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
+NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
+Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAyMTMy
+MDA4WjCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
+b3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJ
+T04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dNVkFMRlNlYz0wggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQdNLi0U0p9kkfszAymkW4fVTqG4KZ
+qNlO43eE4+ItjTr0qDEvyyq94tp2w1/7aag87Nzb386ibqFzldEt3u8xy9CXanUy
+Fg2vRzAJ+WgngmK8AdzHqdPzYTtIdMNj0GQkF+ze0VLM1QfAGUvsRzcqYJADD9om
+vsOnZiub92ezbL5swLaLpZq10i2HGYqDZxKlcslmaVXPgh7acmI9b3ledpLjOtvR
+NPI6tfy8jhjvCZY81+V5iZqyKTezrLTqqgNBlFjzIdCT1BRlbOlS55iOloRK8q9F
+TXqV6M1jqN6T4FlKzorjYWNEKp1V58DHBosAB0FXs+Sc10WWTuqL9Q3VAgMBAAGj
+gfUwgfIwEgYDVR0TAQH/BAgwBgEB/wIBAzALBgNVHQ8EBAMCAQYwHQYDVR0OBBYE
+FAwp0XRxW3L+ADVVKtvsDFQCxUnnMIGvBgNVHSMEgacwgaSAFAwp0XRxW3L+ADVV
+KtvsDFQCxUnnoYGIpIGFMIGCMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UE
+CxMLZXhhbXBsZS5vcmcxLTArBgNVBAMUJC5zbXB0ZS00MzAtMi5ST09ULk5PVF9G
+T1JfUFJPRFVDVElPTjElMCMGA1UELhMcRENuUmRIRmJjdjRBTlZVcTIrd01WQUxG
+U2VjPYIBBTANBgkqhkiG9w0BAQsFAAOCAQEAEOGcZTz1XGfZunxCnclrNDDsgLhy
+RvqxG7Li7enVyKF5798ckA17jCnkY/W9YwtjpgfEpjw9aGdCy6cviNu51jT5F9qg
+y0O2OXhtX47aS9G6r1m50cBmrciBxrqSTr6/co6jcRImRhTpvVcLcbv3emCLogBw
+9v93abXvbT+GZ6yc2OOArTZCFlrLW8XTDSDrPp/hida2NjZOrxJj6iFEh6+M+S7Z
+T/bwFNfuPDsDhtccoVt/hIM0imFnjKlwbo3HbJ3v+Lhy2oUS66d5ELHuuQnMuKFT
+pxf6/gl42q4gFbwBDp6jxy5L1J4LZGZIwsoTv6dFjo1MNttqmfMTheiwpQ==</dsig:X509Certificate>
+      </dsig:X509Data>
+    </dsig:KeyInfo>
+  </dsig:Signature>
+</CompositionPlaylist>
diff --git a/test/ref/DCP/encryption_test/cpl_b3eba4a0-f542-4937-b972-1cc4667ed01a.xml b/test/ref/DCP/encryption_test/cpl_b3eba4a0-f542-4937-b972-1cc4667ed01a.xml
deleted file mode 100644 (file)
index 3712b0b..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL">
-  <Id>urn:uuid:b3eba4a0-f542-4937-b972-1cc4667ed01a</Id>
-  <AnnotationText>A Test DCP</AnnotationText>
-  <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
-  <Issuer>OpenDCP 0.0.25</Issuer>
-  <Creator>OpenDCP 0.0.25</Creator>
-  <ContentTitleText>A Test DCP</ContentTitleText>
-  <ContentKind>feature</ContentKind>
-  <ContentVersion>
-    <Id>urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</Id>
-    <LabelText>81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00</LabelText>
-  </ContentVersion>
-  <RatingList/>
-  <ReelList>
-    <Reel>
-      <Id>urn:uuid:3525ad07-a77c-4457-b391-47dcd9534aeb</Id>
-      <AssetList>
-        <MainPicture>
-          <Id>urn:uuid:2d4e8308-7197-41b8-8a0a-07a939d74971</Id>
-          <AnnotationText></AnnotationText>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>24</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>24</Duration>
-          <KeyId>urn:uuid:0b493509-3c79-4139-82c0-a330c1ab03f5</KeyId>
-          <Hash>67diQ9tld/BCyMIzFM9yzBoIjKc=</Hash>
-          <FrameRate>24 1</FrameRate>
-          <ScreenAspectRatio>32 32</ScreenAspectRatio>
-        </MainPicture>
-        <MainSound>
-          <Id>urn:uuid:99c2c0d0-7491-4ad0-86d5-4f0af19d71f6</Id>
-          <AnnotationText></AnnotationText>
-          <EditRate>24 1</EditRate>
-          <IntrinsicDuration>24</IntrinsicDuration>
-          <EntryPoint>0</EntryPoint>
-          <Duration>24</Duration>
-          <KeyId>urn:uuid:4aecad87-a372-4657-b15a-46e9fc109721</KeyId>
-          <Hash>sskK3KhvnddXtjVricwXXuxLOQ0=</Hash>
-        </MainSound>
-      </AssetList>
-    </Reel>
-  </ReelList>
-  <Signer xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-    <dsig:X509Data>
-      <dsig:X509IssuerSerial>
-        <dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
-        <dsig:X509SerialNumber>7</dsig:X509SerialNumber>
-      </dsig:X509IssuerSerial>
-      <dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName>
-    </dsig:X509Data>
-  </Signer>
-  <dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-    <dsig:SignedInfo>
-      <dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
-      <dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <dsig:Reference URI="">
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-        <dsig:DigestValue>ZvU17sFJTWmZIryqHCR7UJhU8c8=</dsig:DigestValue>
-      </dsig:Reference>
-    </dsig:SignedInfo>
-    <dsig:SignatureValue>a9nRSH/MjkLrPONRRGagztJ4HHvDxk1uvQ9HecNnu0dm5eWRJPmi8jGl1tNgiP5W
-fGqb3Cx0jJGyXmum6WkfgflPaZ7Y+/n8YDn+O/WpLby+jneh7rF7OyqyX1bItvSs
-o7fKU+/FBnYTYphloyTdEJUYIqCGUGwiawFdX6gux8qeyRJtcxp5zkXG+Sx42TXm
-+qJJTOF+nnIienXeciqUpcGzFDFAqD8PDXlAEPjMIC0a8peywF3LXfuFCZebb9GG
-da6ahtp8QWIQyID3hNzOYyHm2OOIhlBmI00m+ErOpVEp1ZrHk/ex2g4LXYM4B8h5
-3DA/V87694xNI+V7htRYFw==</dsig:SignatureValue>
-    <dsig:KeyInfo>
-      <dsig:X509Data>
-        <dsig:X509IssuerSerial>
-          <dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
-          <dsig:X509SerialNumber>7</dsig:X509SerialNumber>
-        </dsig:X509IssuerSerial>
-        <dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt
-NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc
-NmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0PTAeFw0xNTA2MDUxMzIwMDhaFw0y
-NTA1MzExMzIwMDhaMIGEMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UECxML
-ZXhhbXBsZS5vcmcxLzAtBgNVBAMUJkNTLnNtcHRlLTQzMC0yLkxFQUYuTk9UX0ZP
-Ul9QUk9EVUNUSU9OMSUwIwYDVQQuExxRRlZseW03ZnVxbDZiUE9uWTM4YWFPMVpQ
-VzQ9MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA08vRdRvUh31Oi96E
-GHqfmYs2GhxKS7Y1AJpVGjPWQyZFYkwspzG9voK6rMbnXEQ5HRDJ0jZ5DaxS7zrm
-YIOsX6DQpl2kY8MTHXmWZFg623HID+XAowFqkTG7UtUpXsZ/vj+gOKu0PQPmdRLM
-Rg5Hs2yQxSS7/SizuG52CrAmsIeab9u/AOL10uLRmUBzLMaXt4uPz2i+3PXi+uVu
-lfy3tEQ3+QRNNsH2G6O6sURR+4nYB0cLLlINpHTdBixfGU/Eb9g/wpD3zrGcAV6Z
-XvxULNd4RcxH8Ys15QuvtdMGwW/8LW1/03WO5XeQRkcoPF44yV4XUeTE5weXYAaM
-ZH7hMwIDAQABo4HvMIHsMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgWgMB0GA1Ud
-DgQWBBRAVWXKbt+6qXps86djfxpo7Vk9bjCBrwYDVR0jBIGnMIGkgBTp5q3yvfdR
-LvVq+5ASiOYf5uOTzqGBiKSBhTCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDAS
-BgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5O
-T1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dN
-VkFMRlNlYz2CAQYwDQYJKoZIhvcNAQELBQADggEBAA4CsCDn8UKBcH7wroorNKbf
-ZVzwGSxNyCMTmDm38ZmriNpV7FCNTLek4xmf21ITafC9nNxpbWA7l9bG5dRnktwa
-JSlHZKDKKVEUHJYu/47YUlmt4YNVo+zN0iB/QLXoHu6yGw3/N7z4sBDyLGGPl5mh
-sAxuXpFr1ruTQVqx483L7ie/p0GV9vsoAJQTRTnIcvEs7rVHxIWEsiOE8AZozW72
-jIBKSy9jsxSGYgmMgbdkrs5c2hBvVim5i58PIzSCo/lI/5WRREESZIyZ9zIBSwIS
-cYueAupiCrOxzY6Xg3GZlMbbHElp4MnDeV3zv90UAuZXomorCOcnutqUe36J63E=</dsig:X509Certificate>
-      </dsig:X509Data>
-      <dsig:X509Data>
-        <dsig:X509IssuerSerial>
-          <dsig:X509IssuerName>dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
-          <dsig:X509SerialNumber>6</dsig:X509SerialNumber>
-        </dsig:X509IssuerSerial>
-        <dsig:X509Certificate>MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
-NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
-Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAxMTMy
-MDA4WjCBijEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
-b3JnMTUwMwYDVQQDFCwuc21wdGUtNDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1Jf
-UFJPRFVDVElPTjElMCMGA1UELhMcNmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0
-PTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjv758HrPTeThATXaFU
-JCyUlGbLxETJQ2lqXx5a9XL/FDNsMN11IZ9hhUfj/KV2aNDYJ2nsaInAeZ00kNgG
-OOPAqF0KainrO4vlYQB10nwcmfvI/BtqW4GFXBDYpIXvyF7ss4e4Zp52h+UVkfTY
-Dwf10W7vP8Gr1wKaIvFsuGbB35D3PfX+4lacF2cNMFSHLj+oiLug5vOpoo/QTS+o
-gBl2mGctSLaEBE9x/HO10Dy7WXrUpokPGcHhJzwOlbAnVt6X4kANVATf5ffy0UQE
-uROgsSUm+hK/HqmUXTE6Gy7Hi7sktdI6X3EnBdzse1vxNQTrKy6bMXswcgOkklnk
-5AECAwEAAaOB9TCB8jASBgNVHRMBAf8ECDAGAQH/AgECMAsGA1UdDwQEAwIBBjAd
-BgNVHQ4EFgQU6eat8r33US71avuQEojmH+bjk84wga8GA1UdIwSBpzCBpIAUDCnR
-dHFbcv4ANVUq2+wMVALFSeehgYikgYUwgYIxFDASBgNVBAoTC2V4YW1wbGUub3Jn
-MRQwEgYDVQQLEwtleGFtcGxlLm9yZzEtMCsGA1UEAxQkLnNtcHRlLTQzMC0yLlJP
-T1QuTk9UX0ZPUl9QUk9EVUNUSU9OMSUwIwYDVQQuExxEQ25SZEhGYmN2NEFOVlVx
-Mit3TVZBTEZTZWM9ggEFMA0GCSqGSIb3DQEBCwUAA4IBAQBGr/uVKvBE7yGcPdOG
-AaacD8zmEkb8BL+otrumW1BqAI0BIVghvuTDAKtk/cFy7Mbnnp/mTJ6h5F7lDON4
-YVBQ9gouw5+pLM61r/ZTF+shiWA4C4cwWb1X/gw82TXD2wXch9IJmcblrfrabHkB
-Y3wyyn5unqHm+uy/ZsNzoTmRcrxnPua5DyZKxGBHV0TEDzJMUMgluRcQwRs0HmG1
-vWeROkXRWyYiY2QAdpINuQUKUqjtFTtOGcA3I/Hd7vUiqqxNr9fL0H/HDvAbEmIw
-+YSFJ9uFyESvls8Lv5tydwhnqJBIKk19/CDIwMAPZnyT1WT3XwnD5hVRYljpgjm5
-xwd0</dsig:X509Certificate>
-      </dsig:X509Data>
-      <dsig:X509Data>
-        <dsig:X509IssuerSerial>
-          <dsig:X509IssuerName>dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
-          <dsig:X509SerialNumber>5</dsig:X509SerialNumber>
-        </dsig:X509IssuerSerial>
-        <dsig:X509Certificate>MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
-NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
-Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAyMTMy
-MDA4WjCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
-b3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJ
-T04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dNVkFMRlNlYz0wggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQdNLi0U0p9kkfszAymkW4fVTqG4KZ
-qNlO43eE4+ItjTr0qDEvyyq94tp2w1/7aag87Nzb386ibqFzldEt3u8xy9CXanUy
-Fg2vRzAJ+WgngmK8AdzHqdPzYTtIdMNj0GQkF+ze0VLM1QfAGUvsRzcqYJADD9om
-vsOnZiub92ezbL5swLaLpZq10i2HGYqDZxKlcslmaVXPgh7acmI9b3ledpLjOtvR
-NPI6tfy8jhjvCZY81+V5iZqyKTezrLTqqgNBlFjzIdCT1BRlbOlS55iOloRK8q9F
-TXqV6M1jqN6T4FlKzorjYWNEKp1V58DHBosAB0FXs+Sc10WWTuqL9Q3VAgMBAAGj
-gfUwgfIwEgYDVR0TAQH/BAgwBgEB/wIBAzALBgNVHQ8EBAMCAQYwHQYDVR0OBBYE
-FAwp0XRxW3L+ADVVKtvsDFQCxUnnMIGvBgNVHSMEgacwgaSAFAwp0XRxW3L+ADVV
-KtvsDFQCxUnnoYGIpIGFMIGCMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UE
-CxMLZXhhbXBsZS5vcmcxLTArBgNVBAMUJC5zbXB0ZS00MzAtMi5ST09ULk5PVF9G
-T1JfUFJPRFVDVElPTjElMCMGA1UELhMcRENuUmRIRmJjdjRBTlZVcTIrd01WQUxG
-U2VjPYIBBTANBgkqhkiG9w0BAQsFAAOCAQEAEOGcZTz1XGfZunxCnclrNDDsgLhy
-RvqxG7Li7enVyKF5798ckA17jCnkY/W9YwtjpgfEpjw9aGdCy6cviNu51jT5F9qg
-y0O2OXhtX47aS9G6r1m50cBmrciBxrqSTr6/co6jcRImRhTpvVcLcbv3emCLogBw
-9v93abXvbT+GZ6yc2OOArTZCFlrLW8XTDSDrPp/hida2NjZOrxJj6iFEh6+M+S7Z
-T/bwFNfuPDsDhtccoVt/hIM0imFnjKlwbo3HbJ3v+Lhy2oUS66d5ELHuuQnMuKFT
-pxf6/gl42q4gFbwBDp6jxy5L1J4LZGZIwsoTv6dFjo1MNttqmfMTheiwpQ==</dsig:X509Certificate>
-      </dsig:X509Data>
-    </dsig:KeyInfo>
-  </dsig:Signature>
-</CompositionPlaylist>
diff --git a/test/ref/DCP/encryption_test/pkl_59730183-23bc-491e-906b-1dd453ff9d11.xml b/test/ref/DCP/encryption_test/pkl_59730183-23bc-491e-906b-1dd453ff9d11.xml
deleted file mode 100644 (file)
index a97052e..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL">
-  <Id>urn:uuid:59730183-23bc-491e-906b-1dd453ff9d11</Id>
-  <AnnotationText>Created by libdcp</AnnotationText>
-  <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
-  <Issuer>OpenDCP 0.0.25</Issuer>
-  <Creator>OpenDCP 0.0.25</Creator>
-  <AssetList>
-    <Asset>
-      <Id>urn:uuid:b3eba4a0-f542-4937-b972-1cc4667ed01a</Id>
-      <AnnotationText>b3eba4a0-f542-4937-b972-1cc4667ed01a</AnnotationText>
-      <Hash>uZLkHEoyeW1kZfZXayWCcAWvtMs=</Hash>
-      <Size>9310</Size>
-      <Type>text/xml</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:2d4e8308-7197-41b8-8a0a-07a939d74971</Id>
-      <AnnotationText>2d4e8308-7197-41b8-8a0a-07a939d74971</AnnotationText>
-      <Hash>67diQ9tld/BCyMIzFM9yzBoIjKc=</Hash>
-      <Size>29896</Size>
-      <Type>application/mxf</Type>
-    </Asset>
-    <Asset>
-      <Id>urn:uuid:99c2c0d0-7491-4ad0-86d5-4f0af19d71f6</Id>
-      <AnnotationText>99c2c0d0-7491-4ad0-86d5-4f0af19d71f6</AnnotationText>
-      <Hash>sskK3KhvnddXtjVricwXXuxLOQ0=</Hash>
-      <Size>165454</Size>
-      <Type>application/mxf</Type>
-    </Asset>
-  </AssetList>
-  <Signer xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-    <dsig:X509Data>
-      <dsig:X509IssuerSerial>
-        <dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
-        <dsig:X509SerialNumber>7</dsig:X509SerialNumber>
-      </dsig:X509IssuerSerial>
-      <dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName>
-    </dsig:X509Data>
-  </Signer>
-  <dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-    <dsig:SignedInfo>
-      <dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
-      <dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-      <dsig:Reference URI="">
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-        <dsig:DigestValue>dna3BxqzhB2VPCEvIU2n/vVtlGE=</dsig:DigestValue>
-      </dsig:Reference>
-    </dsig:SignedInfo>
-    <dsig:SignatureValue>T7aFfkzcZ0E9gVMM1edd1STT8COAJ3VPUCjiaT5tXo5yhxB6WtBqucFcrZnbpvEg
-nwWLUk9W40XRvPUeKf9GWqsqIFr4jk9o6sc74O0MGcQmN4u1DSGF5ahv5XbKoKAS
-HO/+4LaanSzVpXgwbod/1/A0HVMZCmS0s0lUSY+bJbmbC/ExUTUXgO1cU7Xexdg2
-KYs6LkBgio7EZ9reXsAaDeGxXN790ndtAAoSHvYOt4cNePJXs/Q07/mOg4gFI655
-uPl2V3vLpdB/XFJ6e6OS2t1SwrtnATuE5Z9mL+ddn4D6Q8Vp9vXlv7rJxUcGgyWU
-mWiCpr1bWb0R4vsB/KQkNw==</dsig:SignatureValue>
-    <dsig:KeyInfo>
-      <dsig:X509Data>
-        <dsig:X509IssuerSerial>
-          <dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
-          <dsig:X509SerialNumber>7</dsig:X509SerialNumber>
-        </dsig:X509IssuerSerial>
-        <dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt
-NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc
-NmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0PTAeFw0xNTA2MDUxMzIwMDhaFw0y
-NTA1MzExMzIwMDhaMIGEMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UECxML
-ZXhhbXBsZS5vcmcxLzAtBgNVBAMUJkNTLnNtcHRlLTQzMC0yLkxFQUYuTk9UX0ZP
-Ul9QUk9EVUNUSU9OMSUwIwYDVQQuExxRRlZseW03ZnVxbDZiUE9uWTM4YWFPMVpQ
-VzQ9MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA08vRdRvUh31Oi96E
-GHqfmYs2GhxKS7Y1AJpVGjPWQyZFYkwspzG9voK6rMbnXEQ5HRDJ0jZ5DaxS7zrm
-YIOsX6DQpl2kY8MTHXmWZFg623HID+XAowFqkTG7UtUpXsZ/vj+gOKu0PQPmdRLM
-Rg5Hs2yQxSS7/SizuG52CrAmsIeab9u/AOL10uLRmUBzLMaXt4uPz2i+3PXi+uVu
-lfy3tEQ3+QRNNsH2G6O6sURR+4nYB0cLLlINpHTdBixfGU/Eb9g/wpD3zrGcAV6Z
-XvxULNd4RcxH8Ys15QuvtdMGwW/8LW1/03WO5XeQRkcoPF44yV4XUeTE5weXYAaM
-ZH7hMwIDAQABo4HvMIHsMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgWgMB0GA1Ud
-DgQWBBRAVWXKbt+6qXps86djfxpo7Vk9bjCBrwYDVR0jBIGnMIGkgBTp5q3yvfdR
-LvVq+5ASiOYf5uOTzqGBiKSBhTCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDAS
-BgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5O
-T1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dN
-VkFMRlNlYz2CAQYwDQYJKoZIhvcNAQELBQADggEBAA4CsCDn8UKBcH7wroorNKbf
-ZVzwGSxNyCMTmDm38ZmriNpV7FCNTLek4xmf21ITafC9nNxpbWA7l9bG5dRnktwa
-JSlHZKDKKVEUHJYu/47YUlmt4YNVo+zN0iB/QLXoHu6yGw3/N7z4sBDyLGGPl5mh
-sAxuXpFr1ruTQVqx483L7ie/p0GV9vsoAJQTRTnIcvEs7rVHxIWEsiOE8AZozW72
-jIBKSy9jsxSGYgmMgbdkrs5c2hBvVim5i58PIzSCo/lI/5WRREESZIyZ9zIBSwIS
-cYueAupiCrOxzY6Xg3GZlMbbHElp4MnDeV3zv90UAuZXomorCOcnutqUe36J63E=</dsig:X509Certificate>
-      </dsig:X509Data>
-      <dsig:X509Data>
-        <dsig:X509IssuerSerial>
-          <dsig:X509IssuerName>dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
-          <dsig:X509SerialNumber>6</dsig:X509SerialNumber>
-        </dsig:X509IssuerSerial>
-        <dsig:X509Certificate>MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
-NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
-Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAxMTMy
-MDA4WjCBijEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
-b3JnMTUwMwYDVQQDFCwuc21wdGUtNDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1Jf
-UFJPRFVDVElPTjElMCMGA1UELhMcNmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0
-PTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjv758HrPTeThATXaFU
-JCyUlGbLxETJQ2lqXx5a9XL/FDNsMN11IZ9hhUfj/KV2aNDYJ2nsaInAeZ00kNgG
-OOPAqF0KainrO4vlYQB10nwcmfvI/BtqW4GFXBDYpIXvyF7ss4e4Zp52h+UVkfTY
-Dwf10W7vP8Gr1wKaIvFsuGbB35D3PfX+4lacF2cNMFSHLj+oiLug5vOpoo/QTS+o
-gBl2mGctSLaEBE9x/HO10Dy7WXrUpokPGcHhJzwOlbAnVt6X4kANVATf5ffy0UQE
-uROgsSUm+hK/HqmUXTE6Gy7Hi7sktdI6X3EnBdzse1vxNQTrKy6bMXswcgOkklnk
-5AECAwEAAaOB9TCB8jASBgNVHRMBAf8ECDAGAQH/AgECMAsGA1UdDwQEAwIBBjAd
-BgNVHQ4EFgQU6eat8r33US71avuQEojmH+bjk84wga8GA1UdIwSBpzCBpIAUDCnR
-dHFbcv4ANVUq2+wMVALFSeehgYikgYUwgYIxFDASBgNVBAoTC2V4YW1wbGUub3Jn
-MRQwEgYDVQQLEwtleGFtcGxlLm9yZzEtMCsGA1UEAxQkLnNtcHRlLTQzMC0yLlJP
-T1QuTk9UX0ZPUl9QUk9EVUNUSU9OMSUwIwYDVQQuExxEQ25SZEhGYmN2NEFOVlVx
-Mit3TVZBTEZTZWM9ggEFMA0GCSqGSIb3DQEBCwUAA4IBAQBGr/uVKvBE7yGcPdOG
-AaacD8zmEkb8BL+otrumW1BqAI0BIVghvuTDAKtk/cFy7Mbnnp/mTJ6h5F7lDON4
-YVBQ9gouw5+pLM61r/ZTF+shiWA4C4cwWb1X/gw82TXD2wXch9IJmcblrfrabHkB
-Y3wyyn5unqHm+uy/ZsNzoTmRcrxnPua5DyZKxGBHV0TEDzJMUMgluRcQwRs0HmG1
-vWeROkXRWyYiY2QAdpINuQUKUqjtFTtOGcA3I/Hd7vUiqqxNr9fL0H/HDvAbEmIw
-+YSFJ9uFyESvls8Lv5tydwhnqJBIKk19/CDIwMAPZnyT1WT3XwnD5hVRYljpgjm5
-xwd0</dsig:X509Certificate>
-      </dsig:X509Data>
-      <dsig:X509Data>
-        <dsig:X509IssuerSerial>
-          <dsig:X509IssuerName>dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
-          <dsig:X509SerialNumber>5</dsig:X509SerialNumber>
-        </dsig:X509IssuerSerial>
-        <dsig:X509Certificate>MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
-NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
-Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAyMTMy
-MDA4WjCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
-b3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJ
-T04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dNVkFMRlNlYz0wggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQdNLi0U0p9kkfszAymkW4fVTqG4KZ
-qNlO43eE4+ItjTr0qDEvyyq94tp2w1/7aag87Nzb386ibqFzldEt3u8xy9CXanUy
-Fg2vRzAJ+WgngmK8AdzHqdPzYTtIdMNj0GQkF+ze0VLM1QfAGUvsRzcqYJADD9om
-vsOnZiub92ezbL5swLaLpZq10i2HGYqDZxKlcslmaVXPgh7acmI9b3ledpLjOtvR
-NPI6tfy8jhjvCZY81+V5iZqyKTezrLTqqgNBlFjzIdCT1BRlbOlS55iOloRK8q9F
-TXqV6M1jqN6T4FlKzorjYWNEKp1V58DHBosAB0FXs+Sc10WWTuqL9Q3VAgMBAAGj
-gfUwgfIwEgYDVR0TAQH/BAgwBgEB/wIBAzALBgNVHQ8EBAMCAQYwHQYDVR0OBBYE
-FAwp0XRxW3L+ADVVKtvsDFQCxUnnMIGvBgNVHSMEgacwgaSAFAwp0XRxW3L+ADVV
-KtvsDFQCxUnnoYGIpIGFMIGCMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UE
-CxMLZXhhbXBsZS5vcmcxLTArBgNVBAMUJC5zbXB0ZS00MzAtMi5ST09ULk5PVF9G
-T1JfUFJPRFVDVElPTjElMCMGA1UELhMcRENuUmRIRmJjdjRBTlZVcTIrd01WQUxG
-U2VjPYIBBTANBgkqhkiG9w0BAQsFAAOCAQEAEOGcZTz1XGfZunxCnclrNDDsgLhy
-RvqxG7Li7enVyKF5798ckA17jCnkY/W9YwtjpgfEpjw9aGdCy6cviNu51jT5F9qg
-y0O2OXhtX47aS9G6r1m50cBmrciBxrqSTr6/co6jcRImRhTpvVcLcbv3emCLogBw
-9v93abXvbT+GZ6yc2OOArTZCFlrLW8XTDSDrPp/hida2NjZOrxJj6iFEh6+M+S7Z
-T/bwFNfuPDsDhtccoVt/hIM0imFnjKlwbo3HbJ3v+Lhy2oUS66d5ELHuuQnMuKFT
-pxf6/gl42q4gFbwBDp6jxy5L1J4LZGZIwsoTv6dFjo1MNttqmfMTheiwpQ==</dsig:X509Certificate>
-      </dsig:X509Data>
-    </dsig:KeyInfo>
-  </dsig:Signature>
-</PackingList>
diff --git a/test/ref/DCP/encryption_test/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml b/test/ref/DCP/encryption_test/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml
new file mode 100644 (file)
index 0000000..fdfb170
--- /dev/null
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL">
+  <Id>urn:uuid:6af1e0c1-c441-47f8-a502-3efd46b1fa4f</Id>
+  <AnnotationText>Created by libdcp</AnnotationText>
+  <IssueDate>2012-07-17T04:45:18+00:00</IssueDate>
+  <Issuer>OpenDCP 0.0.25</Issuer>
+  <Creator>OpenDCP 0.0.25</Creator>
+  <AssetList>
+    <Asset>
+      <Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id>
+      <AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText>
+      <Hash>dhoWJ3yykLSeAOQVOUNvMxsiljk=</Hash>
+      <Size>9310</Size>
+      <Type>text/xml</Type>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
+      <AnnotationText>46c3eb45-15e5-47d6-8684-d8641e4dc516</AnnotationText>
+      <Hash>EdbLFybsoLbZ3KB2jFtWZxMEMHI=</Hash>
+      <Size>29896</Size>
+      <Type>application/mxf</Type>
+    </Asset>
+    <Asset>
+      <Id>urn:uuid:d5f633d3-cb6e-4c04-85ae-4b2da9422852</Id>
+      <AnnotationText>d5f633d3-cb6e-4c04-85ae-4b2da9422852</AnnotationText>
+      <Hash>h7XEYV80a8CvQ5wS1OR3ldbkLM4=</Hash>
+      <Size>165454</Size>
+      <Type>application/mxf</Type>
+    </Asset>
+  </AssetList>
+  <Signer xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
+    <dsig:X509Data>
+      <dsig:X509IssuerSerial>
+        <dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
+        <dsig:X509SerialNumber>7</dsig:X509SerialNumber>
+      </dsig:X509IssuerSerial>
+      <dsig:X509SubjectName>dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509SubjectName>
+    </dsig:X509Data>
+  </Signer>
+  <dsig:Signature xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
+    <dsig:SignedInfo>
+      <dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/>
+      <dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+      <dsig:Reference URI="">
+        <dsig:Transforms>
+          <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
+        </dsig:Transforms>
+        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+        <dsig:DigestValue>92Er8kJ8u9u76Fb1EUNVyeblJd0=</dsig:DigestValue>
+      </dsig:Reference>
+    </dsig:SignedInfo>
+    <dsig:SignatureValue>SdxywkzTQtRWscRC9dmEoepc2dJ9cIi/GShodKNcRAYJBpm+zqpMCJ3wDT3q+pvT
+igG/hnkMRKQlAjK1I/VBEUGfEisl8QAerme8ff+GzY9vYlPoTyGQnqrNY+JBeir7
+r46JELWAxiRa+bMM/Dw3PLrRtQ/0EtZIcPNrJ6K+VeYHjV9KaaFXB740bJ1emVtY
+BqaAyXG2gk/4v1TFf19IBNH0cwu/nwJ7Cg6Xp2dKkRqtmOITYdxV9Ro/FxPs0M4Q
+vuwoOUJQxtgs4WgvGwHAvzTkyr6E5tX7z0uh5YEbH5/IX8l1fOvMi3LHK0E77d5k
+8IdST9nHTtvpHrJgsDUI4A==</dsig:SignatureValue>
+    <dsig:KeyInfo>
+      <dsig:X509Data>
+        <dsig:X509IssuerSerial>
+          <dsig:X509IssuerName>dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
+          <dsig:X509SerialNumber>7</dsig:X509SerialNumber>
+        </dsig:X509IssuerSerial>
+        <dsig:X509Certificate>MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh
+bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt
+NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc
+NmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0PTAeFw0xNTA2MDUxMzIwMDhaFw0y
+NTA1MzExMzIwMDhaMIGEMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UECxML
+ZXhhbXBsZS5vcmcxLzAtBgNVBAMUJkNTLnNtcHRlLTQzMC0yLkxFQUYuTk9UX0ZP
+Ul9QUk9EVUNUSU9OMSUwIwYDVQQuExxRRlZseW03ZnVxbDZiUE9uWTM4YWFPMVpQ
+VzQ9MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA08vRdRvUh31Oi96E
+GHqfmYs2GhxKS7Y1AJpVGjPWQyZFYkwspzG9voK6rMbnXEQ5HRDJ0jZ5DaxS7zrm
+YIOsX6DQpl2kY8MTHXmWZFg623HID+XAowFqkTG7UtUpXsZ/vj+gOKu0PQPmdRLM
+Rg5Hs2yQxSS7/SizuG52CrAmsIeab9u/AOL10uLRmUBzLMaXt4uPz2i+3PXi+uVu
+lfy3tEQ3+QRNNsH2G6O6sURR+4nYB0cLLlINpHTdBixfGU/Eb9g/wpD3zrGcAV6Z
+XvxULNd4RcxH8Ys15QuvtdMGwW/8LW1/03WO5XeQRkcoPF44yV4XUeTE5weXYAaM
+ZH7hMwIDAQABo4HvMIHsMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgWgMB0GA1Ud
+DgQWBBRAVWXKbt+6qXps86djfxpo7Vk9bjCBrwYDVR0jBIGnMIGkgBTp5q3yvfdR
+LvVq+5ASiOYf5uOTzqGBiKSBhTCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDAS
+BgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5O
+T1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dN
+VkFMRlNlYz2CAQYwDQYJKoZIhvcNAQELBQADggEBAA4CsCDn8UKBcH7wroorNKbf
+ZVzwGSxNyCMTmDm38ZmriNpV7FCNTLek4xmf21ITafC9nNxpbWA7l9bG5dRnktwa
+JSlHZKDKKVEUHJYu/47YUlmt4YNVo+zN0iB/QLXoHu6yGw3/N7z4sBDyLGGPl5mh
+sAxuXpFr1ruTQVqx483L7ie/p0GV9vsoAJQTRTnIcvEs7rVHxIWEsiOE8AZozW72
+jIBKSy9jsxSGYgmMgbdkrs5c2hBvVim5i58PIzSCo/lI/5WRREESZIyZ9zIBSwIS
+cYueAupiCrOxzY6Xg3GZlMbbHElp4MnDeV3zv90UAuZXomorCOcnutqUe36J63E=</dsig:X509Certificate>
+      </dsig:X509Data>
+      <dsig:X509Data>
+        <dsig:X509IssuerSerial>
+          <dsig:X509IssuerName>dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
+          <dsig:X509SerialNumber>6</dsig:X509SerialNumber>
+        </dsig:X509IssuerSerial>
+        <dsig:X509Certificate>MIIEfzCCA2egAwIBAgIBBjANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
+bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
+NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
+Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAxMTMy
+MDA4WjCBijEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
+b3JnMTUwMwYDVQQDFCwuc21wdGUtNDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1Jf
+UFJPRFVDVElPTjElMCMGA1UELhMcNmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0
+PTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjv758HrPTeThATXaFU
+JCyUlGbLxETJQ2lqXx5a9XL/FDNsMN11IZ9hhUfj/KV2aNDYJ2nsaInAeZ00kNgG
+OOPAqF0KainrO4vlYQB10nwcmfvI/BtqW4GFXBDYpIXvyF7ss4e4Zp52h+UVkfTY
+Dwf10W7vP8Gr1wKaIvFsuGbB35D3PfX+4lacF2cNMFSHLj+oiLug5vOpoo/QTS+o
+gBl2mGctSLaEBE9x/HO10Dy7WXrUpokPGcHhJzwOlbAnVt6X4kANVATf5ffy0UQE
+uROgsSUm+hK/HqmUXTE6Gy7Hi7sktdI6X3EnBdzse1vxNQTrKy6bMXswcgOkklnk
+5AECAwEAAaOB9TCB8jASBgNVHRMBAf8ECDAGAQH/AgECMAsGA1UdDwQEAwIBBjAd
+BgNVHQ4EFgQU6eat8r33US71avuQEojmH+bjk84wga8GA1UdIwSBpzCBpIAUDCnR
+dHFbcv4ANVUq2+wMVALFSeehgYikgYUwgYIxFDASBgNVBAoTC2V4YW1wbGUub3Jn
+MRQwEgYDVQQLEwtleGFtcGxlLm9yZzEtMCsGA1UEAxQkLnNtcHRlLTQzMC0yLlJP
+T1QuTk9UX0ZPUl9QUk9EVUNUSU9OMSUwIwYDVQQuExxEQ25SZEhGYmN2NEFOVlVx
+Mit3TVZBTEZTZWM9ggEFMA0GCSqGSIb3DQEBCwUAA4IBAQBGr/uVKvBE7yGcPdOG
+AaacD8zmEkb8BL+otrumW1BqAI0BIVghvuTDAKtk/cFy7Mbnnp/mTJ6h5F7lDON4
+YVBQ9gouw5+pLM61r/ZTF+shiWA4C4cwWb1X/gw82TXD2wXch9IJmcblrfrabHkB
+Y3wyyn5unqHm+uy/ZsNzoTmRcrxnPua5DyZKxGBHV0TEDzJMUMgluRcQwRs0HmG1
+vWeROkXRWyYiY2QAdpINuQUKUqjtFTtOGcA3I/Hd7vUiqqxNr9fL0H/HDvAbEmIw
++YSFJ9uFyESvls8Lv5tydwhnqJBIKk19/CDIwMAPZnyT1WT3XwnD5hVRYljpgjm5
+xwd0</dsig:X509Certificate>
+      </dsig:X509Data>
+      <dsig:X509Data>
+        <dsig:X509IssuerSerial>
+          <dsig:X509IssuerName>dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org</dsig:X509IssuerName>
+          <dsig:X509SerialNumber>5</dsig:X509SerialNumber>
+        </dsig:X509IssuerSerial>
+        <dsig:X509Certificate>MIIEdzCCA1+gAwIBAgIBBTANBgkqhkiG9w0BAQsFADCBgjEUMBIGA1UEChMLZXhh
+bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMS0wKwYDVQQDFCQuc21wdGUt
+NDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJT04xJTAjBgNVBC4THERDblJkSEZi
+Y3Y0QU5WVXEyK3dNVkFMRlNlYz0wHhcNMTUwNjA1MTMyMDA4WhcNMjUwNjAyMTMy
+MDA4WjCBgjEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUu
+b3JnMS0wKwYDVQQDFCQuc21wdGUtNDMwLTIuUk9PVC5OT1RfRk9SX1BST0RVQ1RJ
+T04xJTAjBgNVBC4THERDblJkSEZiY3Y0QU5WVXEyK3dNVkFMRlNlYz0wggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQdNLi0U0p9kkfszAymkW4fVTqG4KZ
+qNlO43eE4+ItjTr0qDEvyyq94tp2w1/7aag87Nzb386ibqFzldEt3u8xy9CXanUy
+Fg2vRzAJ+WgngmK8AdzHqdPzYTtIdMNj0GQkF+ze0VLM1QfAGUvsRzcqYJADD9om
+vsOnZiub92ezbL5swLaLpZq10i2HGYqDZxKlcslmaVXPgh7acmI9b3ledpLjOtvR
+NPI6tfy8jhjvCZY81+V5iZqyKTezrLTqqgNBlFjzIdCT1BRlbOlS55iOloRK8q9F
+TXqV6M1jqN6T4FlKzorjYWNEKp1V58DHBosAB0FXs+Sc10WWTuqL9Q3VAgMBAAGj
+gfUwgfIwEgYDVR0TAQH/BAgwBgEB/wIBAzALBgNVHQ8EBAMCAQYwHQYDVR0OBBYE
+FAwp0XRxW3L+ADVVKtvsDFQCxUnnMIGvBgNVHSMEgacwgaSAFAwp0XRxW3L+ADVV
+KtvsDFQCxUnnoYGIpIGFMIGCMRQwEgYDVQQKEwtleGFtcGxlLm9yZzEUMBIGA1UE
+CxMLZXhhbXBsZS5vcmcxLTArBgNVBAMUJC5zbXB0ZS00MzAtMi5ST09ULk5PVF9G
+T1JfUFJPRFVDVElPTjElMCMGA1UELhMcRENuUmRIRmJjdjRBTlZVcTIrd01WQUxG
+U2VjPYIBBTANBgkqhkiG9w0BAQsFAAOCAQEAEOGcZTz1XGfZunxCnclrNDDsgLhy
+RvqxG7Li7enVyKF5798ckA17jCnkY/W9YwtjpgfEpjw9aGdCy6cviNu51jT5F9qg
+y0O2OXhtX47aS9G6r1m50cBmrciBxrqSTr6/co6jcRImRhTpvVcLcbv3emCLogBw
+9v93abXvbT+GZ6yc2OOArTZCFlrLW8XTDSDrPp/hida2NjZOrxJj6iFEh6+M+S7Z
+T/bwFNfuPDsDhtccoVt/hIM0imFnjKlwbo3HbJ3v+Lhy2oUS66d5ELHuuQnMuKFT
+pxf6/gl42q4gFbwBDp6jxy5L1J4LZGZIwsoTv6dFjo1MNttqmfMTheiwpQ==</dsig:X509Certificate>
+      </dsig:X509Data>
+    </dsig:KeyInfo>
+  </dsig:Signature>
+</PackingList>
index 9f9824cf9dc8639d89388d62d39bbd20539fd040..67e3b89b71d9f200a37f388ee9b660bdae32e3bb 100644 (file)
Binary files a/test/ref/DCP/encryption_test/video.mxf and b/test/ref/DCP/encryption_test/video.mxf differ
index 5d0e85da9453b51f8c81c8bdfd97121a8e4a3992..9c8e07c57d47efcf6563a755e4242d5319557c1b 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AssetMap xmlns="http://www.digicine.com/PROTO-ASDCP-AM-20040311#">
-  <Id>urn:uuid:20a39790-cad4-4342-98d9-0b0cf1cb6027</Id>
+  <Id>urn:uuid:47a8e83e-fd5f-445d-a1bc-9f59c5289c34</Id>
   <AnnotationText>Created by libdcp</AnnotationText>
   <VolumeCount>1</VolumeCount>
   <IssueDate>2018-09-02T04:45:18+00:00</IssueDate>
@@ -8,11 +8,11 @@
   <Creator>libdcp</Creator>
   <AssetList>
     <Asset>
-      <Id>urn:uuid:f5aab304-8145-44e3-a265-aa8d8812d8a2</Id>
+      <Id>urn:uuid:e94b8a0d-27f7-408a-af16-78d3df419a91</Id>
       <PackingList>true</PackingList>
       <ChunkList>
         <Chunk>
-          <Path>pkl_f5aab304-8145-44e3-a265-aa8d8812d8a2.xml</Path>
+          <Path>pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1114</Length>
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:f28b567b-3b9a-417a-aee4-6fc1a2c6a3af</Id>
+      <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
       <ChunkList>
         <Chunk>
-          <Path>cpl_f28b567b-3b9a-417a-aee4-6fc1a2c6a3af.xml</Path>
+          <Path>cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>1105</Length>
       </ChunkList>
     </Asset>
     <Asset>
-      <Id>urn:uuid:ef5c6baa-be2d-4f86-9f15-b1acc792ee8b</Id>
+      <Id>urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71</Id>
       <ChunkList>
         <Chunk>
-          <Path>ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png</Path>
+          <Path>d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
           <Length>44935</Length>
index 86c4f0aade808fe4b07f4cbf5196ceec02cf9123..d1c8fa7e4b3162132ae4635ed43d3d8c6fe08b36 100644 (file)
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<DCSubtitle Version="1.0"><SubtitleID>a6c58cff-3e1e-4b38-acec-a42224475ef6</SubtitleID><MovieTitle>Test</MovieTitle><ReelNumber>1</ReelNumber><Language>EN</Language><Subtitle SpotNumber="1" TimeIn="00:04:09:229" TimeOut="00:04:11:229" FadeUpTime="0" FadeDownTime="0"><Image VAlign="top" VPosition="80">ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png</Image></Subtitle></DCSubtitle>
+<DCSubtitle Version="1.0"><SubtitleID>a6c58cff-3e1e-4b38-acec-a42224475ef6</SubtitleID><MovieTitle>Test</MovieTitle><ReelNumber>1</ReelNumber><Language>EN</Language><Subtitle SpotNumber="1" TimeIn="00:04:09:229" TimeOut="00:04:11:229" FadeUpTime="0" FadeDownTime="0"><Image VAlign="top" VPosition="80">d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png</Image></Subtitle></DCSubtitle>
index 3933e4304a5889982a91042ec9103aff974b02bd..b5b2535f2f6052c4425e14d2c9551bb7819f3d92 100644 (file)
@@ -35,6 +35,8 @@
 #define BOOST_TEST_MODULE libdcp_test
 #include "util.h"
 #include "test.h"
+#include <asdcp/KM_util.h>
+#include <asdcp/KM_prng.h>
 #include <libxml++/libxml++.h>
 #include <boost/test/unit_test.hpp>
 #include <cstdio>
@@ -174,4 +176,18 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
        fclose (check_file);
 }
 
+
+RNGFixer::RNGFixer ()
+{
+       Kumu::cth_test = true;
+       Kumu::FortunaRNG().Reset();
+}
+
+
+RNGFixer::~RNGFixer ()
+{
+       Kumu::cth_test = false;
+}
+
+
 BOOST_GLOBAL_FIXTURE (TestConfig);
index 69ed85be8937b50cce89dd87b6c7e4a8b02ddaf9..db33067c1b4c0f795bc23e3f10aff54bfb58cb4d 100644 (file)
@@ -29,3 +29,14 @@ extern boost::filesystem::path xsd_test;
 extern void check_xml (xmlpp::Element* ref, xmlpp::Element* test, std::list<std::string> ignore);
 extern void check_xml (std::string ref, std::string test, std::list<std::string> ignore);
 extern void check_file (boost::filesystem::path ref, boost::filesystem::path check);
+
+/** Creating an object of this class will make asdcplib's random number generation
+ *  (more) predictable.
+ */
+class RNGFixer
+{
+public:
+       RNGFixer ();
+       ~RNGFixer ();
+};
+
index 1b50658664ee3c75d9ac9d93769f4cd326ef9d60..e025a013f2dba6ad457a56ed869ca6a74b45cc8f 100644 (file)
@@ -62,7 +62,6 @@ using boost::shared_ptr;
 
 
 static list<pair<string, optional<boost::filesystem::path> > > stages;
-static int next_verify_test_number = 1;
 
 static void
 stage (string s, optional<boost::filesystem::path> p)
@@ -135,17 +134,17 @@ dump_notes (list<dcp::VerificationNote> const & notes)
 BOOST_AUTO_TEST_CASE (verify_test1)
 {
        stages.clear ();
-       vector<boost::filesystem::path> directories = setup (1, next_verify_test_number);
+       vector<boost::filesystem::path> directories = setup (1, 1);
        list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
 
-       boost::filesystem::path const cpl_file = dcp::String::compose("build/test/verify_test%1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml", next_verify_test_number);
-       boost::filesystem::path const pkl_file = dcp::String::compose("build/test/verify_test1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml", next_verify_test_number);
-       boost::filesystem::path const assetmap_file = dcp::String::compose("build/test/verify_test1/ASSETMAP.xml", next_verify_test_number);
+       boost::filesystem::path const cpl_file = "build/test/verify_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml";
+       boost::filesystem::path const pkl_file = "build/test/verify_test1/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml";
+       boost::filesystem::path const assetmap_file = "build/test/verify_test1/ASSETMAP.xml";
 
        list<pair<string, optional<boost::filesystem::path> > >::const_iterator st = stages.begin();
        BOOST_CHECK_EQUAL (st->first, "Checking DCP");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test1"));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking CPL");
        BOOST_REQUIRE (st->second);
@@ -156,15 +155,15 @@ BOOST_AUTO_TEST_CASE (verify_test1)
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking picture asset hash");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1/video.mxf", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test1/video.mxf"));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking picture frame sizes");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1/video.mxf", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test1/video.mxf"));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking sound asset hash");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1/audio.mxf", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test1/audio.mxf"));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking PKL");
        BOOST_REQUIRE (st->second);
@@ -179,14 +178,12 @@ BOOST_AUTO_TEST_CASE (verify_test1)
        dump_notes (notes);
 
        BOOST_CHECK_EQUAL (notes.size(), 0);
-
-       next_verify_test_number++;
 }
 
 /* Corrupt the MXFs and check that this is spotted */
 BOOST_AUTO_TEST_CASE (verify_test2)
 {
-       vector<boost::filesystem::path> directories = setup (1, next_verify_test_number++);
+       vector<boost::filesystem::path> directories = setup (1, 2);
 
        FILE* mod = fopen("build/test/verify_test2/video.mxf", "r+b");
        BOOST_REQUIRE (mod);
@@ -213,7 +210,7 @@ BOOST_AUTO_TEST_CASE (verify_test2)
 /* Corrupt the hashes in the PKL and check that the disagreement between CPL and PKL is spotted */
 BOOST_AUTO_TEST_CASE (verify_test3)
 {
-       vector<boost::filesystem::path> directories = setup (1, next_verify_test_number++);
+       vector<boost::filesystem::path> directories = setup (1, 3);
 
        {
                Editor e ("build/test/verify_test3/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml");
@@ -249,7 +246,7 @@ BOOST_AUTO_TEST_CASE (verify_test3)
 /* Corrupt the ContentKind in the CPL */
 BOOST_AUTO_TEST_CASE (verify_test4)
 {
-       vector<boost::filesystem::path> directories = setup (1, next_verify_test_number++);
+       vector<boost::filesystem::path> directories = setup (1, 4);
 
        {
                Editor e ("build/test/verify_test4/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml");
@@ -355,7 +352,7 @@ void check_after_replace (
 BOOST_AUTO_TEST_CASE (verify_test5)
 {
        check_after_replace (
-                       next_verify_test_number++, &cpl,
+                       5, &cpl,
                        "<FrameRate>24 1", "<FrameRate>99 1",
                        dcp::VerificationNote::CPL_HASH_INCORRECT,
                        dcp::VerificationNote::INVALID_PICTURE_FRAME_RATE
@@ -365,7 +362,7 @@ BOOST_AUTO_TEST_CASE (verify_test5)
 /* Missing asset */
 BOOST_AUTO_TEST_CASE (verify_test6)
 {
-       vector<boost::filesystem::path> directories = setup (1, next_verify_test_number++);
+       vector<boost::filesystem::path> directories = setup (1, 6);
 
        boost::filesystem::remove ("build/test/verify_test6/video.mxf");
        list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
@@ -386,7 +383,7 @@ assetmap (int n)
 BOOST_AUTO_TEST_CASE (verify_test7)
 {
        check_after_replace (
-                       next_verify_test_number++, &assetmap,
+                       7, &assetmap,
                        "<Path>video.mxf</Path>", "<Path></Path>",
                        dcp::VerificationNote::EMPTY_ASSET_PATH
                        );
@@ -396,7 +393,7 @@ BOOST_AUTO_TEST_CASE (verify_test7)
 BOOST_AUTO_TEST_CASE (verify_test8)
 {
        check_after_replace (
-                       next_verify_test_number++, &cpl,
+                       8, &cpl,
                        "http://www.smpte-ra.org/schemas/429-7/2006/CPL", "http://www.digicine.com/PROTO-ASDCP-CPL-20040511#",
                        dcp::VerificationNote::MISMATCHED_STANDARD,
                        dcp::VerificationNote::XML_VALIDATION_ERROR,
@@ -409,7 +406,7 @@ BOOST_AUTO_TEST_CASE (verify_test9)
 {
        /* There's no CPL_HASH_INCORRECT error here because it can't find the correct hash by ID (since the ID is wrong) */
        check_after_replace (
-                       next_verify_test_number++, &cpl,
+                       9, &cpl,
                        "<Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b", "<Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375",
                        dcp::VerificationNote::XML_VALIDATION_ERROR
                        );
@@ -419,7 +416,7 @@ BOOST_AUTO_TEST_CASE (verify_test9)
 BOOST_AUTO_TEST_CASE (verify_test10)
 {
        check_after_replace (
-                       next_verify_test_number++, &cpl,
+                       10, &cpl,
                        "<IssueDate>", "<IssueDate>x",
                        dcp::VerificationNote::XML_VALIDATION_ERROR,
                        dcp::VerificationNote::CPL_HASH_INCORRECT
@@ -430,7 +427,7 @@ BOOST_AUTO_TEST_CASE (verify_test10)
 BOOST_AUTO_TEST_CASE (verify_test11)
 {
        check_after_replace (
-               next_verify_test_number++, &pkl,
+               11, &pkl,
                "<Id>urn:uuid:ae8", "<Id>urn:uuid:xe8",
                dcp::VerificationNote::XML_VALIDATION_ERROR
                );
@@ -440,7 +437,7 @@ BOOST_AUTO_TEST_CASE (verify_test11)
 BOOST_AUTO_TEST_CASE (verify_test12)
 {
        check_after_replace (
-               next_verify_test_number++, &asset_map,
+               12, &asset_map,
                "<Id>urn:uuid:74e", "<Id>urn:uuid:x4e",
                dcp::VerificationNote::XML_VALIDATION_ERROR
                );
@@ -450,17 +447,17 @@ BOOST_AUTO_TEST_CASE (verify_test12)
 BOOST_AUTO_TEST_CASE (verify_test13)
 {
        stages.clear ();
-       vector<boost::filesystem::path> directories = setup (3, next_verify_test_number);
+       vector<boost::filesystem::path> directories = setup (3, 13);
        list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
 
-       boost::filesystem::path const cpl_file = dcp::String::compose("build/test/verify_test%1/cpl_cbfd2bc0-21cf-4a8f-95d8-9cddcbe51296.xml", next_verify_test_number);
-       boost::filesystem::path const pkl_file = dcp::String::compose("build/test/verify_test%1/pkl_d87a950c-bd6f-41f6-90cc-56ccd673e131.xml", next_verify_test_number);
-       boost::filesystem::path const assetmap_file = dcp::String::compose("build/test/verify_test%1/ASSETMAP", next_verify_test_number);
+       boost::filesystem::path const cpl_file = "build/test/verify_test13/cpl_cbfd2bc0-21cf-4a8f-95d8-9cddcbe51296.xml";
+       boost::filesystem::path const pkl_file = "build/test/verify_test13/pkl_d87a950c-bd6f-41f6-90cc-56ccd673e131.xml";
+       boost::filesystem::path const assetmap_file = "build/test/verify_test13/ASSETMAP";
 
        list<pair<string, optional<boost::filesystem::path> > >::const_iterator st = stages.begin();
        BOOST_CHECK_EQUAL (st->first, "Checking DCP");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test13"));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking CPL");
        BOOST_REQUIRE (st->second);
@@ -471,15 +468,15 @@ BOOST_AUTO_TEST_CASE (verify_test13)
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking picture asset hash");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1/j2c_c6035f97-b07d-4e1c-944d-603fc2ddc242.mxf", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test13/j2c_c6035f97-b07d-4e1c-944d-603fc2ddc242.mxf"));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking picture frame sizes");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1/j2c_c6035f97-b07d-4e1c-944d-603fc2ddc242.mxf", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test13/j2c_c6035f97-b07d-4e1c-944d-603fc2ddc242.mxf"));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking sound asset hash");
        BOOST_REQUIRE (st->second);
-       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical(dcp::String::compose("build/test/verify_test%1/pcm_69cf9eaf-9a99-4776-b022-6902208626c3.mxf", next_verify_test_number)));
+       BOOST_CHECK_EQUAL (st->second.get(), boost::filesystem::canonical("build/test/verify_test13/pcm_69cf9eaf-9a99-4776-b022-6902208626c3.mxf"));
        ++st;
        BOOST_CHECK_EQUAL (st->first, "Checking PKL");
        BOOST_REQUIRE (st->second);
@@ -494,14 +491,12 @@ BOOST_AUTO_TEST_CASE (verify_test13)
        dump_notes (notes);
 
        BOOST_CHECK_EQUAL (notes.size(), 0);
-
-       next_verify_test_number++;
 }
 
 /* DCP with a short asset */
 BOOST_AUTO_TEST_CASE (verify_test14)
 {
-       vector<boost::filesystem::path> directories = setup (8, next_verify_test_number);
+       vector<boost::filesystem::path> directories = setup (8, 14);
        list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress, xsd_test);
 
        dump_notes (notes);
@@ -516,7 +511,6 @@ BOOST_AUTO_TEST_CASE (verify_test14)
        ++i;
        BOOST_CHECK_EQUAL (i->code(), dcp::VerificationNote::INTRINSIC_DURATION_TOO_SMALL);
        ++i;
-       next_verify_test_number++;
 }
 
 
index affc23c6762ee58cd636c35242cee4bb1abff3e2..074068f4c729e2a1d566f15a40cb6f09a66041ab 100644 (file)
@@ -330,6 +330,8 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test2)
 /* Write some subtitle content as Interop XML using bitmaps and check that it is right */
 BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
 {
+       RNGFixer fix;
+
        shared_ptr<dcp::InteropSubtitleAsset> c (new dcp::InteropSubtitleAsset());
        c->set_reel_number ("1");
        c->set_language ("EN");