Bump asdcplib to dcpomatic-2.13.0 branch.v1.9.4

24 files changed, 53 insertions, 52 deletions

diff --git a/test/mca_test.cc b/test/mca_test.cc
index bdfc9484..1cd95732 100644
--- a/test/mca_test.cc
+++ b/test/mca_test.cc
@@ -168,7 +168,8 @@ check_mca_descriptors(int suffix, vector<dcp::Channel> extra_active_channels, ve
 
 	/* Check MXF */
 
-	auto reader = new ASDCP::PCM::MXFReader();
+	Kumu::FileReaderFactory factory;
+	auto reader = new ASDCP::PCM::MXFReader(factory);
 	reader->OpenRead(boost::filesystem::path(dir / "mxf.mxf").string());
 
 	list<ASDCP::MXF::InterchangeObject*> channels;
diff --git a/test/ref/DCP/dcp_test1/audio.mxf b/test/ref/DCP/dcp_test1/audio.mxf
index 5e08f74f..1f5f7987 100644
--- a/test/ref/DCP/dcp_test1/audio.mxf
+++ b/test/ref/DCP/dcp_test1/audio.mxf
diff --git a/test/ref/DCP/dcp_test1/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml b/test/ref/DCP/dcp_test1/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
index b239661b..26d41070 100644
--- a/test/ref/DCP/dcp_test1/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
+++ b/test/ref/DCP/dcp_test1/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
@@ -37,7 +37,7 @@
           <IntrinsicDuration>24</IntrinsicDuration>
           <EntryPoint>0</EntryPoint>
           <Duration>24</Duration>
-          <Hash>7a4KZ9j2kpSuBz+iBQD4f03ctm8=</Hash>
+          <Hash>vsVjRV9vhTBPUWfE/TT1o2vdQsI=</Hash>
           <FrameRate>24 1</FrameRate>
           <ScreenAspectRatio>1998 1080</ScreenAspectRatio>
         </MainPicture>
@@ -47,7 +47,7 @@
           <IntrinsicDuration>24</IntrinsicDuration>
           <EntryPoint>0</EntryPoint>
           <Duration>24</Duration>
-          <Hash>KcJb7S2K5cNm8RG4kfQD5FTeS0A=</Hash>
+          <Hash>3M7YTgvFKXXMEGLkIbV4miC90FE=</Hash>
         </MainSound>
         <meta:CompositionMetadataAsset xmlns:meta="http://www.smpte-ra.org/schemas/429-16/2014/CPL-Metadata">
           <Id>urn:uuid:dd015243-ab77-435c-a13d-690566885121</Id>
diff --git a/test/ref/DCP/dcp_test1/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml b/test/ref/DCP/dcp_test1/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml
index 71cae6ff..6a1392f3 100644
--- a/test/ref/DCP/dcp_test1/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml
+++ b/test/ref/DCP/dcp_test1/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml
@@ -9,7 +9,7 @@
     <Asset>
       <Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab</Id>
       <AnnotationText>6affb8ee-0020-4dff-a53c-17652f6358ab</AnnotationText>
-      <Hash>2DSYFM8X5sGdsYgzhs3mBbTNNmw=</Hash>
+      <Hash>skI+5b/9LA/y6h0mcyxysJYanxI=</Hash>
       <Size>8559</Size>
       <Type>text/xml</Type>
       <OriginalFileName>cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml</OriginalFileName>
@@ -17,7 +17,7 @@
     <Asset>
       <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
       <AnnotationText>5407b210-4441-4e97-8b16-8bdc7c12da54</AnnotationText>
-      <Hash>7a4KZ9j2kpSuBz+iBQD4f03ctm8=</Hash>
+      <Hash>vsVjRV9vhTBPUWfE/TT1o2vdQsI=</Hash>
       <Size>31648</Size>
       <Type>application/mxf</Type>
       <OriginalFileName>video.mxf</OriginalFileName>
@@ -25,7 +25,7 @@
     <Asset>
       <Id>urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa</Id>
       <AnnotationText>97f0f352-5b77-48ee-a558-9df37717f4fa</AnnotationText>
-      <Hash>KcJb7S2K5cNm8RG4kfQD5FTeS0A=</Hash>
+      <Hash>3M7YTgvFKXXMEGLkIbV4miC90FE=</Hash>
       <Size>881326</Size>
       <Type>application/mxf</Type>
       <OriginalFileName>audio.mxf</OriginalFileName>
diff --git a/test/ref/DCP/dcp_test1/video.mxf b/test/ref/DCP/dcp_test1/video.mxf
index eac7acea..cd0e43af 100644
--- a/test/ref/DCP/dcp_test1/video.mxf
+++ b/test/ref/DCP/dcp_test1/video.mxf
diff --git a/test/ref/DCP/dcp_test2/audio.mxf b/test/ref/DCP/dcp_test2/audio.mxf
index e8bd446f..6a95baf3 100644
--- a/test/ref/DCP/dcp_test2/audio.mxf
+++ b/test/ref/DCP/dcp_test2/audio.mxf
diff --git a/test/ref/DCP/dcp_test2/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml b/test/ref/DCP/dcp_test2/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
index 52a7779a..0e233325 100644
--- a/test/ref/DCP/dcp_test2/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
+++ b/test/ref/DCP/dcp_test2/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
@@ -22,7 +22,7 @@
           <IntrinsicDuration>24</IntrinsicDuration>
           <EntryPoint>0</EntryPoint>
           <Duration>24</Duration>
-          <Hash>NzWhEbTccUIh1sSXIbU+8POVui0=</Hash>
+          <Hash>X+4lOvviLTQeP28hyzhCOGjraiE=</Hash>
         </MainSound>
         <msp-cpl:MainStereoscopicPicture xmlns:msp-cpl="http://www.smpte-ra.org/schemas/429-10/2008/Main-Stereo-Picture-CPL">
           <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
@@ -30,7 +30,7 @@
           <IntrinsicDuration>24</IntrinsicDuration>
           <EntryPoint>0</EntryPoint>
           <Duration>24</Duration>
-          <Hash>BUpeFS6X9j+X0z2TZWSsLMT4pE0=</Hash>
+          <Hash>dU+tcR6bZ5BQ/TXKtBY03ejjUmc=</Hash>
           <FrameRate>48 1</FrameRate>
           <ScreenAspectRatio>1998 1080</ScreenAspectRatio>
         </msp-cpl:MainStereoscopicPicture>
diff --git a/test/ref/DCP/dcp_test2/pkl_8577c7c0-be29-4eb5-a449-1e3870a42bbd.xml b/test/ref/DCP/dcp_test2/pkl_8577c7c0-be29-4eb5-a449-1e3870a42bbd.xml
index 061e8a6a..794cfb85 100644
--- a/test/ref/DCP/dcp_test2/pkl_8577c7c0-be29-4eb5-a449-1e3870a42bbd.xml
+++ b/test/ref/DCP/dcp_test2/pkl_8577c7c0-be29-4eb5-a449-1e3870a42bbd.xml
@@ -9,7 +9,7 @@
     <Asset>
       <Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab</Id>
       <AnnotationText>6affb8ee-0020-4dff-a53c-17652f6358ab</AnnotationText>
-      <Hash>zaAcrAcv0oOzOa3etTP6xDfzQko=</Hash>
+      <Hash>2jp5+JDLOh5CqzQ8goZTzBEWsPo=</Hash>
       <Size>1686</Size>
       <Type>text/xml</Type>
       <OriginalFileName>cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml</OriginalFileName>
@@ -17,7 +17,7 @@
     <Asset>
       <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
       <AnnotationText>5407b210-4441-4e97-8b16-8bdc7c12da54</AnnotationText>
-      <Hash>BUpeFS6X9j+X0z2TZWSsLMT4pE0=</Hash>
+      <Hash>dU+tcR6bZ5BQ/TXKtBY03ejjUmc=</Hash>
       <Size>63160</Size>
       <Type>application/mxf</Type>
       <OriginalFileName>video.mxf</OriginalFileName>
@@ -25,7 +25,7 @@
     <Asset>
       <Id>urn:uuid:fc843acc-1ad9-4808-b9ed-33f5319e047d</Id>
       <AnnotationText>fc843acc-1ad9-4808-b9ed-33f5319e047d</AnnotationText>
-      <Hash>NzWhEbTccUIh1sSXIbU+8POVui0=</Hash>
+      <Hash>X+4lOvviLTQeP28hyzhCOGjraiE=</Hash>
       <Size>161326</Size>
       <Type>application/mxf</Type>
       <OriginalFileName>audio.mxf</OriginalFileName>
diff --git a/test/ref/DCP/dcp_test2/video.mxf b/test/ref/DCP/dcp_test2/video.mxf
index 3b670708..6200297c 100644
--- a/test/ref/DCP/dcp_test2/video.mxf
+++ b/test/ref/DCP/dcp_test2/video.mxf
diff --git a/test/ref/DCP/dcp_test5/audio.mxf b/test/ref/DCP/dcp_test5/audio.mxf
index 947865e1..fc55b975 100644
--- a/test/ref/DCP/dcp_test5/audio.mxf
+++ b/test/ref/DCP/dcp_test5/audio.mxf
diff --git a/test/ref/DCP/dcp_test5/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml b/test/ref/DCP/dcp_test5/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
index 5fa3643b..0dbd0198 100644
--- a/test/ref/DCP/dcp_test5/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
+++ b/test/ref/DCP/dcp_test5/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
@@ -22,7 +22,7 @@
           <IntrinsicDuration>24</IntrinsicDuration>
           <EntryPoint>0</EntryPoint>
           <Duration>24</Duration>
-          <Hash>o3VmpdFsNUgF11oadcaGJ/IfO0M=</Hash>
+          <Hash>w7xIWU3Q+QnEQMq7BcOhsWO+OU0=</Hash>
           <FrameRate>24 1</FrameRate>
           <ScreenAspectRatio>1998 1080</ScreenAspectRatio>
         </MainPicture>
@@ -32,7 +32,7 @@
           <IntrinsicDuration>24</IntrinsicDuration>
           <EntryPoint>0</EntryPoint>
           <Duration>24</Duration>
-          <Hash>l+XLgxe2fMZDgY+0QYzDfGhvTQM=</Hash>
+          <Hash>5ANfi1KoyGiZ8hQIhDHm5f/OvQY=</Hash>
         </MainSound>
         <axd:AuxData xmlns:axd="http://www.dolby.com/schemas/2012/AD">
           <Id>urn:uuid:b68febcc-5ddf-489a-84a7-924f29fa2afd</Id>
diff --git a/test/ref/DCP/dcp_test5/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml b/test/ref/DCP/dcp_test5/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml
index 49fd579b..e9b1e802 100644
--- a/test/ref/DCP/dcp_test5/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml
+++ b/test/ref/DCP/dcp_test5/pkl_d76fdaaf-8316-42dc-a87e-1719ad6ca3ca.xml
@@ -9,7 +9,7 @@
     <Asset>
       <Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab</Id>
       <AnnotationText>6affb8ee-0020-4dff-a53c-17652f6358ab</AnnotationText>
-      <Hash>eqEIVxSAbJL+SROmqrDHbr9sb+A=</Hash>
+      <Hash>4zHV3/AhGYo5WjNmyuxeRSPOVwk=</Hash>
       <Size>2024</Size>
       <Type>text/xml</Type>
       <OriginalFileName>cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml</OriginalFileName>
@@ -17,7 +17,7 @@
     <Asset>
       <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
       <AnnotationText>5407b210-4441-4e97-8b16-8bdc7c12da54</AnnotationText>
-      <Hash>o3VmpdFsNUgF11oadcaGJ/IfO0M=</Hash>
+      <Hash>w7xIWU3Q+QnEQMq7BcOhsWO+OU0=</Hash>
       <Size>40144</Size>
       <Type>application/mxf</Type>
       <OriginalFileName>video.mxf</OriginalFileName>
@@ -25,7 +25,7 @@
     <Asset>
       <Id>urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa</Id>
       <AnnotationText>97f0f352-5b77-48ee-a558-9df37717f4fa</AnnotationText>
-      <Hash>l+XLgxe2fMZDgY+0QYzDfGhvTQM=</Hash>
+      <Hash>5ANfi1KoyGiZ8hQIhDHm5f/OvQY=</Hash>
       <Size>161326</Size>
       <Type>application/mxf</Type>
       <OriginalFileName>audio.mxf</OriginalFileName>
diff --git a/test/ref/DCP/dcp_test5/video.mxf b/test/ref/DCP/dcp_test5/video.mxf
index f3e7588b..3ec65a51 100644
--- a/test/ref/DCP/dcp_test5/video.mxf
+++ b/test/ref/DCP/dcp_test5/video.mxf
diff --git a/test/ref/DCP/dcp_test7/audio.mxf b/test/ref/DCP/dcp_test7/audio.mxf
index 5e08f74f..1f5f7987 100644
--- a/test/ref/DCP/dcp_test7/audio.mxf
+++ b/test/ref/DCP/dcp_test7/audio.mxf
diff --git a/test/ref/DCP/dcp_test7/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml b/test/ref/DCP/dcp_test7/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
index 42f09109..13aecd8a 100644
--- a/test/ref/DCP/dcp_test7/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
+++ b/test/ref/DCP/dcp_test7/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
@@ -37,7 +37,7 @@
           <IntrinsicDuration>24</IntrinsicDuration>
           <EntryPoint>0</EntryPoint>
           <Duration>24</Duration>
-          <Hash>7a4KZ9j2kpSuBz+iBQD4f03ctm8=</Hash>
+          <Hash>vsVjRV9vhTBPUWfE/TT1o2vdQsI=</Hash>
           <FrameRate>24 1</FrameRate>
           <ScreenAspectRatio>1.85</ScreenAspectRatio>
         </MainPicture>
@@ -47,7 +47,7 @@
           <IntrinsicDuration>24</IntrinsicDuration>
           <EntryPoint>0</EntryPoint>
           <Duration>24</Duration>
-          <Hash>KcJb7S2K5cNm8RG4kfQD5FTeS0A=</Hash>
+          <Hash>3M7YTgvFKXXMEGLkIbV4miC90FE=</Hash>
         </MainSound>
       </AssetList>
     </Reel>
diff --git a/test/ref/DCP/dcp_test7/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml b/test/ref/DCP/dcp_test7/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml
index f4eea4ee..9d251109 100644
--- a/test/ref/DCP/dcp_test7/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml
+++ b/test/ref/DCP/dcp_test7/pkl_d199d58b-5ef8-4d49-b270-07e590ccb280.xml
@@ -9,7 +9,7 @@
     <Asset>
       <Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab</Id>
       <AnnotationText>6affb8ee-0020-4dff-a53c-17652f6358ab</AnnotationText>
-      <Hash>z9r7fpZ4wf0GbiliDzpfKQvFkmo=</Hash>
+      <Hash>SgCEvehTaji0MCWOJTVioOcNndY=</Hash>
       <Size>1965</Size>
       <Type>text/xml;asdcpKind=CPL</Type>
       <OriginalFileName>cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml</OriginalFileName>
@@ -17,7 +17,7 @@
     <Asset>
       <Id>urn:uuid:5407b210-4441-4e97-8b16-8bdc7c12da54</Id>
       <AnnotationText>5407b210-4441-4e97-8b16-8bdc7c12da54</AnnotationText>
-      <Hash>7a4KZ9j2kpSuBz+iBQD4f03ctm8=</Hash>
+      <Hash>vsVjRV9vhTBPUWfE/TT1o2vdQsI=</Hash>
       <Size>31648</Size>
       <Type>application/x-smpte-mxf;asdcpKind=Picture</Type>
       <OriginalFileName>video.mxf</OriginalFileName>
@@ -25,7 +25,7 @@
     <Asset>
       <Id>urn:uuid:97f0f352-5b77-48ee-a558-9df37717f4fa</Id>
       <AnnotationText>97f0f352-5b77-48ee-a558-9df37717f4fa</AnnotationText>
-      <Hash>KcJb7S2K5cNm8RG4kfQD5FTeS0A=</Hash>
+      <Hash>3M7YTgvFKXXMEGLkIbV4miC90FE=</Hash>
       <Size>881326</Size>
       <Type>application/x-smpte-mxf;asdcpKind=Sound</Type>
       <OriginalFileName>audio.mxf</OriginalFileName>
diff --git a/test/ref/DCP/dcp_test7/video.mxf b/test/ref/DCP/dcp_test7/video.mxf
index eac7acea..cd0e43af 100644
--- a/test/ref/DCP/dcp_test7/video.mxf
+++ b/test/ref/DCP/dcp_test7/video.mxf
diff --git a/test/ref/DCP/encryption_test/audio.mxf b/test/ref/DCP/encryption_test/audio.mxf
index a4f89ae9..505b7f13 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_6affb8ee-0020-4dff-a53c-17652f6358ab.xml b/test/ref/DCP/encryption_test/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
index e8e24467..6203c884 100644
--- a/test/ref/DCP/encryption_test/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
+++ b/test/ref/DCP/encryption_test/cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml
@@ -23,7 +23,7 @@
           <EntryPoint>0</EntryPoint>
           <Duration>24</Duration>
           <KeyId>urn:uuid:ac8d301c-e5d9-4343-b6f3-ba2668adbe56</KeyId>
-          <Hash>AVtX8wz76uG2Uw0Qbc9+DKnHUfw=</Hash>
+          <Hash>Q0GMntXvEqVQsiv+YkfhMrXdw0w=</Hash>
           <FrameRate>24 1</FrameRate>
           <ScreenAspectRatio>1998 1080</ScreenAspectRatio>
         </MainPicture>
@@ -34,7 +34,7 @@
           <EntryPoint>0</EntryPoint>
           <Duration>24</Duration>
           <KeyId>urn:uuid:7ab6c77b-6648-44b9-8549-a5290ada6238</KeyId>
-          <Hash>3o02UpYqrl6w0NQbFvrB2tKxaIk=</Hash>
+          <Hash>v0SCdh2xnKNzGC7Sk5pS2q5Q/wQ=</Hash>
         </MainSound>
       </AssetList>
     </Reel>
@@ -57,15 +57,15 @@
           <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>X3YkODMLyEJsAz5v3S/uT+xDD7c=</dsig:DigestValue>
+        <dsig:DigestValue>DBBENxFb5Qv377fb86n0KgUQ7go=</dsig:DigestValue>
       </dsig:Reference>
     </dsig:SignedInfo>
-    <dsig:SignatureValue>jH02vGxlTTi9T94KCIfMkafmdO0wluP9cvh+u5HyYoZo/D7O1Ki202t5uHRp0wcu
-OfBFuu1Hw3Ooy/VEa2l4l/UDfE7lI+D79e0VfA8HwFB+c21GF7Q2FRV5ddu9ODgz
-rk6kC5fZSLxc7cpK6jPNnT285O3nHfjk6MQ0fgGfNbvMefgeEWVKj8qcyFgN6H4e
-wr1omcjbdw/HVQaOW84//pBRSRdMJGe1u2iUE2RwxBLzP4BepzkMv9Asm6uDo1YG
-X1d60g2aCUdxAg9fjyTaOss1nRp1YdPlb3SHUhKXgTT/eAPkmmr7bs3jJtp2BN9U
-4Izz2GR/3Uyf0NP20mZgNQ==</dsig:SignatureValue>
+    <dsig:SignatureValue>rhF1QacGUhxm1jfcgyBjAo2BmD4QxBl7c6Bzt8rjXXhR+NVT4ITeyxi39+94WwBx
+Yp8iQhF46bE2QGZAr+HnZZJGVG3ajeaQ4uvPp2KRC8sHpBlZ2rGGtyjXAflYjepw
+c1cLvRoAKbxOMW+ESxjyYOKgT0Bke0GhbzZ8+w+hGZLHxK9oTokIG9YDnRNUKN5W
+n6avbxuaT8wtZgVwD4qfKzMeJlYW3yDFo/2apQA5K+oCj/gfrS1habYqBoNo9kO1
+fWkQ7LIeRrYuzNlr5K4e/LyIm7SHwb9EGcA7K8WbDrHKvaJmTs/T01QhU9f+huk2
+ZGJMMCGHhiwcbVtqVhgJSQ==</dsig:SignatureValue>
     <dsig:KeyInfo>
       <dsig:X509Data>
         <dsig:X509IssuerSerial>
diff --git a/test/ref/DCP/encryption_test/pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.xml b/test/ref/DCP/encryption_test/pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.xml
index 4d49b259..fb0313ab 100644
--- a/test/ref/DCP/encryption_test/pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.xml
+++ b/test/ref/DCP/encryption_test/pkl_5203f3d4-9d62-4062-8bf1-7a114eff99df.xml
@@ -9,7 +9,7 @@
     <Asset>
       <Id>urn:uuid:6affb8ee-0020-4dff-a53c-17652f6358ab</Id>
       <AnnotationText>6affb8ee-0020-4dff-a53c-17652f6358ab</AnnotationText>
-      <Hash>Zd9zaFAGx/4W2B3vSZkAqTzcDZ0=</Hash>
+      <Hash>sLWF9OcgdkvBUH1VcNiwseLA3sA=</Hash>
       <Size>9226</Size>
       <Type>text/xml</Type>
       <OriginalFileName>cpl_6affb8ee-0020-4dff-a53c-17652f6358ab.xml</OriginalFileName>
@@ -17,7 +17,7 @@
     <Asset>
       <Id>urn:uuid:9a7fbb03-4078-4944-90b1-0d8a21c9d793</Id>
       <AnnotationText>9a7fbb03-4078-4944-90b1-0d8a21c9d793</AnnotationText>
-      <Hash>AVtX8wz76uG2Uw0Qbc9+DKnHUfw=</Hash>
+      <Hash>Q0GMntXvEqVQsiv+YkfhMrXdw0w=</Hash>
       <Size>44008</Size>
       <Type>application/mxf</Type>
       <OriginalFileName>video.mxf</OriginalFileName>
@@ -25,7 +25,7 @@
     <Asset>
       <Id>urn:uuid:ce300880-a425-40a6-adac-eb1e3f5643fc</Id>
       <AnnotationText>ce300880-a425-40a6-adac-eb1e3f5643fc</AnnotationText>
-      <Hash>3o02UpYqrl6w0NQbFvrB2tKxaIk=</Hash>
+      <Hash>v0SCdh2xnKNzGC7Sk5pS2q5Q/wQ=</Hash>
       <Size>165454</Size>
       <Type>application/mxf</Type>
       <OriginalFileName>audio.mxf</OriginalFileName>
@@ -49,15 +49,15 @@
           <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>0F1ZXfoRDPIQHlRG0MC1uXkahG8=</dsig:DigestValue>
+        <dsig:DigestValue>OU1UpJxBmpxK8SE5yfe8aJsqoIw=</dsig:DigestValue>
       </dsig:Reference>
     </dsig:SignedInfo>
-    <dsig:SignatureValue>u98MLscN/Fn3YxGFMw6kP7fIWUj05FPxQvIYvsIpP68UP3FX9rdP6nh3Olyv194d
-A1fQJu4ZamTcYN2O2E5vdGjxxHlPNXfFPckWc9Sy1i3V8u+EFdOggjMY4snvPot6
-kMyzAICuKzTJs4l+O/BzJAJSFSxrEtBCYEFxrtyKntDxSUE7ePSqPwcim6+5BzDO
-QOsIp3wjJHlp7u4QqU3knIiaM7SibIXqtIBF7TOrChWZjFImKePNib9/DXvnE2WL
-Y+5wJjGhImQR+2U2DDpSCLkl0kVgDrYfKcNg4lXUDZGEKo0Yqz0+1Rszz/DqsC+J
-6mYxqMMvRXeh9pViSpgKaA==</dsig:SignatureValue>
+    <dsig:SignatureValue>ypg6tt5iJi7YEUJQfEQmZeigXzcm2xn/J59tqqYBqwmAch1ia//Khyo6m7/HpQJl
+2Y5swUI8MtmzdV3gj3urd8WuQsDWFLflIHHiIanYE/XCdFZ8lV/nvyCkAaf/AH2V
+W7bWD8/fYXJD2G9a2tRiWTjzfgpsTk+ox+C12Y/SebWAQ97sSLIMwwmQIYK2kTnh
+nbKSuhk+v+V2ObpYl48zXu3za3Yt77rCdcGgPwYr/NUI47ascpnueNw48clDtjp+
+775jeA5ZG5lBR3VGTLwvoOXT3CH/FgG0DPSLmYbRnOzEShVUt7xFgbxMgNTYOGQJ
+3ipS6qmHgWHjX3/fo6isgg==</dsig:SignatureValue>
     <dsig:KeyInfo>
       <dsig:X509Data>
         <dsig:X509IssuerSerial>
diff --git a/test/ref/DCP/encryption_test/video.mxf b/test/ref/DCP/encryption_test/video.mxf
index 2fbfacdd..e6ddbadb 100644
--- a/test/ref/DCP/encryption_test/video.mxf
+++ b/test/ref/DCP/encryption_test/video.mxf
diff --git a/test/test.cc b/test/test.cc
index 6a359aeb..497120d4 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -260,14 +260,14 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
 
 RNGFixer::RNGFixer ()
 {
-	Kumu::cth_test = true;
+	Kumu::dcpomatic_test = true;
 	Kumu::FortunaRNG().Reset();
 }
 
 
 RNGFixer::~RNGFixer ()
 {
-	Kumu::cth_test = false;
+	Kumu::dcpomatic_test = false;
 }
 
 
diff --git a/test/verify_test.cc b/test/verify_test.cc
index b6d0ac1e..34707b1f 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -356,16 +356,16 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_picture_sound_hash)
 	HashCalculator video_calc(video_path);
 	auto mod = fopen(video_path.string().c_str(), "r+b");
 	BOOST_REQUIRE (mod);
