From 891aceb5b3cda5b825ff77e791d2bd476ea3343d Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 1 Mar 2016 21:23:29 +0000
Subject: Modified data after adding HMACs.

---
 test/ref/DCP/dcp_test1/audio.mxf                   | Bin 161326 -> 161326 bytes
 .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml   |   2 +-
 .../pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml   |   2 +-
 test/ref/DCP/dcp_test1/video.mxf                   | Bin 26080 -> 26080 bytes
 test/ref/DCP/dcp_test2/audio.mxf                   | Bin 161326 -> 161326 bytes
 .../cpl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml   |   2 +-
 .../pkl_6d857146-24c9-4626-bc7a-3971b15f1ba4.xml   |   2 +-
 test/ref/DCP/dcp_test2/video.mxf                   | Bin 35032 -> 35032 bytes
 test/ref/DCP/encryption_test/audio.mxf             | Bin 164398 -> 164398 bytes
 .../cpl_cdecf5ab-b688-4842-bd60-0c9f5ce56e8c.xml   |  12 ++++++------
 .../pkl_abf9d74a-c344-40a0-a929-21add8a3bd6e.xml   |  12 ++++++------
 test/ref/DCP/encryption_test/video.mxf             | Bin 28840 -> 28840 bytes
 12 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'test/ref/DCP')

diff --git a/test/ref/DCP/dcp_test1/audio.mxf b/test/ref/DCP/dcp_test1/audio.mxf
index b23c9c6b..962cd9c5 100644
Binary files a/test/ref/DCP/dcp_test1/audio.mxf and b/test/ref/DCP/dcp_test1/audio.mxf differ
diff --git a/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
index 597a3946..6a57298d 100644
--- a/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
+++ b/test/ref/DCP/dcp_test1/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml
@@ -1,2 +1,2 @@
 <?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:8e293965-f8ad-48c6-971d-261b01f65cdb</Id><AssetList><MainPicture><Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>q2uchvZj7q6hU7Ulayx8ut+bT7M=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>w6mJcN5CepHJ2JHVzCQrKY+MZL4=</Hash></MainSound></AssetList></Reel></ReelList></CompositionPlaylist>
