Revert "codership/mariadb-wsrep#27 Galera cache encryption"

This reverts commit 7e9419e811.

dbsim/db_server_service.cpp

@@ -150,14 +150,3 @@ void db::server_service::debug_sync(const char*)
 {
 
 }
-
-int db::server_service::do_crypt(void**                ctx         WSREP_UNUSED,
-                                 wsrep::const_buffer&  key         WSREP_UNUSED,
-                                 const char            (*iv)[32]   WSREP_UNUSED,
-                                 wsrep::const_buffer&  input       WSREP_UNUSED,
-                                 void*                 output      WSREP_UNUSED,
-                                 bool                  encrypt     WSREP_UNUSED,
-                                 bool                  last        WSREP_UNUSED)
-{
-    return -1;
-}

dbsim/db_server_service.hpp

@@ -55,15 +55,6 @@ namespace db
                               enum wsrep::server_state::state) override;
         int wait_committing_transactions(int) override;
         void debug_sync(const char*) override;
-
-        int do_crypt(void**                ctx,
-                     wsrep::const_buffer&  key,
-                     const char            (*iv)[32],
-                     wsrep::const_buffer&  input,
-                     void*                 output,
-                     bool                  encrypt,
-                     bool                  last) override;
-                     
     private:
         db::server& server_;
         wsrep::view logged_view_;

include/wsrep/provider.hpp

@@ -342,8 +342,6 @@ namespace wsrep
         virtual int sst_sent(const wsrep::gtid&, int) = 0;
         virtual int sst_received(const wsrep::gtid&, int) = 0;
 
-        virtual int enc_set_key(const wsrep::const_buffer& key) = 0;
-
         virtual std::vector<status_variable> status() const = 0;
         virtual void reset_status() = 0;
 

include/wsrep/server_service.hpp

@@ -197,6 +197,7 @@ namespace wsrep
                               const wsrep::gtid& gtid,
                               bool bypass) = 0;
 
+
         /**
          * Wait until committing transactions have completed.
          * Prior calling this method the server should have been
@@ -210,16 +211,6 @@ namespace wsrep
          */
         virtual void debug_sync(const char* sync_point) = 0;
 
-        /*
-         * Encrypt/decrypt data
-         */
-        virtual int do_crypt(void**                ctx,
-                             wsrep::const_buffer&  key,
-                             const char            (*iv)[32],
-                             wsrep::const_buffer&  input,
-                             void*                 output,
-                             bool                  encrypt,
-                             bool                  last) = 0;
     };
 }
 

include/wsrep/server_state.hpp

@@ -369,21 +369,6 @@ namespace wsrep
         enum wsrep::provider::status
         wait_for_gtid(const wsrep::gtid&, int timeout) const;
 