-	fseek (mod, 4096, SEEK_SET);
+	BOOST_REQUIRE_EQUAL(fseek(mod, -16, SEEK_END), 0);
 	int x = 42;
-	fwrite (&x, sizeof(x), 1, mod);
+	BOOST_REQUIRE(fwrite(&x, sizeof(x), 1, mod) == 1);
 	fclose (mod);
 
 	auto audio_path = path(dir / "audio.mxf");
 	HashCalculator audio_calc(audio_path);
 	mod = fopen(audio_path.string().c_str(), "r+b");
 	BOOST_REQUIRE (mod);
-	BOOST_REQUIRE_EQUAL (fseek(mod, -64, SEEK_END), 0);
+	BOOST_REQUIRE_EQUAL(fseek(mod, 0, SEEK_END), 0);
 	BOOST_REQUIRE (fwrite (&x, sizeof(x), 1, mod) == 1);
 	fclose (mod);
 
@@ -406,9 +406,9 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_picture_sound_hashes)
 				).set_reference_hash("x" + calc.old_hash()).set_calculated_hash(calc.old_hash()),
 			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_PICTURE_HASHES, canonical(dir / "video.mxf") },
 			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::MISMATCHED_SOUND_HASHES, canonical(dir / "audio.mxf") },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xKcJb7S2K5cNm8RG4kfQD5FTeS0A=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 28 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'x2DSYFM8X5sGdsYgzhs3mBbTNNmw=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 12 },
