From 89e412edd9e60cdd48882e5e478f39e6f4639362 Mon Sep 17 00:00:00 2001 From: Craig Edwards Date: Thu, 3 Oct 2024 00:54:27 +0000 Subject: [PATCH] remove deleted ctors which break older clang and g++ --- src/dpp/dave/cipher_interface.h | 8 +------- src/dpp/dave/openssl_aead_cipher.h | 10 +--------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/dpp/dave/cipher_interface.h b/src/dpp/dave/cipher_interface.h index 67a315f149..ba33bea43b 100755 --- a/src/dpp/dave/cipher_interface.h +++ b/src/dpp/dave/cipher_interface.h @@ -10,16 +10,10 @@ namespace dpp::dave { using const_byte_view = array_view; using byte_view = array_view; -class cipher_interface { +class cipher_interface { // NOLINT public: virtual ~cipher_interface() = default; - cipher_interface() = default; - cipher_interface(cipher_interface&&) = delete; - cipher_interface(cipher_interface&) = delete; - cipher_interface operator=(cipher_interface&&) = delete; - cipher_interface operator=(cipher_interface&) = delete; - virtual bool encrypt(byte_view ciphertextBufferOut, const_byte_view plaintextBuffer, const_byte_view nonceBuffer, const_byte_view additionalData, byte_view tagBufferOut) = 0; virtual bool decrypt(byte_view plaintextBufferOut, const_byte_view ciphertextBuffer, const_byte_view tagBuffer, const_byte_view nonceBuffer, const_byte_view additionalData) = 0; }; diff --git a/src/dpp/dave/openssl_aead_cipher.h b/src/dpp/dave/openssl_aead_cipher.h index c14ffbc141..7f541681a1 100755 --- a/src/dpp/dave/openssl_aead_cipher.h +++ b/src/dpp/dave/openssl_aead_cipher.h @@ -7,18 +7,10 @@ namespace dpp::dave { -class openssl_aead_cipher : public cipher_interface { +class openssl_aead_cipher : public cipher_interface { // NOLINT public: openssl_aead_cipher(const EncryptionKey& encryptionKey); - /** - * Explicitly not copyable - */ - openssl_aead_cipher(openssl_aead_cipher&&) = delete; - openssl_aead_cipher(openssl_aead_cipher&) = delete; - openssl_aead_cipher operator=(openssl_aead_cipher&&) = delete; - openssl_aead_cipher operator=(openssl_aead_cipher&) = delete; - ~openssl_aead_cipher() override; [[nodiscard]] bool inline is_valid() const {