More ToolkitVersion churn; hopefully that's it for now.

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 055310cf..07de1133 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_a1c68855-fc65-47b6-bccc-69810ee6da31.xml b/test/ref/DCP/encryption_test/cpl_a1c68855-fc65-47b6-bccc-69810ee6da31.xml
index 5b77ea2b..2b339549 100644
--- a/test/ref/DCP/encryption_test/cpl_a1c68855-fc65-47b6-bccc-69810ee6da31.xml
+++ b/test/ref/DCP/encryption_test/cpl_a1c68855-fc65-47b6-bccc-69810ee6da31.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:a1c68855-fc65-47b6-bccc-69810ee6da31</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:f3452d7a-2f0d-4758-b0ab-63432f863752</Id><AssetList><MainPicture><Id>urn:uuid:f1f7e0bc-ee61-412a-ac0e-e0b165a364a8</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:b2e3068b-cc00-4afb-bb44-39c66d24f49a</KeyId><Hash>AH6tk095fW9lIV/YzesPNMBuDys=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:da26af63-f73f-4409-b665-c942b21c7545</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:15f982dd-162d-42ad-8ed2-60d30c3dcbdb</KeyId><Hash>WwFEuUazoH9rHRXojMN1CG22tV8=</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>w0/O3+wEUl0exVl/c3KPLJdwy8Q=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>W8KdbWnzBSG0FvTKJDN00qXuRSznJkuFitn5HWL78AwbXbLia/oKBi6C5mrX3Ed4
-HruoYEbe5edbx5dICOLyAH0brkSoWrbWGv3Dubmi12bbuaUBRa8ghSo/DmiYRVWv
-tHIb1vzdoC03c+i86UIKfXxa6nRQJspHMrFX8/ESQX0FgbrAQv2ex5pxvwvaCLxT
-cmYeGEMBBCPPnXnieSB/1u/lpMcZSH12XlaV5zy0NnEj07fNuAvjWCfjdYMMWtRv
-6VWm161y7BZaQsdqV3Z1PVLAai/FRYXD33AUslX8EMGUssdYGRz7fpaiTn2aPKTQ
-NzWLLBEWPhjXq5TGYT/rJA==</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:a1c68855-fc65-47b6-bccc-69810ee6da31</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:f3452d7a-2f0d-4758-b0ab-63432f863752</Id><AssetList><MainPicture><Id>urn:uuid:f1f7e0bc-ee61-412a-ac0e-e0b165a364a8</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:b2e3068b-cc00-4afb-bb44-39c66d24f49a</KeyId><Hash>OXuVNsFxAFJjcm2pLJPswapZyCI=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:da26af63-f73f-4409-b665-c942b21c7545</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><KeyId>urn:uuid:15f982dd-162d-42ad-8ed2-60d30c3dcbdb</KeyId><Hash>3mVj1fasmhxzB67kI3J69Q69qOk=</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>uPk/aoVuKOTTMgQmVU5ydM1vmZc=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Q6W4DkKf0De1VGaMS2mrYj/aCAypdtYWesiowIKRtCxWjh7e0G3umqbqD2H2DMjt
+EApKAY5Y0CCeM9w2r3Ngd/I66Sw22s4Bh+Oz+mA3RK1bBsikMI4ZmQvkRkd/FnTW
+WwV7MvSKDalVgqCefRbidS8H2SUMVm9lzdXzqCaPRSE+d+4nbaKD8106gyXwIPeP
+SvipnYbqeLpjJbz5caLL7dM7G4dxqDVxB3/AooiTLkOdM65Wo95egd9t5+5DsjO0
+6x60HDLauojHzon63I6/lwGuziMov3rjsUTfcn5Qt+8S0UuhwZkUdOuIkz06+ewo
+8XfvySZIXFw6w5cv/i8DDg==</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_a800aea0-904b-4bd0-9250-374fdb46528b.xml b/test/ref/DCP/encryption_test/pkl_a800aea0-904b-4bd0-9250-374fdb46528b.xml
index 70c95d95..30cdb26f 100644
--- a/test/ref/DCP/encryption_test/pkl_a800aea0-904b-4bd0-9250-374fdb46528b.xml
+++ b/test/ref/DCP/encryption_test/pkl_a800aea0-904b-4bd0-9250-374fdb46528b.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:a800aea0-904b-4bd0-9250-374fdb46528b</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:a1c68855-fc65-47b6-bccc-69810ee6da31</Id><AnnotationText>a1c68855-fc65-47b6-bccc-69810ee6da31</AnnotationText><Hash>qmjeR6VK01SxuN6AI+ouw1aRto4=</Hash><Size>8618</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:f1f7e0bc-ee61-412a-ac0e-e0b165a364a8</Id><AnnotationText>f1f7e0bc-ee61-412a-ac0e-e0b165a364a8</AnnotationText><Hash>AH6tk095fW9lIV/YzesPNMBuDys=</Hash><Size>29896</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:da26af63-f73f-4409-b665-c942b21c7545</Id><AnnotationText>da26af63-f73f-4409-b665-c942b21c7545</AnnotationText><Hash>WwFEuUazoH9rHRXojMN1CG22tV8=</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>wyNFvJxfLCS+cVYsVWjqrqsj0js=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>zLUuC0sP/XmcIj9VBW9z4Q3uZXL6w6po3hqRwy9clEZW+NeCZeYp7RNJMspMv8xp
-7UWviElvYKmvOpaTpUKWw+uPtHFrnp/mv8AEkAHDnpWKYMOYfolMFRuRVDHT0SlD
-GgLj4XJPTLRd3r8mtanbSYsv6z6zzBLeSJZwEe53RN0yU9u/lNlr7m7F4pW9Li/I
-S5uo4KBcD/drf6d4XPi/WIC7QAO1t/SA7Zbcr71Dzu3rsp2m43Mi+08Qm35dR4mV
-YNOP5+N3966sn5UXjmJAsEJ7uzG1XfzrcU6gnW540DRBK1p2p3lbvZs0ob1u3A1I
-WsqtsIwfpyOF+UrbDxqdBQ==</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:a800aea0-904b-4bd0-9250-374fdb46528b</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:a1c68855-fc65-47b6-bccc-69810ee6da31</Id><AnnotationText>a1c68855-fc65-47b6-bccc-69810ee6da31</AnnotationText><Hash>eMh8t3hzc/CUtDMEhW2MYboTfX4=</Hash><Size>8618</Size><Type>text/xml</Type></Asset><Asset><Id>urn:uuid:f1f7e0bc-ee61-412a-ac0e-e0b165a364a8</Id><AnnotationText>f1f7e0bc-ee61-412a-ac0e-e0b165a364a8</AnnotationText><Hash>OXuVNsFxAFJjcm2pLJPswapZyCI=</Hash><Size>29896</Size><Type>application/mxf</Type></Asset><Asset><Id>urn:uuid:da26af63-f73f-4409-b665-c942b21c7545</Id><AnnotationText>da26af63-f73f-4409-b665-c942b21c7545</AnnotationText><Hash>3mVj1fasmhxzB67kI3J69Q69qOk=</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>/vSQVWTAXL90u2GjRQyTya9iffY=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>qYraySokdxkidRlLIkg4ywUJ8+Xra0zwFVrhhT4Pj6luvDdjrKqYX7coYNehlRfE
+lPdinao4x60weQBVtw5lQlI4cBYsY40nanRqXVzsvCyrz6+EvjaTISst64fB2Jza
+CLskhHiJEUDlrFLPdmR0Dr8RvcqyoB95EfsehVikLinkepTFe1zPXkMn38Ij5/gM
+/sbqITW67+adeYmz2y/1JgdJniHgMKv1sp1+ix7rrvP8W8k389X8eJjqsPx5yvCu
+s73fHOUyP65Njrbr0vtKxfJPF421p5TXfaai2F8gM9Lb55nMgT06c4bTvWUDGnn2
+0S9fmAdAxtHhrIs9+L1+eA==</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 ccb1ccb6..db83d5bb 100644
--- a/test/ref/DCP/encryption_test/video.mxf
+++ b/test/ref/DCP/encryption_test/video.mxf