From e4a1a0752cbf009c9fea6ac9f2f7fe1a53bc4245 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 20 Jul 2014 23:34:17 +0100
Subject: Reflect return of <KeyId> tags in test refs.

---
 .../ref/DCP/bar/3a8a01d1-0e1c-4ff0-977d-63d32995a1fd_pkl.xml | 12 ++++++------
 .../ref/DCP/bar/793170e7-e913-404b-8942-1c7f2e5cf012_cpl.xml | 12 ++++++------
 test/ref/DCP/bar/ASSETMAP.xml                                |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'test')

diff --git a/test/ref/DCP/bar/3a8a01d1-0e1c-4ff0-977d-63d32995a1fd_pkl.xml b/test/ref/DCP/bar/3a8a01d1-0e1c-4ff0-977d-63d32995a1fd_pkl.xml
index 59304e2b..d5136948 100644
--- a/test/ref/DCP/bar/3a8a01d1-0e1c-4ff0-977d-63d32995a1fd_pkl.xml
+++ b/test/ref/DCP/bar/3a8a01d1-0e1c-4ff0-977d-63d32995a1fd_pkl.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: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><AssetList><Asset><Id>urn:uuid:793170e7-e913-404b-8942-1c7f2e5cf012</Id><AnnotationText>793170e7-e913-404b-8942-1c7f2e5cf012</AnnotationText><Hash>QtDFJKAAxSZ1ldVagKweCVkTscA=</Hash><Size>8494</Size><Type>text/xml</Type></Asset></AssetList><Signer><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=,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=d95fGDzERNdxfYPgphvAR8A18L4=,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>ZIFRHXeNbHAS7q/pcIBERQxLIKk=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>MT/MyN90vZTEbWkALBb5adEZHOzdi6kbH4cIGa+a9A30PKyIyHYdXbJ4M3mKPxtp
-WxwUmcQzoY29NfSCEIqnO0jhUMgcgIanlAc8/LUY9uSfL8cigNm3MY05yQ4FSBsD
-c7x5dS5tVzYpH1ePPRvsMffhZpT7RjH76M7aYDA5Gv2jo8J5v1WjF78HfNATp+ym
-bDSMFHOHZtnbXIQyThkKrGweDnqQhkQPaF5GV5zKQJDqAOnxWJnnjMXJ9U41uam5
-qw96A9tp/8rNTNLe/QMuPq8vaQVdbRIe58psUhKftVAcF4s39mOGoaWyyErkiS1O
-XYP1f0Qg0PqT3w1h3hxdQQ==</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=,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: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><AssetList><Asset><Id>urn:uuid:793170e7-e913-404b-8942-1c7f2e5cf012</Id><AnnotationText>793170e7-e913-404b-8942-1c7f2e5cf012</AnnotationText><Hash>QrmF8ZWw02W996ebkgDYXJLp+Bw=</Hash><Size>8614</Size><Type>text/xml</Type></Asset></AssetList><Signer><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=,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=d95fGDzERNdxfYPgphvAR8A18L4=,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>SQyLr92IeuvVD7Ps5HxVDRgzqMk=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>KZMuKb/NI62fnpZaISWYd3Uohf9z9hQhP4WxyKOq5izZ6/FFBjHerybqUvpHxRMW
+XSM7NT8bHE0DuJJGdiGzVlNkFwqGeW4UTPR6blF0mgx/pNePKqfIuWGo5yZ6m7fz
+H1yNtXUy9/7XDZPzc+FD/N0tfQus+x1BwfcfMO2/r7NXCLc7BwyuHDoF5V2ajXWa
+2oawRodrykUfSNtWFpFUqfOF3h42BJf/maUWcmig8EHou4TqvHbD6TNHBJII2zXG
+ar61Xw4sPgKKzxvKvhl2PwrAmlOswSPzrxqQJ5zTSrJCw/lohVTQbP/u6BPLQAsF
+yLDF3VPevPUuhMJ4MDqS0g==</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=,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
 Ym10d1RocTNzcmd4SUFlUk1qWDZCRmhnTER3PTAeFw0xMzA3MDgwOTM5MDBaFw0y
