projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge EncryptionContext with DecryptionContext and use HMAC when decrypting.
[libdcp.git]
/
src
/
atmos_asset_writer.cc
diff --git
a/src/atmos_asset_writer.cc
b/src/atmos_asset_writer.cc
index 60529a2c6398d3b1b0b426ed5e0c157db036d9a7..07d310f65867bd78e1918e4cbe8bd8adb6ca307d 100644
(file)
--- a/
src/atmos_asset_writer.cc
+++ b/
src/atmos_asset_writer.cc
@@
-36,7
+36,7
@@
#include "exceptions.h"
#include "dcp_assert.h"
#include "compose.hpp"
#include "exceptions.h"
#include "dcp_assert.h"
#include "compose.hpp"
-#include "
encryption
_context.h"
+#include "
crypto
_context.h"
#include <asdcp/AS_DCP.h>
using std::min;
#include <asdcp/AS_DCP.h>
using std::min;
@@
-89,7
+89,7
@@
AtmosAssetWriter::write (uint8_t const * data, int size)
_state->frame_buffer.Size (size);
memcpy (_state->frame_buffer.Data(), data, size);
_state->frame_buffer.Size (size);
memcpy (_state->frame_buffer.Data(), data, size);
- ASDCP::Result_t const r = _state->mxf_writer.WriteFrame (_state->frame_buffer, _
encryption_context->encryption(), _encryption
_context->hmac());
+ ASDCP::Result_t const r = _state->mxf_writer.WriteFrame (_state->frame_buffer, _
crypto_context->context(), _crypto
_context->hmac());
if (ASDCP_FAILURE (r)) {
boost::throw_exception (MiscError (String::compose ("could not write atmos MXF frame (%1)", int (r))));
}
if (ASDCP_FAILURE (r)) {
boost::throw_exception (MiscError (String::compose ("could not write atmos MXF frame (%1)", int (r))));
}