diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/config.cc | 1 | ||||
| -rw-r--r-- | src/lib/crypto.cc | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 7f32320df..7364a122c 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -62,7 +62,6 @@ using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; using boost::algorithm::trim; -using boost::shared_array; using dcp::raw_convert; Config* Config::_instance = 0; diff --git a/src/lib/crypto.cc b/src/lib/crypto.cc index b02a3d34c..c67fc27fa 100644 --- a/src/lib/crypto.cc +++ b/src/lib/crypto.cc @@ -29,7 +29,6 @@ #include <boost/scoped_array.hpp> using std::string; -using boost::shared_array; using namespace dcpomatic; /** The cipher that this code uses */ @@ -43,7 +42,7 @@ dcpomatic::random_iv () RAND_bytes (iv.data().get(), iv.size()); return iv; } - + dcp::Data dcpomatic::encrypt (string plaintext, dcp::Data key, dcp::Data iv) { @@ -101,7 +100,7 @@ dcpomatic::decrypt (dcp::Data ciphertext, dcp::Data key, dcp::Data iv) } int plaintext_len = len; - + r = EVP_DecryptFinal_ex (ctx, plaintext.data().get() + len, &len); if (r != 1) { throw CryptoError ("could not finish decryption"); |