Stop using static initialisation so that dcpomatic::write() can be called more than...

[dcpomatic.git] / src / lib / crypto.cc

diff --git a/src/lib/crypto.cc b/src/lib/crypto.cc
index 494924daad4486587bc7fb3200a900c3776390ec..777969c10969f94eec205a84a6d59bf8a8d27e33 100644 (file)
--- a/src/lib/crypto.cc
+++ b/src/lib/crypto.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,8 +18,10 @@
 
 */
 
+
 /* Based on code from https://wiki.openssl.org/index.php/EVP_Symmetric_Encryption_and_Decryption */
 
+
 #include "crypto.h"
 #include "exceptions.h"
 #include <openssl/conf.h>
@@ -28,12 +30,15 @@
 #include <openssl/rand.h>
 #include <boost/scoped_array.hpp>
 
+
 using std::string;
 using namespace dcpomatic;
 
+
 /** The cipher that this code uses */
 #define CIPHER EVP_aes_256_cbc()
 
+
 dcp::ArrayData
 dcpomatic::random_iv ()
 {
@@ -43,10 +48,11 @@ dcpomatic::random_iv ()
        return iv;
 }
 
+
 dcp::ArrayData
 dcpomatic::encrypt (string plaintext, dcp::ArrayData key, dcp::ArrayData iv)
 {
-       EVP_CIPHER_CTX* ctx = EVP_CIPHER_CTX_new ();
+       auto ctx = EVP_CIPHER_CTX_new ();
        if (!ctx) {
                throw CryptoError ("could not create cipher context");
        }
@@ -78,10 +84,11 @@ dcpomatic::encrypt (string plaintext, dcp::ArrayData key, dcp::ArrayData iv)
        return ciphertext;
 }
 
+
 string
 dcpomatic::decrypt (dcp::ArrayData ciphertext, dcp::ArrayData key, dcp::ArrayData iv)
 {
-       EVP_CIPHER_CTX* ctx = EVP_CIPHER_CTX_new ();
+       auto ctx = EVP_CIPHER_CTX_new ();
        if (!ctx) {
                throw CryptoError ("could not create cipher context");
        }
@@ -115,6 +122,7 @@ dcpomatic::decrypt (dcp::ArrayData ciphertext, dcp::ArrayData key, dcp::ArrayDat
        return string ((char *) plaintext.data());
 }
 
+
 int
 dcpomatic::crypto_key_length ()
 {