Update tests for asdcplib library version bump; this gets into the MXFs.

4 files changed, 12 insertions, 12 deletions

diff --git a/test/ref/DCP/encryption_test/audio.mxf b/test/ref/DCP/encryption_test/audio.mxf
index c8732178..ca2e5b9e 100644
--- a/test/ref/DCP/encryption_test/audio.mxf
+++ b/test/ref/DCP/encryption_test/audio.mxf
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 da3ecce8..6b93cd97 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>1zYFnwI6KdSxS0Mm1yfpPE5icSg=</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>0enoS4UijgH3ybt2jiW/L0iS5e4=</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>8tV8YSqZSHDBH2albmh6fW1wPtE=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>BGS8SEdcK2ZV+l5/1X/DdOZ4TUIPo+eu4TaA4ApqTf1KKNgRplxH+9I53lRZTcjD
-nqzINcasGhgGpeXh7VT9uXfS5h01cVYAYXWJAFljSmv+LF2DwIa1HY9BHuQMzc9Z
-EAmgWXltc6+SzM8G89lOMoFkT736k4Vw7ciPMmZHYGpUfg+4BSwiObqK0NnjuRN2
-Cztdq43GF7CPIix1Ts3tBr2aDoueRW+xzISb5+7k4GKdj/VOkPi7GeC2ufRKpRyS
-Ju2gG5foEvC+LUaSOLYOTtBYl5jmjxA+iVcNU8GyQwgnxydK3GNufPmbgIhSsmmm
-AhC/et20EvELAZCXOeHZWw==</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>S84alpW2grO8/h2DDnHKAj8u//A=</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>PiwAhlgeKfRJOAEdW48aut4J0Go=</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>Gk2y0ny72GE6daWfMUNu1+f+4/4=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>kuNtCbuVmJbQosc7kTxEJRjs1kY1sucjlwqGemSX9YsCWV+Y1CScDyRz4ijWiRyR
+qj+//CpmfFHSqiiTvAKDOXcFKZaktIejRtj7UvnpIUYsjsc1fghxeEMeAbbXhWDD
+4JqanamP8oLLct4GWG2ANQzJQ+ShXtEFb3WysaM3dqgiUkT/ctpyo71VlXPB8u5g
+gF0EjwHTxQ6rKdLrj+PVpExQAlQm4bgPMx9qn3ki9seRUjD2YY1zhAIE+poVk87w
+x+NZzpLzO2PNI2XegAmessKCnJaATCBuIvZ+4wJnS6pvbfk1/A1gei5bMSzpOhPN
+9pKfQT24af+cfTwfh0kvEg==</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 056707c1..4f46df36 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>Q0eQgHUayFbXU1Me3oy4L9xg0y4=</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>1zYFnwI6KdSxS0Mm1yfpPE5icSg=</Hash><Size>29896</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:f020346e-84f4-4f1e-a3b7-f7aeb57696a4</Id><AnnotationText>f020346e-84f4-4f1e-a3b7-f7aeb57696a4</AnnotationText><Hash>0enoS4UijgH3ybt2jiW/L0iS5e4=</Hash><Size>165454</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>PkphEiFij1rOfyLZ8A3kC1psv50=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>0eEASQfm8Y0T2P+6vtQtD6EE734sYekHTMjsbw9o+XS22YGQq1FEUHvx1IbaD/GQ
-wIuwVtN7HPZ5AbiRoJlXPkaJAJh1HpPHO+1MVbjdq8o4rY5HSyWg16LVlWWPjPSH
-PYcsiI5ZQal5Cf4/HgX52D+H82i9pfos0wkLZB2YuWb75ICepcbcr0JUrZ3RE7sm
-JcWxzNiMo3ueJVcefatEhmUuA48BSQc9RnYNqoV0OQaA52OBNHbBPrB/NIsMqZol
-MM/bjwkskf3d9i5KBYcLvgwBL1mNLsfkrd1WNkU1H79zQ8wPek2I++U4tuE+rfFu
-1s6Qh1Fe0B8RL9E20i4l8A==</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>P65Gp0ManXQfCAYXkkAz2sCcIIs=</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>S84alpW2grO8/h2DDnHKAj8u//A=</Hash><Size>29896</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:f020346e-84f4-4f1e-a3b7-f7aeb57696a4</Id><AnnotationText>f020346e-84f4-4f1e-a3b7-f7aeb57696a4</AnnotationText><Hash>PiwAhlgeKfRJOAEdW48aut4J0Go=</Hash><Size>165454</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>wTNbO5pkG1S7sFeBnJeMcUC0lG0=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>jLWyzPVWQHFjZ0G7b9b8hq1XF2EVOLZJBUXM1Sm+civhlrIwwJ5XuXkkYbZsQkR6
+hhrLSX8FjVP9wo8sHI2D4M/4c6/NmSc4+JWpNz+L0jzyqzYY7RKCuzXrjGY5UXhP
+VHxmfPoxCI0XO+HnpQk7dKmS+SNrWpPzyrzDIUUoCQZH8gOYP8uAf99OrpPNy0iJ
+ZAXUxA4C9Hp02nMQzVaVMJMY9EJeZmy8Wwx0BIGrZ1gYv2ZNd9p00apRK8k3Vw+9
+xUqUv0VbZshHQyHSIANrwJOhDC3pPxgriTmt841Zl+eOSLIGOEHDGeY+sAaosoZS
+kODemJOGQQNrU00/0xEs2w==</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 46d62cea..9ac17001 100644
--- a/test/ref/DCP/encryption_test/video.mxf
+++ b/test/ref/DCP/encryption_test/video.mxf