-			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'x7a4KZ9j2kpSuBz+iBQD4f03ctm8=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 20 },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'x3M7YTgvFKXXMEGLkIbV4miC90FE=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 28 },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xskI+5b/9LA/y6h0mcyxysJYanxI=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 12 },
+			{ dcp::VerificationNote::Type::ERROR, dcp::VerificationNote::Code::INVALID_XML, "value 'xvsVjRV9vhTBPUWfE/TT1o2vdQsI=' is invalid Base64-encoded binary", canonical(dir / dcp_test1_pkl()), 20 },
 		});
 }
 
@@ -1503,7 +1503,7 @@ verify_timed_text_asset_too_large (string name)
 		{ dir },
 		{},
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_SIZE_IN_BYTES, string("121695488"), canonical(dir / "subs.mxf") },
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_SIZE_IN_BYTES, string("121698284"), canonical(dir / "subs.mxf") },
 			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_FONT_SIZE_IN_BYTES, string("121634816"), canonical(dir / "subs.mxf") },
 			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
 			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
diff --git a/test/wscript b/test/wscript
index d2cac0b3..e401f720 100644
--- a/test/wscript
+++ b/test/wscript
@@ -53,7 +53,7 @@ def configure(conf):
 def build(bld):
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'tests'
-    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM BOOST_DATETIME OPENJPEG CXML XMLSEC1 SNDFILE OPENMP ASDCPLIB_CTH LIBXML++ OPENSSL XERCES DL'
+    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM BOOST_DATETIME OPENJPEG CXML XMLSEC1 SNDFILE OPENMP ASDCPLIB_DCPOMATIC LIBXML++ OPENSSL XERCES DL'
     obj.cppflags = ['-fno-inline', '-fno-elide-constructors', '-g', '-O0']
     if bld.env['CXX_NAME'] == 'gcc':
         obj.cppflags.append('-fno-default-inline')
@@ -123,7 +123,7 @@ def build(bld):
 
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'subs_in_out'
-    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_CTH XMLSEC1 OPENSSL DL LIBXML++'
+    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_DCPOMATIC XMLSEC1 OPENSSL DL LIBXML++'
     obj.cppflags = ['-fno-inline', '-fno-elide-constructors', '-g', '-O0']
     if bld.env['CXX_NAME'] == 'gcc':
         obj.cppflags.append('-fno-default-inline')
@@ -140,7 +140,7 @@ def build(bld):
 
     obj = bld(features='cxx cxxprogram')
     obj.name   = 'rewrite_subs'
-    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_CTH XMLSEC1 OPENSSL DL LIBXML++'
+    obj.uselib = 'BOOST_TEST BOOST_FILESYSTEM OPENJPEG CXML OPENMP ASDCPLIB_DCPOMATIC XMLSEC1 OPENSSL DL LIBXML++'
     obj.cppflags = ['-fno-inline', '-fno-elide-constructors', '-g', '-O0']
     if bld.env['CXX_NAME'] == 'gcc':
         obj.cppflags.append('-fno-default-inline')