-        /**
-         * Set encryption key
-         * 
-         * @param key Encryption key
-         * 
-         * @return Zero on success, non-zero on failure.
-         */
-        int set_encryption_key(std::vector<unsigned char>& key);
-
-        /**
-         * Return encryption key.
-         */
-        const std::vector<unsigned char>& get_encryption_key() const
-        { return encryption_key_; }
-
         /**
          * Perform a causal read in the cluster. After the call returns,
          * all the causally preceding write sets have been committed
@@ -598,7 +583,6 @@ namespace wsrep
             , incoming_address_(incoming_address)
             , address_(address)
             , working_dir_(working_dir)
-            , encryption_key_()
             , max_protocol_version_(max_protocol_version)
             , rollback_mode_(rollback_mode)
             , connected_gtid_()
@@ -680,7 +664,6 @@ namespace wsrep
         std::string incoming_address_;
         std::string address_;
         std::string working_dir_;
-        std::vector<unsigned char> encryption_key_;
         int max_protocol_version_;
         enum rollback_mode rollback_mode_;
         wsrep::gtid connected_gtid_;

src/server_state.cpp

@@ -626,18 +626,6 @@ wsrep::server_state::wait_for_gtid(const wsrep::gtid& gtid, int timeout)
     return provider().wait_for_gtid(gtid, timeout);
 }
 
-int 
-wsrep::server_state::set_encryption_key(std::vector<unsigned char>& key)
-{
-    encryption_key_ = key;
-    if (state_ != s_disconnected)
-    {
-        return provider_->enc_set_key(wsrep::const_buffer(encryption_key_.data(),
-                                                          encryption_key_.size()));
-    }
-    return 0;
-}
-
 std::pair<wsrep::gtid, enum wsrep::provider::status>
 wsrep::server_state::causal_read(int timeout) const
 {

src/wsrep_provider_v26.cpp

@@ -20,7 +20,6 @@
 #include "wsrep_provider_v26.hpp"
 
 #include "wsrep/server_state.hpp"
-#include "wsrep/server_service.hpp"
 #include "wsrep/high_priority_service.hpp"
 #include "wsrep/view.hpp"
 #include "wsrep/exception.hpp"
@@ -422,36 +421,14 @@ namespace
         }
     }
     
-    int encrypt_cb(void*                 app_ctx,
+    wsrep_cb_status_t encrypt_cb(void*                 /* app ctx */,
-                   wsrep_enc_ctx_t*      enc_ctx,
+                                 wsrep_enc_ctx_t*      /*ctx*/,
-                   const wsrep_buf_t*    input,
+                                 const wsrep_buf_t*    /*input*/,
-                   void*                 output,
+                                 void*                 /*output*/,
-                   wsrep_enc_direction_t direction,
+                                 wsrep_enc_direction_t /*direction*/,
-                   bool                  last)
+                                 bool                  /*final*/)
     {
-        assert(app_ctx);
+        return WSREP_CB_SUCCESS;
-        wsrep::server_state& server_state(
-            *static_cast<wsrep::server_state*>(app_ctx));
-
-
-        wsrep::const_buffer key(enc_ctx->key->ptr, enc_ctx->key->len);
-        wsrep::const_buffer in(input->ptr, input->len);
-        try
-        {   
-            return server_state.server_service().do_crypt(&enc_ctx->ctx,
-                                                          key,
-                                                          enc_ctx->iv,
-                                                          in,
-                                                          output,
-                                                          direction == WSREP_ENC,
-                                                          last);
-        }
-        catch (const wsrep::runtime_error& e)
-        {
-            free(enc_ctx->ctx);
-            // Return negative value in case of callback error
-            return -1;
-        }
     }
 
     wsrep_cb_status_t apply_cb(void* ctx,
@@ -605,16 +582,6 @@ wsrep::wsrep_provider_v26::wsrep_provider_v26(
     {
         throw wsrep::runtime_error("Failed to initialize wsrep provider");
     }
-
-    const std::vector<unsigned char>& key = server_state.get_encryption_key();
-    if (key.size())
-    {
-        wsrep::const_buffer const_key(key.data(), key.size());
-        if(enc_set_key(const_key))
-        {
-            throw wsrep::runtime_error("Failed to set encryption key");
-        }
-    }
 }
 
 wsrep::wsrep_provider_v26::~wsrep_provider_v26()
@@ -889,16 +856,6 @@ int wsrep::wsrep_provider_v26::sst_received(const wsrep::gtid& gtid, int err)
     return 0;
 }
 
-int wsrep::wsrep_provider_v26::enc_set_key(const wsrep::const_buffer& key)
-{
-    wsrep_enc_key_t enc_key = {key.data(), key.size()};
-    if (wsrep_->enc_set_key(wsrep_, &enc_key) != WSREP_OK)
-    {
-        return 1;
-    }
-    return 0;
-}
-
 std::vector<wsrep::provider::status_variable>
 wsrep::wsrep_provider_v26::status() const
 {

src/wsrep_provider_v26.hpp

@@ -78,7 +78,7 @@ namespace wsrep
         wsrep::gtid last_committed_gtid() const;
         int sst_sent(const wsrep::gtid&,int);
         int sst_received(const wsrep::gtid& gtid, int);
-        int enc_set_key(const wsrep::const_buffer& key);
+
         std::vector<status_variable> status() const;
         void reset_status();
         std::string options() const;

test/mock_provider.hpp

@@ -252,9 +252,6 @@ namespace wsrep
         int sst_sent(const wsrep::gtid&, int) WSREP_OVERRIDE { return 0; }
         int sst_received(const wsrep::gtid&, int) WSREP_OVERRIDE { return 0; }
 
-        int enc_set_key(const wsrep::const_buffer&) WSREP_OVERRIDE 
-        { return 0; }
-
         std::vector<status_variable> status() const WSREP_OVERRIDE
         {
             return std::vector<status_variable>();

test/mock_server_state.hpp

@@ -190,18 +190,6 @@ namespace wsrep
             }
         }
 
-        int do_crypt(void**                ctx         WSREP_UNUSED,
-                     wsrep::const_buffer&  key         WSREP_UNUSED,
-                     const char            (*iv)[32]   WSREP_UNUSED,
-                     wsrep::const_buffer&  input       WSREP_UNUSED,
-                     void*                 output      WSREP_UNUSED,
-                     bool                  encrypt     WSREP_UNUSED,
-                     bool                  last        WSREP_UNUSED)
-            WSREP_OVERRIDE
-        { 
-            return -1;
-        }
-
         std::string sync_point_enabled_;
         enum sync_point_action
         {