X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcrypto.cc;h=777969c10969f94eec205a84a6d59bf8a8d27e33;hp=b02a3d34c5959abb959a3c777a806fe569b82bfa;hb=2d4e8c5f69cc694625ad95dcee554499605f823b;hpb=3526252ff2fd80a459c72ab1c55ea5a6ee61aa2f

diff --git a/src/lib/crypto.cc b/src/lib/crypto.cc
index b02a3d34c..777969c10 100644
--- 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,46 +30,49 @@
 #include <openssl/rand.h>
 #include <boost/scoped_array.hpp>
 
+
 using std::string;
-using boost::shared_array;
 using namespace dcpomatic;
 
+
 /** The cipher that this code uses */
 #define CIPHER EVP_aes_256_cbc()
 
-dcp::Data
+
+dcp::ArrayData
 dcpomatic::random_iv ()
 {
 	EVP_CIPHER const * cipher = CIPHER;
-	dcp::Data iv (EVP_CIPHER_iv_length(cipher));
-	RAND_bytes (iv.data().get(), iv.size());
+	dcp::ArrayData iv (EVP_CIPHER_iv_length(cipher));
+	RAND_bytes (iv.data(), iv.size());
 	return iv;
 }
-	
-dcp::Data
-dcpomatic::encrypt (string plaintext, dcp::Data key, dcp::Data 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");
 	}
 
-	int r = EVP_EncryptInit_ex (ctx, CIPHER, 0, key.data().get(), iv.data().get());
+	int r = EVP_EncryptInit_ex (ctx, CIPHER, 0, key.data(), iv.data());
 	if (r != 1) {
 		throw CryptoError ("could not initialise cipher context for encryption");
 	}
 
-	dcp::Data ciphertext (plaintext.size() * 2);
+	dcp::ArrayData ciphertext (plaintext.size() * 2);
 
 	int len;
-	r = EVP_EncryptUpdate (ctx, ciphertext.data().get(), &len, (uint8_t const *) plaintext.c_str(), plaintext.size());
+	r = EVP_EncryptUpdate (ctx, ciphertext.data(), &len, (uint8_t const *) plaintext.c_str(), plaintext.size());
 	if (r != 1) {
 		throw CryptoError ("could not encrypt data");
 	}
 
 	int ciphertext_len = len;
 
-	r = EVP_EncryptFinal_ex (ctx, ciphertext.data().get() + len, &len);
+	r = EVP_EncryptFinal_ex (ctx, ciphertext.data() + len, &len);
 	if (r != 1) {
 		throw CryptoError ("could not finish encryption");
 	}
@@ -79,43 +84,45 @@ dcpomatic::encrypt (string plaintext, dcp::Data key, dcp::Data iv)
 	return ciphertext;
 }
 
+
 string
-dcpomatic::decrypt (dcp::Data ciphertext, dcp::Data key, dcp::Data iv)
+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");
 	}
 
-	int r = EVP_DecryptInit_ex (ctx, CIPHER, 0, key.data().get(), iv.data().get());
+	int r = EVP_DecryptInit_ex (ctx, CIPHER, 0, key.data(), iv.data());
 	if (r != 1) {
 		throw CryptoError ("could not initialise cipher context for decryption");
 	}
 
-	dcp::Data plaintext (ciphertext.size() * 2);
+	dcp::ArrayData plaintext (ciphertext.size() * 2);
 
 	int len;
-	r = EVP_DecryptUpdate (ctx, plaintext.data().get(), &len, ciphertext.data().get(), ciphertext.size());
+	r = EVP_DecryptUpdate (ctx, plaintext.data(), &len, ciphertext.data(), ciphertext.size());
 	if (r != 1) {
 		throw CryptoError ("could not decrypt data");
 	}
 
 	int plaintext_len = len;
-	
-	r = EVP_DecryptFinal_ex (ctx, plaintext.data().get() + len, &len);
+
+	r = EVP_DecryptFinal_ex (ctx, plaintext.data() + len, &len);
 	if (r != 1) {
 		throw CryptoError ("could not finish decryption");
 	}
 
 	plaintext_len += len;
 	plaintext.set_size (plaintext_len + 1);
-	plaintext.data().get()[plaintext_len] = '\0';
+	plaintext.data()[plaintext_len] = '\0';
 
 	EVP_CIPHER_CTX_free (ctx);
 
-	return string ((char *) plaintext.data().get());
+	return string ((char *) plaintext.data());
 }
 
+
 int
 dcpomatic::crypto_key_length ()
 {