+<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:8e293965-f8ad-48c6-971d-261b01f65cdb</Id><AssetList><MainPicture><Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>EQtZQCRMlzp+/R5/NBN0mNT8f00=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>lR1pCouEkdAX9atvD7z30bsf5iY=</Hash></MainSound></AssetList></Reel></ReelList></CompositionPlaylist>
diff --git a/test/ref/DCP/dcp_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml b/test/ref/DCP/dcp_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml
index 57bcf5d4..a6c5e01b 100644
--- a/test/ref/DCP/dcp_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml
+++ b/test/ref/DCP/dcp_test1/pkl_18be072e-5a0f-44e1-b2eb-c8a52ae12789.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL"><Id>urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789</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><AssetList><Asset><Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id><AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText><Hash>s2MKQLD9OkXpUoQuJT8dhvSInd4=</Hash><Size>1374</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id><AnnotationText>46c3eb45-15e5-47d6-8684-d8641e4dc516</AnnotationText><Hash>q2uchvZj7q6hU7Ulayx8ut+bT7M=</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>w6mJcN5CepHJ2JHVzCQrKY+MZL4=</Hash><Size>161326</Size><Type>application/mxf</Type></Asset></AssetList></PackingList>
+<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL"><Id>urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789</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><AssetList><Asset><Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b</Id><AnnotationText>81fb54df-e1bf-4647-8788-ea7ba154375b</AnnotationText><Hash>7lk+p7Dui4p2iXx9H3FXDf39aJU=</Hash><Size>1374</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id><AnnotationText>46c3eb45-15e5-47d6-8684-d8641e4dc516</AnnotationText><Hash>EQtZQCRMlzp+/R5/NBN0mNT8f00=</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>lR1pCouEkdAX9atvD7z30bsf5iY=</Hash><Size>161326</Size><Type>application/mxf</Type></Asset></AssetList></PackingList>
diff --git a/test/ref/DCP/dcp_test1/video.mxf b/test/ref/DCP/dcp_test1/video.mxf
index e1c4bbb5..6683f261 100644
Binary files a/test/ref/DCP/dcp_test1/video.mxf and b/test/ref/DCP/dcp_test1/video.mxf differ
diff --git a/test/ref/DCP/dcp_test2/audio.mxf b/test/ref/DCP/dcp_test2/audio.mxf
index 158f96a2..37d96a21 100644
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_74e205d0-d145-42d2-8c49-7b55d058ca55.xml b/test/ref/DCP/dcp_test2/cpl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml
index de908fbd..e6ac5a2c 100644
--- a/test/ref/DCP/dcp_test2/cpl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml
+++ b/test/ref/DCP/dcp_test2/cpl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL"><Id>urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55</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:5bdc7da4-eaf1-43e6-854f-7a1175edf94a</Id><AssetList><MainSound><Id>urn:uuid:8ee8f7da-8da2-4adb-ae0e-31e8f4b91900</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>EcGvF20IkSNGWuVHrfsMoXsP2bU=</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>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>bEj3AlcBaUesA7Y65P0FtLej9dY=</Hash><FrameRate>48 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></msp-cpl:MainStereoscopicPicture></AssetList></Reel></ReelList></CompositionPlaylist>
+<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL"><Id>urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55</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:5bdc7da4-eaf1-43e6-854f-7a1175edf94a</Id><AssetList><MainSound><Id>urn:uuid:8ee8f7da-8da2-4adb-ae0e-31e8f4b91900</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>0PQR7/GXjqssdRnQGrU9eCiOV7g=</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>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>XFEj7mS4aUASmAW7FvVOY78635c=</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_6d857146-24c9-4626-bc7a-3971b15f1ba4.xml b/test/ref/DCP/dcp_test2/pkl_6d857146-24c9-4626-bc7a-3971b15f1ba4.xml
index 310b3418..359d93ac 100644
--- a/test/ref/DCP/dcp_test2/pkl_6d857146-24c9-4626-bc7a-3971b15f1ba4.xml
+++ b/test/ref/DCP/dcp_test2/pkl_6d857146-24c9-4626-bc7a-3971b15f1ba4.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL"><Id>urn:uuid:6d857146-24c9-4626-bc7a-3971b15f1ba4</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><AssetList><Asset><Id>urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55</Id><AnnotationText>74e205d0-d145-42d2-8c49-7b55d058ca55</AnnotationText><Hash>xMHLy3ooM+fzkWwBrHEXE7ASvW8=</Hash><Size>1498</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:63c3aece-c581-4603-b612-75e43f0c0430</Id><AnnotationText>63c3aece-c581-4603-b612-75e43f0c0430</AnnotationText><Hash>bEj3AlcBaUesA7Y65P0FtLej9dY=</Hash><Size>35032</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:8ee8f7da-8da2-4adb-ae0e-31e8f4b91900</Id><AnnotationText>8ee8f7da-8da2-4adb-ae0e-31e8f4b91900</AnnotationText><Hash>EcGvF20IkSNGWuVHrfsMoXsP2bU=</Hash><Size>161326</Size><Type>application/mxf</Type></Asset></AssetList></PackingList>
+<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL"><Id>urn:uuid:6d857146-24c9-4626-bc7a-3971b15f1ba4</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><AssetList><Asset><Id>urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55</Id><AnnotationText>74e205d0-d145-42d2-8c49-7b55d058ca55</AnnotationText><Hash>TMjMV2hPJ3htTKFMCce22FVNjgY=</Hash><Size>1498</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:63c3aece-c581-4603-b612-75e43f0c0430</Id><AnnotationText>63c3aece-c581-4603-b612-75e43f0c0430</AnnotationText><Hash>XFEj7mS4aUASmAW7FvVOY78635c=</Hash><Size>35032</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:8ee8f7da-8da2-4adb-ae0e-31e8f4b91900</Id><AnnotationText>8ee8f7da-8da2-4adb-ae0e-31e8f4b91900</AnnotationText><Hash>0PQR7/GXjqssdRnQGrU9eCiOV7g=</Hash><Size>161326</Size><Type>application/mxf</Type></Asset></AssetList></PackingList>
diff --git a/test/ref/DCP/dcp_test2/video.mxf b/test/ref/DCP/dcp_test2/video.mxf
index 82f2ee89..d5846832 100644
Binary files a/test/ref/DCP/dcp_test2/video.mxf and b/test/ref/DCP/dcp_test2/video.mxf differ
diff --git a/test/ref/DCP/encryption_test/audio.mxf b/test/ref/DCP/encryption_test/audio.mxf
index 7781bdac..c0f2425f 100644
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_cdecf5ab-b688-4842-bd60-0c9f5ce56e8c.xml b/test/ref/DCP/encryption_test/cpl_cdecf5ab-b688-4842-bd60-0c9f5ce56e8c.xml
index 3c0c8eee..9db2d225 100644
--- a/test/ref/DCP/encryption_test/cpl_cdecf5ab-b688-4842-bd60-0c9f5ce56e8c.xml
+++ b/test/ref/DCP/encryption_test/cpl_cdecf5ab-b688-4842-bd60-0c9f5ce56e8c.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><Id>urn:uuid:cdecf5ab-b688-4842-bd60-0c9f5ce56e8c</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:6f02ec2d-2a2d-437d-9391-daa7301b6910</Id><AssetList><MainPicture><Id>urn:uuid:a12d2c1f-0daa-4a30-a4cd-c4266ac172a7</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:aa157ca6-e3e3-4b6c-a7b6-50f52fcafb7f</KeyId><Hash>eE/xU7bOu+nS9PtOL0JiOpCT4so=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:f020346e-84f4-4f1e-a3b7-f7aeb57696a4</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:938f5140-bb1c-46ce-9078-e099ebbf04bf</KeyId><Hash>Li4vBeXOBb/HiVpEZTytwg1ohD8=</Hash></MainSound></AssetList></Reel></ReelList><Signer><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><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>cGOtCv0TI+o+4TU/XEGgTqii9v8=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>vsPoxQK5+xzoSOmRNuxyn4/pMmr9/fK6lQyyqJ6VSVKxmh94g+XqHJufhBNCqFN8
-j8byP4xSdUIC+N7S0Le9k6mcmv44/Hf8vx1pO6dej5WN5N2iJvJJrkk7Z3sOnUWy
-2KHWSEtTHMZ1I6T3VfFjyDr+eGhq0QZPwjwejyuHmmIJMdkoHnlUSUN7Suw8XmCR
-X4k6/qE9lRsVtDpIm/24pA3eMDr0ydrulZwPDIIIDtx/mncMrR585TjNC0RWXyiZ
-BTOslCc74YDS3nlB//X4Olulyyu+AB00/rRtGRqbKfHKWiTNy3TopSU65ZxB0B2t
-QP3cWx/DTUm7kvBX+Z+Kmw==</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
+<CompositionPlaylist xmlns="http://www.smpte-ra.org/schemas/429-7/2006/CPL" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><Id>urn:uuid:cdecf5ab-b688-4842-bd60-0c9f5ce56e8c</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:6f02ec2d-2a2d-437d-9391-daa7301b6910</Id><AssetList><MainPicture><Id>urn:uuid:a12d2c1f-0daa-4a30-a4cd-c4266ac172a7</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:aa157ca6-e3e3-4b6c-a7b6-50f52fcafb7f</KeyId><Hash>gp2OLAONOktb0WoG4jlwRC4eqcU=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:f020346e-84f4-4f1e-a3b7-f7aeb57696a4</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:938f5140-bb1c-46ce-9078-e099ebbf04bf</KeyId><Hash>ryIY0kBda99BSmtDXlGPTvczMj4=</Hash></MainSound></AssetList></Reel></ReelList><Signer><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><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>8qaEn8K0vAOH3OgGCJqSKFgTQjo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>EBi/VGRMCIlInaao3aEmMdbp/yGGBDmdTk2ztsl5zJuobDaoz8ddx9DW3PxQG2QZ
+imSz0YYkh3eMMoHTNB2DH1dINBt34YVv57QBbBKakurYC2X5tVLe0+dsW379SLag
+lYe8CL9CmGOS/RNtug1KLWb+rrh7lPLSWr2n6KLpu8IpmPUFHUlhM38FBVvyYwOi
+tIJ0dXLe8drJoYbp9OZUqrljrRR97gHSJSEHKu4GDSL8IFyoVvvVSTtLwI5EejJI
+mRl8wjpeM116yrZkNCgVAnPNrRxGmDeEdk4VVCvESiWKuHh/RZZWkth8N9QWrvp9
+BTUm7GPcntyrg7xzCHqBzQ==</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
diff --git a/test/ref/DCP/encryption_test/pkl_abf9d74a-c344-40a0-a929-21add8a3bd6e.xml b/test/ref/DCP/encryption_test/pkl_abf9d74a-c344-40a0-a929-21add8a3bd6e.xml
index 65906ddb..ef74d48e 100644
--- a/test/ref/DCP/encryption_test/pkl_abf9d74a-c344-40a0-a929-21add8a3bd6e.xml
+++ b/test/ref/DCP/encryption_test/pkl_abf9d74a-c344-40a0-a929-21add8a3bd6e.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><Id>urn:uuid:abf9d74a-c344-40a0-a929-21add8a3bd6e</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><AssetList><Asset><Id>urn:uuid:cdecf5ab-b688-4842-bd60-0c9f5ce56e8c</Id><AnnotationText>cdecf5ab-b688-4842-bd60-0c9f5ce56e8c</AnnotationText><Hash>n39X9uDTooHqVlXtveD8KlqmmKw=</Hash><Size>8618</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:a12d2c1f-0daa-4a30-a4cd-c4266ac172a7</Id><AnnotationText>a12d2c1f-0daa-4a30-a4cd-c4266ac172a7</AnnotationText><Hash>eE/xU7bOu+nS9PtOL0JiOpCT4so=</Hash><Size>28840</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:f020346e-84f4-4f1e-a3b7-f7aeb57696a4</Id><AnnotationText>f020346e-84f4-4f1e-a3b7-f7aeb57696a4</AnnotationText><Hash>Li4vBeXOBb/HiVpEZTytwg1ohD8=</Hash><Size>164398</Size><Type>application/mxf</Type></Asset></AssetList><Signer><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><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>3NSmtj/ccdunP0u2ZJSq5wIm0Cs=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>yyAoofMqolMI9KBbg8INVOATN8BcbvjPjYTk2JD8GiNcUSj2dxcpcZSV/94a0SAK
-h08Kd4boq4wRPllDH5HqDV3UXasTrBNSBB2o62SyDMrI1YGf2K9SB+nWbB1BMogP
-bdE1RAY13SgGi5JO0jW7wcbe3O1lw+QZVmobKqog+hRYTS6vqH4cfgPiSBaufuNb
-Z5PoZ8q/h5nmtITeJ8yupufApyG9oqGwU7EJXnxaVMGY51/FTbaWINL/CTBqj9X0
-4m0W1ts7U6fm/QeENfX4gMd1/IQEbA6GOBaVM4qANoQc7TnMvDrbqewA2fPoXKDs
-LKDijgely5Kz8eNwchRXtQ==</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
+<PackingList xmlns="http://www.smpte-ra.org/schemas/429-8/2007/PKL" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><Id>urn:uuid:abf9d74a-c344-40a0-a929-21add8a3bd6e</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><AssetList><Asset><Id>urn:uuid:cdecf5ab-b688-4842-bd60-0c9f5ce56e8c</Id><AnnotationText>cdecf5ab-b688-4842-bd60-0c9f5ce56e8c</AnnotationText><Hash>uHlJA9B8Qt5ep0HbKbrF9u7n7sc=</Hash><Size>8618</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:a12d2c1f-0daa-4a30-a4cd-c4266ac172a7</Id><AnnotationText>a12d2c1f-0daa-4a30-a4cd-c4266ac172a7</AnnotationText><Hash>gp2OLAONOktb0WoG4jlwRC4eqcU=</Hash><Size>28840</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:f020346e-84f4-4f1e-a3b7-f7aeb57696a4</Id><AnnotationText>f020346e-84f4-4f1e-a3b7-f7aeb57696a4</AnnotationText><Hash>ryIY0kBda99BSmtDXlGPTvczMj4=</Hash><Size>164398</Size><Type>application/mxf</Type></Asset></AssetList><Signer><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><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>xeFxQS+hcK1+lpqIM++ebDXRCCo=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>lyHCZndK1Yl4zr+ip0b9mjFx8LRd0L1f/wf9mez3Kdrj44tqOln61MEsgeQwf4ij
+CxkOpC4w6Xz8moRIt8wH54dF8b0iO+gk+r4olKwUh9GkB6UMis5avmjmI79iwR7q
+Z86ABnFrme20RfduqW/sk5yhuFkF0V1LyySG0GVyfRXHdm6WUxhkcfguXB1G+ktW
+6Bg/865BAiqpOGYQLPg1MKNhFcxQObA66KaxjdmSFoIWLviI+PmfgMdojPIS+a8h
+c5vxGTnBlSes4r6/00EBLTH6oBe1VVNAlJ0xWNGGgGoLwQIHC3qt8mHscO5498Cb
+5gB9oyLX695MqgGEaPvVuw==</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
diff --git a/test/ref/DCP/encryption_test/video.mxf b/test/ref/DCP/encryption_test/video.mxf
index 83956f94..5104c081 100644
Binary files a/test/ref/DCP/encryption_test/video.mxf and b/test/ref/DCP/encryption_test/video.mxf differ
-- 
cgit v1.2.3