From d4f3f5b44d5d42eaadc6fa3807648b6735d61758 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 11 Jul 2020 21:11:48 +0200 Subject: Hopefully make all tests stable enough to be run with --random, stopping test reference churn. --- test/ref/DCP/dcp_test2/ASSETMAP.xml | 14 +- test/ref/DCP/dcp_test2/audio.mxf | Bin 161326 -> 161326 bytes .../cpl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml | 42 ------ .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 42 ++++++ .../pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml | 31 ++++ .../pkl_9f19589a-01e5-4093-b23b-a32e143e5956.xml | 31 ---- test/ref/DCP/dcp_test2/video.mxf | Bin 35032 -> 35032 bytes test/ref/DCP/dcp_test5/ASSETMAP.xml | 14 +- test/ref/DCP/dcp_test5/audio.mxf | Bin 161326 -> 161326 bytes .../cpl_3a8a01d1-0e1c-4ff0-977d-63d32995a1fd.xml | 52 ------- .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 52 +++++++ .../pkl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml | 31 ++++ .../pkl_7574c611-f8de-4d20-98c4-2eb7dc87080a.xml | 31 ---- test/ref/DCP/dcp_test5/video.mxf | Bin 26080 -> 26080 bytes test/ref/DCP/dcp_test7/ASSETMAP | 14 +- test/ref/DCP/dcp_test7/audio.mxf | Bin 161326 -> 161326 bytes .../cpl_1d513f84-5856-4f91-a88a-4d452cc6a28a.xml | 42 ------ .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 42 ++++++ .../pkl_a800aea0-904b-4bd0-9250-374fdb46528b.xml | 31 ---- .../pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml | 31 ++++ test/ref/DCP/dcp_test7/video.mxf | Bin 26080 -> 26080 bytes test/ref/DCP/encryption_test/ASSETMAP.xml | 14 +- test/ref/DCP/encryption_test/audio.mxf | Bin 165454 -> 165454 bytes .../cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml | 165 +++++++++++++++++++++ .../cpl_b3eba4a0-f542-4937-b972-1cc4667ed01a.xml | 165 --------------------- .../pkl_59730183-23bc-491e-906b-1dd453ff9d11.xml | 152 ------------------- .../pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml | 152 +++++++++++++++++++ test/ref/DCP/encryption_test/video.mxf | Bin 29896 -> 29896 bytes test/ref/write_interop_subtitle_test3/ASSETMAP | 14 +- test/ref/write_interop_subtitle_test3/subs.xml | 2 +- 30 files changed, 582 insertions(+), 582 deletions(-) delete mode 100644 test/ref/DCP/dcp_test2/cpl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml create mode 100644 test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml create mode 100644 test/ref/DCP/dcp_test2/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml delete mode 100644 test/ref/DCP/dcp_test2/pkl_9f19589a-01e5-4093-b23b-a32e143e5956.xml delete mode 100644 test/ref/DCP/dcp_test5/cpl_3a8a01d1-0e1c-4ff0-977d-63d32995a1fd.xml create mode 100644 test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml create mode 100644 test/ref/DCP/dcp_test5/pkl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml delete mode 100644 test/ref/DCP/dcp_test5/pkl_7574c611-f8de-4d20-98c4-2eb7dc87080a.xml delete mode 100644 test/ref/DCP/dcp_test7/cpl_1d513f84-5856-4f91-a88a-4d452cc6a28a.xml create mode 100644 test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml delete mode 100644 test/ref/DCP/dcp_test7/pkl_a800aea0-904b-4bd0-9250-374fdb46528b.xml create mode 100644 test/ref/DCP/dcp_test7/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml create mode 100644 test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml delete mode 100644 test/ref/DCP/encryption_test/cpl_b3eba4a0-f542-4937-b972-1cc4667ed01a.xml delete mode 100644 test/ref/DCP/encryption_test/pkl_59730183-23bc-491e-906b-1dd453ff9d11.xml create mode 100644 test/ref/DCP/encryption_test/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml (limited to 'test/ref') diff --git a/test/ref/DCP/dcp_test2/ASSETMAP.xml b/test/ref/DCP/dcp_test2/ASSETMAP.xml index 446b84bc..7fa49616 100644 --- a/test/ref/DCP/dcp_test2/ASSETMAP.xml +++ b/test/ref/DCP/dcp_test2/ASSETMAP.xml @@ -1,6 +1,6 @@ - urn:uuid:41eebce6-86f2-4939-b27a-81e4dd3606e9 + urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d Created by libdcp OpenDCP 0.0.25 1 @@ -8,11 +8,11 @@ OpenDCP 0.0.25 - urn:uuid:9f19589a-01e5-4093-b23b-a32e143e5956 + urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55 true - pkl_9f19589a-01e5-4093-b23b-a32e143e5956.xml + pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml 1 0 1186 @@ -20,10 +20,10 @@ - urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d + urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b - cpl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml + cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml 1 0 1770 @@ -31,7 +31,7 @@ - urn:uuid:63c3aece-c581-4603-b612-75e43f0c0430 + urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 video.mxf @@ -42,7 +42,7 @@ - urn:uuid:e5c3091b-f61e-459c-9faf-210bd4d3c7bf + urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85 audio.mxf diff --git a/test/ref/DCP/dcp_test2/audio.mxf b/test/ref/DCP/dcp_test2/audio.mxf index d5f5f745..d249b939 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_48db27c3-4964-46a2-8b02-3e5570efb42d.xml b/test/ref/DCP/dcp_test2/cpl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml deleted file mode 100644 index f68a8a30..00000000 --- a/test/ref/DCP/dcp_test2/cpl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d - A Test DCP - 2012-07-17T04:45:18+00:00 - OpenDCP 0.0.25 - OpenDCP 0.0.25 - A Test DCP - feature - - urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 - 81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 - - - - - urn:uuid:646747f3-51ee-47ec-a0a2-5f8c415818e8 - - - urn:uuid:e5c3091b-f61e-459c-9faf-210bd4d3c7bf - - 24 1 - 24 - 0 - 24 - yOPZZcSUfpF0dwuq4awCqOGjbaE= - - - urn:uuid:63c3aece-c581-4603-b612-75e43f0c0430 - - 24 1 - 24 - 0 - 24 - OEAL0t1jvySBWib02IdWNHkPWsA= - 48 1 - 32 32 - - - - - 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 index 00000000..61922e17 --- /dev/null +++ b/test/ref/DCP/dcp_test2/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml @@ -0,0 +1,42 @@ + + + urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b + A Test DCP + 2012-07-17T04:45:18+00:00 + OpenDCP 0.0.25 + OpenDCP 0.0.25 + A Test DCP + feature + + urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 + 81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 + + + + + urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09 + + + urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85 + + 24 1 + 24 + 0 + 24 + fnl4pJDAQk/xQ54W4R+l6S7PB7E= + + + urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 + + 24 1 + 24 + 0 + 24 + ErlJmAfNakirQq9kVrnPj7fIOw0= + 48 1 + 32 32 + + + + + 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 index 00000000..6708f741 --- /dev/null +++ b/test/ref/DCP/dcp_test2/pkl_74e205d0-d145-42d2-8c49-7b55d058ca55.xml @@ -0,0 +1,31 @@ + + + urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55 + Created by libdcp + 2012-07-17T04:45:18+00:00 + OpenDCP 0.0.25 + OpenDCP 0.0.25 + + + urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b + 81fb54df-e1bf-4647-8788-ea7ba154375b + pqdZpLFIn6kcClkACI9VLGCzNgk= + 1770 + text/xml + + + urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 + 1fab8bb0-cfaf-4225-ad6d-01768bc10470 + ErlJmAfNakirQq9kVrnPj7fIOw0= + 35032 + application/mxf + + + urn:uuid:8b92bcee-62fc-4a33-a51a-816e9611ce85 + 8b92bcee-62fc-4a33-a51a-816e9611ce85 + fnl4pJDAQk/xQ54W4R+l6S7PB7E= + 161326 + application/mxf + + + 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 index 44fc9cd3..00000000 --- a/test/ref/DCP/dcp_test2/pkl_9f19589a-01e5-4093-b23b-a32e143e5956.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - urn:uuid:9f19589a-01e5-4093-b23b-a32e143e5956 - Created by libdcp - 2012-07-17T04:45:18+00:00 - OpenDCP 0.0.25 - OpenDCP 0.0.25 - - - urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d - 48db27c3-4964-46a2-8b02-3e5570efb42d - SvHyFHgdvrcbyej6IQwUWX3kOfI= - 1770 - text/xml - - - urn:uuid:63c3aece-c581-4603-b612-75e43f0c0430 - 63c3aece-c581-4603-b612-75e43f0c0430 - OEAL0t1jvySBWib02IdWNHkPWsA= - 35032 - application/mxf - - - urn:uuid:e5c3091b-f61e-459c-9faf-210bd4d3c7bf - e5c3091b-f61e-459c-9faf-210bd4d3c7bf - yOPZZcSUfpF0dwuq4awCqOGjbaE= - 161326 - application/mxf - - - diff --git a/test/ref/DCP/dcp_test2/video.mxf b/test/ref/DCP/dcp_test2/video.mxf index cd97d571..01d0b908 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/dcp_test5/ASSETMAP.xml b/test/ref/DCP/dcp_test5/ASSETMAP.xml index 03550fe5..a5be569a 100644 --- a/test/ref/DCP/dcp_test5/ASSETMAP.xml +++ b/test/ref/DCP/dcp_test5/ASSETMAP.xml @@ -1,6 +1,6 @@ - urn:uuid:4e05cadd-460f-4573-a0e9-b6c416c4b958 + urn:uuid:cd49971e-bf4c-4594-8474-54ebef09a40c Created by libdcp OpenDCP 0.0.25 1 @@ -8,11 +8,11 @@ OpenDCP 0.0.25 - urn:uuid:7574c611-f8de-4d20-98c4-2eb7dc87080a + urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d true - pkl_7574c611-f8de-4d20-98c4-2eb7dc87080a.xml + pkl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml 1 0 1186 @@ -20,10 +20,10 @@ - urn:uuid:3a8a01d1-0e1c-4ff0-977d-63d32995a1fd + urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b - cpl_3a8a01d1-0e1c-4ff0-977d-63d32995a1fd.xml + cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml 1 0 2152 @@ -31,7 +31,7 @@ - urn:uuid:2527dbe5-41f7-4a22-a2d2-bd7cfeffbce1 + urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 video.mxf @@ -42,7 +42,7 @@ - urn:uuid:69827080-f731-4e4c-9c8a-ec568acdfacc + urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9 audio.mxf diff --git a/test/ref/DCP/dcp_test5/audio.mxf b/test/ref/DCP/dcp_test5/audio.mxf index 56b909c5..62158f3f 100644 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 index 5eb8e8e0..00000000 --- a/test/ref/DCP/dcp_test5/cpl_3a8a01d1-0e1c-4ff0-977d-63d32995a1fd.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - urn:uuid:3a8a01d1-0e1c-4ff0-977d-63d32995a1fd - A Test DCP - 2012-07-17T04:45:18+00:00 - OpenDCP 0.0.25 - OpenDCP 0.0.25 - A Test DCP - feature - - urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 - 81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 - - - - - urn:uuid:34acc068-e059-4fb9-90ca-461c57d17dae - - - urn:uuid:2527dbe5-41f7-4a22-a2d2-bd7cfeffbce1 - - 24 1 - 24 - 0 - 24 - K4HdTpPPOuFkq9VsRXau8+uPA1A= - 24 1 - 32 32 - - - urn:uuid:69827080-f731-4e4c-9c8a-ec568acdfacc - - 24 1 - 24 - 0 - 24 - 466RYVbB8pyiP6RD6mjEjy4N8d4= - - - urn:uuid:b68febcc-5ddf-489a-84a7-924f29fa2afd - - 24 1 - 1489 - 0 - 1489 - jo8pQSebhScPN4EVvvpIUWRrDeM= - urn:smpte:ul:060e2b34.04010105.0e090604.00000000 - - - - - 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 index 00000000..4eafc4c2 --- /dev/null +++ b/test/ref/DCP/dcp_test5/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml @@ -0,0 +1,52 @@ + + + urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b + A Test DCP + 2012-07-17T04:45:18+00:00 + OpenDCP 0.0.25 + OpenDCP 0.0.25 + A Test DCP + feature + + urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 + 81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 + + + + + urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55 + + + urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 + + 24 1 + 24 + 0 + 24 + 1uPB643nrQfpY+Y0AypGko+PiPE= + 24 1 + 32 32 + + + urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9 + + 24 1 + 24 + 0 + 24 + ifmC1P7fjigb1oVxx6xs3Paz/GY= + + + urn:uuid:b68febcc-5ddf-489a-84a7-924f29fa2afd + + 24 1 + 1489 + 0 + 1489 + jo8pQSebhScPN4EVvvpIUWRrDeM= + urn:smpte:ul:060e2b34.04010105.0e090604.00000000 + + + + + 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 index 00000000..dd0f69eb --- /dev/null +++ b/test/ref/DCP/dcp_test5/pkl_48db27c3-4964-46a2-8b02-3e5570efb42d.xml @@ -0,0 +1,31 @@ + + + urn:uuid:48db27c3-4964-46a2-8b02-3e5570efb42d + Created by libdcp + 2012-07-17T04:45:18+00:00 + OpenDCP 0.0.25 + OpenDCP 0.0.25 + + + urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b + 81fb54df-e1bf-4647-8788-ea7ba154375b + yymWSY7jL4TWqI1Sy/Q2oUK1GX8= + 2152 + text/xml + + + urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 + 1fab8bb0-cfaf-4225-ad6d-01768bc10470 + 1uPB643nrQfpY+Y0AypGko+PiPE= + 26080 + application/mxf + + + urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9 + 9482e87d-292d-4e0e-a98d-c61822b60fe9 + ifmC1P7fjigb1oVxx6xs3Paz/GY= + 161326 + application/mxf + + + 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 index bf029cdb..00000000 --- a/test/ref/DCP/dcp_test5/pkl_7574c611-f8de-4d20-98c4-2eb7dc87080a.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - urn:uuid:7574c611-f8de-4d20-98c4-2eb7dc87080a - Created by libdcp - 2012-07-17T04:45:18+00:00 - OpenDCP 0.0.25 - OpenDCP 0.0.25 - - - urn:uuid:3a8a01d1-0e1c-4ff0-977d-63d32995a1fd - 3a8a01d1-0e1c-4ff0-977d-63d32995a1fd - /ZOIScc5e/LacNSwBp4/HMof2OQ= - 2152 - text/xml - - - urn:uuid:2527dbe5-41f7-4a22-a2d2-bd7cfeffbce1 - 2527dbe5-41f7-4a22-a2d2-bd7cfeffbce1 - K4HdTpPPOuFkq9VsRXau8+uPA1A= - 26080 - application/mxf - - - urn:uuid:69827080-f731-4e4c-9c8a-ec568acdfacc - 69827080-f731-4e4c-9c8a-ec568acdfacc - 466RYVbB8pyiP6RD6mjEjy4N8d4= - 161326 - application/mxf - - - diff --git a/test/ref/DCP/dcp_test5/video.mxf b/test/ref/DCP/dcp_test5/video.mxf index ff6900b7..dde49093 100644 Binary files a/test/ref/DCP/dcp_test5/video.mxf and b/test/ref/DCP/dcp_test5/video.mxf differ diff --git a/test/ref/DCP/dcp_test7/ASSETMAP b/test/ref/DCP/dcp_test7/ASSETMAP index 1def7fa3..92ef4e38 100644 --- a/test/ref/DCP/dcp_test7/ASSETMAP +++ b/test/ref/DCP/dcp_test7/ASSETMAP @@ -1,6 +1,6 @@ - urn:uuid:d1c42121-73a5-4d1d-b1c2-8165695d58ff + urn:uuid:74e205d0-d145-42d2-8c49-7b55d058ca55 Created by libdcp 1 2012-07-17T04:45:18+00:00 @@ -8,11 +8,11 @@ OpenDCP 0.0.25 - urn:uuid:a800aea0-904b-4bd0-9250-374fdb46528b + urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09 true - pkl_a800aea0-904b-4bd0-9250-374fdb46528b.xml + pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml 1 0 1253 @@ -20,10 +20,10 @@ - urn:uuid:1d513f84-5856-4f91-a88a-4d452cc6a28a + urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b - cpl_1d513f84-5856-4f91-a88a-4d452cc6a28a.xml + cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml 1 0 1587 @@ -31,7 +31,7 @@ - urn:uuid:cb2b7aa9-a378-4392-86f8-df013863fdd0 + urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 video.mxf @@ -42,7 +42,7 @@ - urn:uuid:e63718c9-fa72-4dd9-a144-8736591b08b6 + urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9 audio.mxf diff --git a/test/ref/DCP/dcp_test7/audio.mxf b/test/ref/DCP/dcp_test7/audio.mxf index ec96c55c..62158f3f 100644 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 index 93a83a50..00000000 --- a/test/ref/DCP/dcp_test7/cpl_1d513f84-5856-4f91-a88a-4d452cc6a28a.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - urn:uuid:1d513f84-5856-4f91-a88a-4d452cc6a28a - A Test DCP - 2012-07-17T04:45:18+00:00 - OpenDCP 0.0.25 - OpenDCP 0.0.25 - A Test DCP - feature - - urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11 - content-version-label-text - - - - - urn:uuid:f3452d7a-2f0d-4758-b0ab-63432f863752 - - - urn:uuid:cb2b7aa9-a378-4392-86f8-df013863fdd0 - - 24 1 - 24 - 0 - 24 - OAQxUPOCyW+SkZkZ+GoSIhxkn8E= - 24 1 - 1.33 - - - urn:uuid:e63718c9-fa72-4dd9-a144-8736591b08b6 - - 24 1 - 24 - 0 - 24 - f5srKV6hTI6FRxgXGnhLPQqn12w= - - - - - 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 index 00000000..24a8419c --- /dev/null +++ b/test/ref/DCP/dcp_test7/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml @@ -0,0 +1,42 @@ + + + urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b + A Test DCP + 2012-07-17T04:45:18+00:00 + OpenDCP 0.0.25 + OpenDCP 0.0.25 + A Test DCP + feature + + urn:uuid:75ac29aa-42ac-1234-ecae-49251abefd11 + content-version-label-text + + + + + urn:uuid:18be072e-5a0f-44e1-b2eb-c8a52ae12789 + + + urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 + + 24 1 + 24 + 0 + 24 + 1uPB643nrQfpY+Y0AypGko+PiPE= + 24 1 + 1.33 + + + urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9 + + 24 1 + 24 + 0 + 24 + ifmC1P7fjigb1oVxx6xs3Paz/GY= + + + + + 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 index a12f44fb..00000000 --- a/test/ref/DCP/dcp_test7/pkl_a800aea0-904b-4bd0-9250-374fdb46528b.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - urn:uuid:a800aea0-904b-4bd0-9250-374fdb46528b - Created by libdcp - 2012-07-17T04:45:18+00:00 - OpenDCP 0.0.25 - OpenDCP 0.0.25 - - - urn:uuid:1d513f84-5856-4f91-a88a-4d452cc6a28a - 1d513f84-5856-4f91-a88a-4d452cc6a28a - PJ7NPfT/cZC6XfoLWX+wiaGH/yQ= - 1587 - text/xml;asdcpKind=CPL - - - urn:uuid:cb2b7aa9-a378-4392-86f8-df013863fdd0 - cb2b7aa9-a378-4392-86f8-df013863fdd0 - OAQxUPOCyW+SkZkZ+GoSIhxkn8E= - 26080 - application/x-smpte-mxf;asdcpKind=Picture - - - urn:uuid:e63718c9-fa72-4dd9-a144-8736591b08b6 - e63718c9-fa72-4dd9-a144-8736591b08b6 - f5srKV6hTI6FRxgXGnhLPQqn12w= - 161326 - application/x-smpte-mxf;asdcpKind=Sound - - - 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 index 00000000..70c4fb56 --- /dev/null +++ b/test/ref/DCP/dcp_test7/pkl_ae8a9818-872a-4f86-8493-11dfdea03e09.xml @@ -0,0 +1,31 @@ + + + urn:uuid:ae8a9818-872a-4f86-8493-11dfdea03e09 + Created by libdcp + 2012-07-17T04:45:18+00:00 + OpenDCP 0.0.25 + OpenDCP 0.0.25 + + + urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b + 81fb54df-e1bf-4647-8788-ea7ba154375b + W4fAVf4nVZNfwWd25Vu1WtsFnUQ= + 1587 + text/xml;asdcpKind=CPL + + + urn:uuid:1fab8bb0-cfaf-4225-ad6d-01768bc10470 + 1fab8bb0-cfaf-4225-ad6d-01768bc10470 + 1uPB643nrQfpY+Y0AypGko+PiPE= + 26080 + application/x-smpte-mxf;asdcpKind=Picture + + + urn:uuid:9482e87d-292d-4e0e-a98d-c61822b60fe9 + 9482e87d-292d-4e0e-a98d-c61822b60fe9 + ifmC1P7fjigb1oVxx6xs3Paz/GY= + 161326 + application/x-smpte-mxf;asdcpKind=Sound + + + diff --git a/test/ref/DCP/dcp_test7/video.mxf b/test/ref/DCP/dcp_test7/video.mxf index 0a6b9797..dde49093 100644 Binary files a/test/ref/DCP/dcp_test7/video.mxf and b/test/ref/DCP/dcp_test7/video.mxf differ diff --git a/test/ref/DCP/encryption_test/ASSETMAP.xml b/test/ref/DCP/encryption_test/ASSETMAP.xml index 78d5b99b..3f189256 100644 --- a/test/ref/DCP/encryption_test/ASSETMAP.xml +++ b/test/ref/DCP/encryption_test/ASSETMAP.xml @@ -1,6 +1,6 @@ - urn:uuid:b97ed576-395c-4ae6-91e4-99116765dabd + urn:uuid:5d51e8a1-b2a5-4da6-9b66-4615c3609440 Created by libdcp OpenDCP 0.0.25 1 @@ -8,11 +8,11 @@ OpenDCP 0.0.25 - urn:uuid:59730183-23bc-491e-906b-1dd453ff9d11 + urn:uuid:6af1e0c1-c441-47f8-a502-3efd46b1fa4f true - pkl_59730183-23bc-491e-906b-1dd453ff9d11.xml + pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml 1 0 8708 @@ -20,10 +20,10 @@ - urn:uuid:b3eba4a0-f542-4937-b972-1cc4667ed01a + urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b - cpl_b3eba4a0-f542-4937-b972-1cc4667ed01a.xml + cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml 1 0 9310 @@ -31,7 +31,7 @@ - urn:uuid:2d4e8308-7197-41b8-8a0a-07a939d74971 + urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 video.mxf @@ -42,7 +42,7 @@ - urn:uuid:99c2c0d0-7491-4ad0-86d5-4f0af19d71f6 + urn:uuid:d5f633d3-cb6e-4c04-85ae-4b2da9422852 audio.mxf diff --git a/test/ref/DCP/encryption_test/audio.mxf b/test/ref/DCP/encryption_test/audio.mxf index d9763460..2e12edab 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_81fb54df-e1bf-4647-8788-ea7ba154375b.xml b/test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml new file mode 100644 index 00000000..a2dc3bf4 --- /dev/null +++ b/test/ref/DCP/encryption_test/cpl_81fb54df-e1bf-4647-8788-ea7ba154375b.xml @@ -0,0 +1,165 @@ + + + urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b + A Test DCP + 2012-07-17T04:45:18+00:00 + OpenDCP 0.0.25 + OpenDCP 0.0.25 + A Test DCP + feature + + urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 + 81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 + + + + + urn:uuid:93182bd2-b1e8-41a3-b5c8-6e6564273bff + + + urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 + + 24 1 + 24 + 0 + 24 + urn:uuid:6a9e31a6-50a4-4ecb-8683-fa667848470a + EdbLFybsoLbZ3KB2jFtWZxMEMHI= + 24 1 + 32 32 + + + urn:uuid:d5f633d3-cb6e-4c04-85ae-4b2da9422852 + + 24 1 + 24 + 0 + 24 + urn:uuid:4c80356c-e9ac-4d81-b8fd-4806055c956d + h7XEYV80a8CvQ5wS1OR3ldbkLM4= + + + + + + + + dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org + 7 + + dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org + + + + + + + + + + + + IANIEQpHSdKYpetv7vU8c9NL55g= + + + elcV7C8ITQPME2EnZCld1/NPFi5KXzSEWGDEchEfHryc6kLx2ZY1yl/uylaHgY0R +Z37ida9b0wPySJzr5vbTRerIHF/S2asXtGC1kgo5MWtXgATUtUe031HJ+TJPi9bj +SD0u1V+PciElYwPRHID27kpLVgdSoq6cNoYG2w4yNvtnyF5r+n+0IiCYNMlkVqGW +gX2Lfa/Oy8bJbioOo5yHt+6sFSPAp7GJdTEtzOEiKAkaLpymAB7N3L3gW2qS6OnL +2KspdXdR3WKqPEprf3A0OtWTjbfsuvsyleCl/gw4O2dMRFbc1R0OutsWVw1h8PXl +UtAYFxwdlY7ile2ZCelQMA== + + + + dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org + 7 + + 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= + + + + dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org + 6 + + 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 + + + + dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org + 5 + + 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== + + + + 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 index 3712b0b2..00000000 --- a/test/ref/DCP/encryption_test/cpl_b3eba4a0-f542-4937-b972-1cc4667ed01a.xml +++ /dev/null @@ -1,165 +0,0 @@ - - - urn:uuid:b3eba4a0-f542-4937-b972-1cc4667ed01a - A Test DCP - 2012-07-17T04:45:18+00:00 - OpenDCP 0.0.25 - OpenDCP 0.0.25 - A Test DCP - feature - - urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 - 81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00 - - - - - urn:uuid:3525ad07-a77c-4457-b391-47dcd9534aeb - - - urn:uuid:2d4e8308-7197-41b8-8a0a-07a939d74971 - - 24 1 - 24 - 0 - 24 - urn:uuid:0b493509-3c79-4139-82c0-a330c1ab03f5 - 67diQ9tld/BCyMIzFM9yzBoIjKc= - 24 1 - 32 32 - - - urn:uuid:99c2c0d0-7491-4ad0-86d5-4f0af19d71f6 - - 24 1 - 24 - 0 - 24 - urn:uuid:4aecad87-a372-4657-b15a-46e9fc109721 - sskK3KhvnddXtjVricwXXuxLOQ0= - - - - - - - - dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org - 7 - - dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org - - - - - - - - - - - - ZvU17sFJTWmZIryqHCR7UJhU8c8= - - - a9nRSH/MjkLrPONRRGagztJ4HHvDxk1uvQ9HecNnu0dm5eWRJPmi8jGl1tNgiP5W -fGqb3Cx0jJGyXmum6WkfgflPaZ7Y+/n8YDn+O/WpLby+jneh7rF7OyqyX1bItvSs -o7fKU+/FBnYTYphloyTdEJUYIqCGUGwiawFdX6gux8qeyRJtcxp5zkXG+Sx42TXm -+qJJTOF+nnIienXeciqUpcGzFDFAqD8PDXlAEPjMIC0a8peywF3LXfuFCZebb9GG -da6ahtp8QWIQyID3hNzOYyHm2OOIhlBmI00m+ErOpVEp1ZrHk/ex2g4LXYM4B8h5 -3DA/V87694xNI+V7htRYFw== - - - - dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org - 7 - - 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= - - - - dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org - 6 - - 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 - - - - dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org - 5 - - 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== - - - - 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 index a97052ef..00000000 --- a/test/ref/DCP/encryption_test/pkl_59730183-23bc-491e-906b-1dd453ff9d11.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - urn:uuid:59730183-23bc-491e-906b-1dd453ff9d11 - Created by libdcp - 2012-07-17T04:45:18+00:00 - OpenDCP 0.0.25 - OpenDCP 0.0.25 - - - urn:uuid:b3eba4a0-f542-4937-b972-1cc4667ed01a - b3eba4a0-f542-4937-b972-1cc4667ed01a - uZLkHEoyeW1kZfZXayWCcAWvtMs= - 9310 - text/xml - - - urn:uuid:2d4e8308-7197-41b8-8a0a-07a939d74971 - 2d4e8308-7197-41b8-8a0a-07a939d74971 - 67diQ9tld/BCyMIzFM9yzBoIjKc= - 29896 - application/mxf - - - urn:uuid:99c2c0d0-7491-4ad0-86d5-4f0af19d71f6 - 99c2c0d0-7491-4ad0-86d5-4f0af19d71f6 - sskK3KhvnddXtjVricwXXuxLOQ0= - 165454 - application/mxf - - - - - - dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org - 7 - - dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org - - - - - - - - - - - - dna3BxqzhB2VPCEvIU2n/vVtlGE= - - - T7aFfkzcZ0E9gVMM1edd1STT8COAJ3VPUCjiaT5tXo5yhxB6WtBqucFcrZnbpvEg -nwWLUk9W40XRvPUeKf9GWqsqIFr4jk9o6sc74O0MGcQmN4u1DSGF5ahv5XbKoKAS -HO/+4LaanSzVpXgwbod/1/A0HVMZCmS0s0lUSY+bJbmbC/ExUTUXgO1cU7Xexdg2 -KYs6LkBgio7EZ9reXsAaDeGxXN790ndtAAoSHvYOt4cNePJXs/Q07/mOg4gFI655 -uPl2V3vLpdB/XFJ6e6OS2t1SwrtnATuE5Z9mL+ddn4D6Q8Vp9vXlv7rJxUcGgyWU -mWiCpr1bWb0R4vsB/KQkNw== - - - - dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org - 7 - - 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= - - - - dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org - 6 - - 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 - - - - dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org - 5 - - 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== - - - - 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 index 00000000..fdfb170d --- /dev/null +++ b/test/ref/DCP/encryption_test/pkl_6af1e0c1-c441-47f8-a502-3efd46b1fa4f.xml @@ -0,0 +1,152 @@ + + + urn:uuid:6af1e0c1-c441-47f8-a502-3efd46b1fa4f + Created by libdcp + 2012-07-17T04:45:18+00:00 + OpenDCP 0.0.25 + OpenDCP 0.0.25 + + + urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b + 81fb54df-e1bf-4647-8788-ea7ba154375b + dhoWJ3yykLSeAOQVOUNvMxsiljk= + 9310 + text/xml + + + urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 + 46c3eb45-15e5-47d6-8684-d8641e4dc516 + EdbLFybsoLbZ3KB2jFtWZxMEMHI= + 29896 + application/mxf + + + urn:uuid:d5f633d3-cb6e-4c04-85ae-4b2da9422852 + d5f633d3-cb6e-4c04-85ae-4b2da9422852 + h7XEYV80a8CvQ5wS1OR3ldbkLM4= + 165454 + application/mxf + + + + + + dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org + 7 + + dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org + + + + + + + + + + + + 92Er8kJ8u9u76Fb1EUNVyeblJd0= + + + SdxywkzTQtRWscRC9dmEoepc2dJ9cIi/GShodKNcRAYJBpm+zqpMCJ3wDT3q+pvT +igG/hnkMRKQlAjK1I/VBEUGfEisl8QAerme8ff+GzY9vYlPoTyGQnqrNY+JBeir7 +r46JELWAxiRa+bMM/Dw3PLrRtQ/0EtZIcPNrJ6K+VeYHjV9KaaFXB740bJ1emVtY +BqaAyXG2gk/4v1TFf19IBNH0cwu/nwJ7Cg6Xp2dKkRqtmOITYdxV9Ro/FxPs0M4Q +vuwoOUJQxtgs4WgvGwHAvzTkyr6E5tX7z0uh5YEbH5/IX8l1fOvMi3LHK0E77d5k +8IdST9nHTtvpHrJgsDUI4A== + + + + dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org + 7 + + 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= + + + + dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org + 6 + + 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 + + + + dnQualifier=DCnRdHFbcv4ANVUq2\+wMVALFSec=,CN=.smpte-430-2.ROOT.NOT_FOR_PRODUCTION,OU=example.org,O=example.org + 5 + + 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== + + + + diff --git a/test/ref/DCP/encryption_test/video.mxf b/test/ref/DCP/encryption_test/video.mxf index 9f9824cf..67e3b89b 100644 Binary files a/test/ref/DCP/encryption_test/video.mxf and b/test/ref/DCP/encryption_test/video.mxf differ diff --git a/test/ref/write_interop_subtitle_test3/ASSETMAP b/test/ref/write_interop_subtitle_test3/ASSETMAP index 5d0e85da..9c8e07c5 100644 --- a/test/ref/write_interop_subtitle_test3/ASSETMAP +++ b/test/ref/write_interop_subtitle_test3/ASSETMAP @@ -1,6 +1,6 @@ - urn:uuid:20a39790-cad4-4342-98d9-0b0cf1cb6027 + urn:uuid:47a8e83e-fd5f-445d-a1bc-9f59c5289c34 Created by libdcp 1 2018-09-02T04:45:18+00:00 @@ -8,11 +8,11 @@ libdcp - urn:uuid:f5aab304-8145-44e3-a265-aa8d8812d8a2 + urn:uuid:e94b8a0d-27f7-408a-af16-78d3df419a91 true - pkl_f5aab304-8145-44e3-a265-aa8d8812d8a2.xml + pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml 1 0 1114 @@ -20,10 +20,10 @@ - urn:uuid:f28b567b-3b9a-417a-aee4-6fc1a2c6a3af + urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516 - cpl_f28b567b-3b9a-417a-aee4-6fc1a2c6a3af.xml + cpl_46c3eb45-15e5-47d6-8684-d8641e4dc516.xml 1 0 1105 @@ -42,10 +42,10 @@ - urn:uuid:ef5c6baa-be2d-4f86-9f15-b1acc792ee8b + urn:uuid:d36f4bb3-c4fa-4a95-9915-6fec3110cd71 - ef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png + d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png 1 0 44935 diff --git a/test/ref/write_interop_subtitle_test3/subs.xml b/test/ref/write_interop_subtitle_test3/subs.xml index 86c4f0aa..d1c8fa7e 100644 --- a/test/ref/write_interop_subtitle_test3/subs.xml +++ b/test/ref/write_interop_subtitle_test3/subs.xml @@ -1,2 +1,2 @@ -a6c58cff-3e1e-4b38-acec-a42224475ef6Test1ENef5c6baa-be2d-4f86-9f15-b1acc792ee8b.png +a6c58cff-3e1e-4b38-acec-a42224475ef6Test1ENd36f4bb3-c4fa-4a95-9915-6fec3110cd71.png -- cgit v1.2.3