diff --git a/test/ref/DCP/bar/793170e7-e913-404b-8942-1c7f2e5cf012_cpl.xml b/test/ref/DCP/bar/793170e7-e913-404b-8942-1c7f2e5cf012_cpl.xml
index 066a103c..c656a347 100644
--- a/test/ref/DCP/bar/793170e7-e913-404b-8942-1c7f2e5cf012_cpl.xml
+++ b/test/ref/DCP/bar/793170e7-e913-404b-8942-1c7f2e5cf012_cpl.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:793170e7-e913-404b-8942-1c7f2e5cf012</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:f68fedf1-3277-45ce-80f9-465ffd2f8acc</Id><AssetList><MainPicture><Id>urn:uuid:8f8d5c1f-cd57-4bcc-9827-ff398e5832cf</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>eTF+yprqgSH7ip7k7L02QQ4jJp8=</Hash><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:ab16cd50-686f-4015-9498-4a142ecb0696</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>1dD/GwFtIwKqd7Mq/S1CH24awdc=</Hash></MainSound></AssetList></Reel></ReelList><Signer><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=,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=d95fGDzERNdxfYPgphvAR8A18L4=,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>9b317vmE6VzrXTvByJ2+jtdxVzc=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>VjoJwtFQjAUY8y488B4KaE0oVrbQbPKRf3vXPcWFBsa9CzMNPl3f6EaXdSDMFyQb
-AYOb4JiRKwc7K3VsZ0MB3rBzkJwtN6ARprTd45QgrPQq1w9DqyvNMX9ZrUnAqt0l
-qOV6daEokUyP8UUNnkJxVsfDxAizonKAx7B8jyKJxWVZQ/qjdE50A34vMDC0IPU1
-pFeScu5zRwOpyMQlNTq4oRaQMj1Kzr0n3xd0IqRqTDeYoPHJYp3JgVW71lbynyYl
-qLZ1j3n1H3jIKAKZemxnJ0rak4YrOe5CDNUKHG9MVyo9y65d3cYeo2gaD1xm/mEH
-f98bnP42KVOlytaNHl87tg==</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=,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:793170e7-e913-404b-8942-1c7f2e5cf012</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:f68fedf1-3277-45ce-80f9-465ffd2f8acc</Id><AssetList><MainPicture><Id>urn:uuid:8f8d5c1f-cd57-4bcc-9827-ff398e5832cf</Id><AnnotationText>video.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>eTF+yprqgSH7ip7k7L02QQ4jJp8=</Hash><KeyId>urn:uuid:e1b915a8-255e-4a46-9c3c-a1b6177ebeb8</KeyId><FrameRate>24 1</FrameRate><ScreenAspectRatio>32 32</ScreenAspectRatio></MainPicture><MainSound><Id>urn:uuid:ab16cd50-686f-4015-9498-4a142ecb0696</Id><AnnotationText>audio.mxf</AnnotationText><EditRate>24 1</EditRate><IntrinsicDuration>24</IntrinsicDuration><EntryPoint>0</EntryPoint><Duration>24</Duration><Hash>1dD/GwFtIwKqd7Mq/S1CH24awdc=</Hash><KeyId>urn:uuid:f5aab304-8145-44e3-a265-aa8d8812d8a2</KeyId></MainSound></AssetList></Reel></ReelList><Signer><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=,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=d95fGDzERNdxfYPgphvAR8A18L4=,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>gKdD//sGczvCT10JgcVdiMZ61jE=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>Dq/bdzg8hfYQFpOX+dgiHF5UONpa7+za3xToLM7BezWeTsH2tK693rLeymWkingT
+ucU8TjYK988dhe8CY5PsignJziQ8bnsy0i0cW6kmisFga2BBcA9bNyj8+6UCxfWm
+1puSTIoClz+t6Muvsm4DvuAjvdhJWufs0PVPo3T+7/7BuPXRABezjIB0dEdb8q0d
+P7I/nHSlSkNvDN/Za2DzzTyjVKF1jCDvGOw367vKxXZO6FXV7yq8/kZDEwhzHOfZ
+UkA9OA6yibKJGZEbv2RWJDhcBg4VGJNmTGuIUMW1nSF1Eh2Xi+Egc8VoZVeiApSm
+nsfdVWAogX5xzmr5zvis7g==</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509IssuerSerial><dsig:X509IssuerName>dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=,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
 Ym10d1RocTNzcmd4SUFlUk1qWDZCRmhnTER3PTAeFw0xMzA3MDgwOTM5MDBaFw0y
diff --git a/test/ref/DCP/bar/ASSETMAP.xml b/test/ref/DCP/bar/ASSETMAP.xml
index b76e7b5a..4b14ac61 100644
--- a/test/ref/DCP/bar/ASSETMAP.xml
+++ b/test/ref/DCP/bar/ASSETMAP.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:7f8b3329-371b-4342-b849-a2ee840e8f45</Id><AnnotationText>Created by OpenDCP 0.0.25</AnnotationText><Creator>OpenDCP 0.0.25</Creator><VolumeCount>1</VolumeCount><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><AssetList><Asset><Id>urn:uuid:3a8a01d1-0e1c-4ff0-977d-63d32995a1fd</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>3a8a01d1-0e1c-4ff0-977d-63d32995a1fd_pkl.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>7691</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:793170e7-e913-404b-8942-1c7f2e5cf012</Id><ChunkList><Chunk><Path>793170e7-e913-404b-8942-1c7f2e5cf012_cpl.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>8494</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
+<AssetMap xmlns="http://www.smpte-ra.org/schemas/429-9/2007/AM"><Id>urn:uuid:7f8b3329-371b-4342-b849-a2ee840e8f45</Id><AnnotationText>Created by OpenDCP 0.0.25</AnnotationText><Creator>OpenDCP 0.0.25</Creator><VolumeCount>1</VolumeCount><IssueDate>2012-07-17T04:45:18+00:00</IssueDate><Issuer>OpenDCP 0.0.25</Issuer><AssetList><Asset><Id>urn:uuid:3a8a01d1-0e1c-4ff0-977d-63d32995a1fd</Id><PackingList>true</PackingList><ChunkList><Chunk><Path>3a8a01d1-0e1c-4ff0-977d-63d32995a1fd_pkl.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>7691</Length></Chunk></ChunkList></Asset><Asset><Id>urn:uuid:793170e7-e913-404b-8942-1c7f2e5cf012</Id><ChunkList><Chunk><Path>793170e7-e913-404b-8942-1c7f2e5cf012_cpl.xml</Path><VolumeIndex>1</VolumeIndex><Offset>0</Offset><Length>8614</Length></Chunk></ChunkList></Asset></AssetList></AssetMap>
-- 
cgit v1.2.3