From f8e2ce19a27320fe1fc5762985d6c66d1f2b8f23 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 22 Mar 2018 21:09:18 +0000 Subject: Fix reference data for changes to dsig namespacing. --- test/frame_info_hash_test.cc | 8 ++++---- test/ref/DCP/encryption_test/ASSETMAP.xml | 2 +- .../cpl_2d6c1a64-1eda-4982-8e3e-274d8d01a7c6.xml | 12 ++++++------ .../pkl_7201334f-ab80-427e-b3b2-e6ab5c8daa0b.xml | 12 ++++++------ 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/test/frame_info_hash_test.cc b/test/frame_info_hash_test.cc index 6bc1dbef..8e894d29 100644 --- a/test/frame_info_hash_test.cc +++ b/test/frame_info_hash_test.cc @@ -32,7 +32,7 @@ check (unsigned int* seed, shared_ptr writer, string ha shared_ptr xyz (new dcp::OpenJPEGImage (dcp::Size (1998, 1080))); for (int c = 0; c < 3; ++c) { for (int p = 0; p < (1998 * 1080); ++p) { - xyz->data(c)[p] = rand_r (seed); + xyz->data(c)[p] = rand_r (seed) & 0xfff; } } @@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE (frame_info_hash_test) unsigned int seed = 42; /* Check a few random frames */ - check (&seed, writer, "7ddfb4f5cec76f95138c4377a829dd6f"); - check (&seed, writer, "d6a91028bab60995b4fc49fbccd5c2ba"); - check (&seed, writer, "9d8653644f49f692e4bbac34106a4897"); + check (&seed, writer, "c039c5a0e5d20bc646f7e9c10e2d5874"); + check (&seed, writer, "d9e694cfe84544c54a869c128ba39343"); + check (&seed, writer, "fafb05a0039cb9fc604279c90a13cb87"); } diff --git a/test/ref/DCP/encryption_test/ASSETMAP.xml b/test/ref/DCP/encryption_test/ASSETMAP.xml index eec6e701..4c06218a 100644 --- a/test/ref/DCP/encryption_test/ASSETMAP.xml +++ b/test/ref/DCP/encryption_test/ASSETMAP.xml @@ -1,2 +1,2 @@ -urn:uuid:c0c7c265-e563-41ae-888f-9a6e2a8f12b1Created by libdcpOpenDCP 0.0.2512012-07-17T04:45:18+00:00OpenDCP 0.0.25urn:uuid:7201334f-ab80-427e-b3b2-e6ab5c8daa0btruepkl_7201334f-ab80-427e-b3b2-e6ab5c8daa0b.xml108153urn:uuid:2d6c1a64-1eda-4982-8e3e-274d8d01a7c6cpl_2d6c1a64-1eda-4982-8e3e-274d8d01a7c6.xml108618urn:uuid:639da64b-1fd3-498b-a6ea-c417540498cdvideo.mxf1029896urn:uuid:be0c5a36-e1d9-4a56-b1d0-23bc6bf52825audio.mxf10165454 +urn:uuid:c0c7c265-e563-41ae-888f-9a6e2a8f12b1Created by libdcpOpenDCP 0.0.2512012-07-17T04:45:18+00:00OpenDCP 0.0.25urn:uuid:7201334f-ab80-427e-b3b2-e6ab5c8daa0btruepkl_7201334f-ab80-427e-b3b2-e6ab5c8daa0b.xml108201urn:uuid:2d6c1a64-1eda-4982-8e3e-274d8d01a7c6cpl_2d6c1a64-1eda-4982-8e3e-274d8d01a7c6.xml108666urn:uuid:639da64b-1fd3-498b-a6ea-c417540498cdvideo.mxf1029896urn:uuid:be0c5a36-e1d9-4a56-b1d0-23bc6bf52825audio.mxf10165454 diff --git a/test/ref/DCP/encryption_test/cpl_2d6c1a64-1eda-4982-8e3e-274d8d01a7c6.xml b/test/ref/DCP/encryption_test/cpl_2d6c1a64-1eda-4982-8e3e-274d8d01a7c6.xml index b1530459..67642657 100644 --- a/test/ref/DCP/encryption_test/cpl_2d6c1a64-1eda-4982-8e3e-274d8d01a7c6.xml +++ b/test/ref/DCP/encryption_test/cpl_2d6c1a64-1eda-4982-8e3e-274d8d01a7c6.xml @@ -1,10 +1,10 @@ -urn:uuid:2d6c1a64-1eda-4982-8e3e-274d8d01a7c6A Test DCP2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25A Test DCPfeatureurn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:0081fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00urn:uuid:496abf91-d4ce-4a90-ada6-32d0b2d767eeurn:uuid:639da64b-1fd3-498b-a6ea-c417540498cdvideo.mxf24 124024urn:uuid:349c34b2-6b6a-4a9b-9a35-7607c67f6d42ZPgmqBn1OSsdZb1TdIjeFSrkSe4=24 132 32urn:uuid:be0c5a36-e1d9-4a56-b1d0-23bc6bf52825audio.mxf24 124024urn:uuid:e2b9a3d4-10ef-46ec-996a-b082e08fe7c2XVg8v7DNkDpSnGITsmDRVQqizgM=dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org7dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.orgVBF3RyXhRJzevEKWyW6L1oVmGfw=ynFjnaBDDRKRbdxJXijC/fUbAtmhCsEsZNE5S4n6TCucGwj3nvNX+n93T9kqo8LT -EEX/5J1Jo/nPU/ZLuVTEA9LifCHv3jeI8y/IWUAk3QxpdJzPqPFCFEyfp8zN+DRc -43nK1PzvTA91HTMOxqikTxi4b+b4KXIPRTUb0KSTACxKFqUd426vrP73WyxhT/i9 -BfaLJnZKIU8Fk76PmuMxBopWOdrfZpYfzgyisBkbFaVi4fC448dZfMUApZ4c0Yth -/VaIXH4zfU85iXzrroMdJzrEDNq6hcazK3eQPFIP3aKeLxGyuCRKVRgbBY/prVoa -d1yk/JPEIYbKF39vwT5+Rg==dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org7MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh +urn:uuid:2d6c1a64-1eda-4982-8e3e-274d8d01a7c6A Test DCP2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25A Test DCPfeatureurn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:0081fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00urn:uuid:496abf91-d4ce-4a90-ada6-32d0b2d767eeurn:uuid:639da64b-1fd3-498b-a6ea-c417540498cdvideo.mxf24 124024urn:uuid:349c34b2-6b6a-4a9b-9a35-7607c67f6d42ZPgmqBn1OSsdZb1TdIjeFSrkSe4=24 132 32urn:uuid:be0c5a36-e1d9-4a56-b1d0-23bc6bf52825audio.mxf24 124024urn:uuid:e2b9a3d4-10ef-46ec-996a-b082e08fe7c2XVg8v7DNkDpSnGITsmDRVQqizgM=dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org7dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org0wjBcMZ9UWzwv0CGOZaJg8eRI+k=Eu31G1b926O8aZPHGVQuMOUoNPcqGyBQC4yRTodHhKtDS6DMBBUEL0BZB0Ctn13i +ca68cvO8LTsA8v/bqbQ/o8AapYq6LWXpTj6j88LWVn7dKWHzfobqh0fQa5sQiMwo +AsBuMUAmttVkaQLL0tsBkz/5CfIZ+0CoWEwu72NMZDMbV8u5Nj96pePRipfI0JJQ +1BDamrCXgRwAFy74On/cjJgImkT3RHKDYcZ/xZawt0ioQMigBlsMcUoGkUW4zAbi +C5377jTELppsQB2QC61JcG00FwCux7N7CBSYwTgzgX4571D9ZEKdfDgU9pho3tl1 +iIr9EwTmZm+QfB/KGsZKqQ==dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org7MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc NmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0PTAeFw0xNTA2MDUxMzIwMDhaFw0y diff --git a/test/ref/DCP/encryption_test/pkl_7201334f-ab80-427e-b3b2-e6ab5c8daa0b.xml b/test/ref/DCP/encryption_test/pkl_7201334f-ab80-427e-b3b2-e6ab5c8daa0b.xml index 93d9eb72..4bc04785 100644 --- a/test/ref/DCP/encryption_test/pkl_7201334f-ab80-427e-b3b2-e6ab5c8daa0b.xml +++ b/test/ref/DCP/encryption_test/pkl_7201334f-ab80-427e-b3b2-e6ab5c8daa0b.xml @@ -1,10 +1,10 @@ -urn:uuid:7201334f-ab80-427e-b3b2-e6ab5c8daa0bCreated by libdcp2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25urn:uuid:2d6c1a64-1eda-4982-8e3e-274d8d01a7c62d6c1a64-1eda-4982-8e3e-274d8d01a7c6X36F+t0TABUZurZuebNc7RIuOyo=8618text/xmlurn:uuid:639da64b-1fd3-498b-a6ea-c417540498cd639da64b-1fd3-498b-a6ea-c417540498cdZPgmqBn1OSsdZb1TdIjeFSrkSe4=29896application/mxfurn:uuid:be0c5a36-e1d9-4a56-b1d0-23bc6bf52825be0c5a36-e1d9-4a56-b1d0-23bc6bf52825XVg8v7DNkDpSnGITsmDRVQqizgM=165454application/mxfdnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org7dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org0jiAlUM+Cx5sy35qCm8xT4ng8Mw=je2y7wxW4eaR+zECzuK9MJ8oeQsZpoL55hcTgRLWyR58coC10yN+pdtWtuer7SWE -jkU20SwtvQvYoeymrC1h3w6J8QKLboSpTzJAEtVUAAAsFgMgWFQRmuMmnL7Fbvnr -1iSJhpY1pVrhBxkk/Df45IXK2j6ZwYegYCLQOoQgOP9cM70OZkpXtop5oeosLVMi -YhAGItWG3fRc6Me+vEMKKqGm4QnWufJCtmv+gBaOuvmWUISu60XlFmZzYDDGEvYY -aOG/Y9fCOwg0SMAqp5rYBWVovpveToAxDfhQGwpz7Lo1ssFv/MK8O9mgZBerzIUd -NjyQIyVkGbB/LxmLDEUa0Q==dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org7MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh +urn:uuid:7201334f-ab80-427e-b3b2-e6ab5c8daa0bCreated by libdcp2012-07-17T04:45:18+00:00OpenDCP 0.0.25OpenDCP 0.0.25urn:uuid:2d6c1a64-1eda-4982-8e3e-274d8d01a7c62d6c1a64-1eda-4982-8e3e-274d8d01a7c62Vkxkq/gfjcxoeB4Rur1Y+eFhsQ=8666text/xmlurn:uuid:639da64b-1fd3-498b-a6ea-c417540498cd639da64b-1fd3-498b-a6ea-c417540498cdZPgmqBn1OSsdZb1TdIjeFSrkSe4=29896application/mxfurn:uuid:be0c5a36-e1d9-4a56-b1d0-23bc6bf52825be0c5a36-e1d9-4a56-b1d0-23bc6bf52825XVg8v7DNkDpSnGITsmDRVQqizgM=165454application/mxfdnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org7dnQualifier=QFVlym7fuql6bPOnY38aaO1ZPW4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.orgh0Eye164JN4IrNHbPIgzZPH3dfY=sxKPUdIJAIWV1/D1scIkwlllY4cmuSsvtQMKmFLJ+XUXOmMdChDQG0k/5MpABY7e +XhqN2DpzAZbmx+IMqTGj5/SY3GZqtGDBLaKnM6/dxcv5nLkz41hGaVt+cgqYgsFG +8dRMbJiWdLzsXE4rBkN+aDO/Q8WE8fx+IjZ7A6UKVMSIRsFbQ7Y61SFrCW6rJYnn +oK6hxM8MaFNL3XleyOxYf4mArmGxfxRH/CBfuxnPn5SZeK4zG4T4Ry/eEEB3KxaH +IglR3j4Vcv7q47efruiNsd4PJblGoJj2Pw6Kcm3+++OyQsLPtXanT0lc3sMygiyZ +2qhCsAMa9UQ9qFbt0tFz3w==dnQualifier=6eat8r33US71avuQEojmH\+bjk84=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org7MIIEezCCA2OgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBijEUMBIGA1UEChMLZXhh bXBsZS5vcmcxFDASBgNVBAsTC2V4YW1wbGUub3JnMTUwMwYDVQQDFCwuc21wdGUt NDMwLTIuSU5URVJNRURJQVRFLk5PVF9GT1JfUFJPRFVDVElPTjElMCMGA1UELhMc NmVhdDhyMzNVUzcxYXZ1UUVvam1IK2Jqazg0PTAeFw0xNTA2MDUxMzIwMDhaFw0y -- cgit v1.2.3