Missing finalize() in dcpdecryptmxf.

[libdcp.git] / src / asset_writer.cc

diff --git a/src/asset_writer.cc b/src/asset_writer.cc
index c5610e5dd8ccc84f0e0ae42c03a734616bb90324..05d0aa23e252331d21d4e27467db4fd71d5693d8 100644 (file)
--- a/src/asset_writer.cc
+++ b/src/asset_writer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,66 +31,36 @@
     files in the program, then also delete it here.
 */
 
+
 /** @file  src/asset_writer.h
- *  @brief AssetWriter class.
+ *  @brief AssetWriter class
  */
 
+
 #include "asset_writer.h"
-#include "mxf.h"
+#include "crypto_context.h"
 #include "dcp_assert.h"
-#include "AS_DCP.h"
-#include "KM_prng.h"
+#include "mxf.h"
+#include <asdcp/AS_DCP.h>
+#include <asdcp/KM_prng.h>
+
 
 using namespace dcp;
 
+
 /** Create an AssetWriter.
  *  @param mxf MXF that we are writing.
  *  @param file File to write to.
  */
-AssetWriter::AssetWriter (MXF* mxf, boost::filesystem::path file, Standard standard)
+AssetWriter::AssetWriter (MXF* mxf, boost::filesystem::path file)
        : _mxf (mxf)
        , _file (file)
-       , _frames_written (0)
-       , _finalized (false)
-       , _started (false)
-       , _encryption_context (0)
-       , _hmac_context (0)
+       , _crypto_context(new EncryptionContext (mxf->key(), mxf->standard()))
 {
-       if (mxf->key ()) {
-               _encryption_context = new ASDCP::AESEncContext;
-               if (ASDCP_FAILURE (_encryption_context->InitKey (mxf->key()->value ()))) {
-                       throw MiscError ("could not set up encryption context");
-               }
-
-               uint8_t cbc_buffer[ASDCP::CBC_BLOCK_SIZE];
-
-               Kumu::FortunaRNG rng;
-               if (ASDCP_FAILURE (_encryption_context->SetIVec (rng.FillRandom (cbc_buffer, ASDCP::CBC_BLOCK_SIZE)))) {
-                       throw MiscError ("could not set up CBC initialization vector");
-               }
-
-               _hmac_context = new ASDCP::HMACContext;
-
-               ASDCP::LabelSet_t type;
-               if (standard == INTEROP) {
-                       type = ASDCP::LS_MXF_INTEROP;
-               } else {
-                       type = ASDCP::LS_MXF_SMPTE;
-               }
-
-               if (ASDCP_FAILURE (_hmac_context->InitKey (mxf->key()->value(), type))) {
-                       throw MiscError ("could not set up HMAC context");
-               }
-       }
-}
 
-AssetWriter::~AssetWriter ()
-{
-       delete _encryption_context;
-       delete _hmac_context;
 }
 
-/** @return true if anything was written by this writer */
+
 bool
 AssetWriter::finalize ()
 {