Merge EncryptionContext with DecryptionContext and use HMAC when decrypting.

1 files changed, 0 insertions, 64 deletions

diff --git a/src/encryption_context.h b/src/encryption_context.h
deleted file mode 100644
index 68173950..00000000
--- a/src/encryption_context.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
-
-    This file is part of libdcp.
-
-    libdcp is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    libdcp is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
-
-    In addition, as a special exception, the copyright holders give
-    permission to link the code of portions of this program with the
-    OpenSSL library under certain conditions as described in each
-    individual source file, and distribute linked combinations
-    including the two.
-
-    You must obey the GNU General Public License in all respects
-    for all of the code used other than OpenSSL.  If you modify
-    file(s) with this exception, you may extend this exception to your
-    version of the file(s), but you are not obligated to do so.  If you
-    do not wish to do so, delete this exception statement from your
-    version.  If you delete this exception statement from all source
-    files in the program, then also delete it here.
-*/
-
-#include "key.h"
-#include "types.h"
-#include <boost/optional.hpp>
-
-namespace ASDCP {
-	class AESEncContext;
-	class HMACContext;
-}
-
-namespace dcp {
-
-class EncryptionContext
-{
-public:
-	EncryptionContext (boost::optional<Key> key, Standard standard);
-	~EncryptionContext ();
-
-	ASDCP::AESEncContext* encryption () const {
-		return _encryption;
-	}
-
-	ASDCP::HMACContext* hmac () const {
-		return _hmac;
-	}
-
-private:
-	ASDCP::AESEncContext* _encryption;
-	ASDCP::HMACContext* _hmac;
-};
-
-}