From 94174b06e653dcf92a940dfb009e525ca62b5204 Mon Sep 17 00:00:00 2001 From: mkaruza Date: Thu, 11 Oct 2018 10:27:34 +0200 Subject: [PATCH] codership/galera-bugs#165 Update to wsrep encryption API Update wsrep-API/v26 submodule. Cleanup. Empty callback handler for encrypt. --- .gitmodules | 5 +---- src/wsrep_provider_v26.cpp | 10 ++++++++++ wsrep | 1 - wsrep-API/v26 | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) delete mode 160000 wsrep diff --git a/.gitmodules b/.gitmodules index 15bedcf..abc7251 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,4 @@ -[submodule "wsrep"] - path = wsrep - url = git@github.com:codership/wsrep-API.git [submodule "wsrep-API/v26"] path = wsrep-API/v26 url = https://github.com/codership/wsrep-API.git - branch = "wsrep-API#20" + branch = master diff --git a/src/wsrep_provider_v26.cpp b/src/wsrep_provider_v26.cpp index 7390292..196aef7 100644 --- a/src/wsrep_provider_v26.cpp +++ b/src/wsrep_provider_v26.cpp @@ -358,6 +358,15 @@ namespace return WSREP_CB_FAILURE; } } + + int encrypt_cb(wsrep_enc_ctx_t* /*ctx*/, + const wsrep_buf_t* /*input*/, + void* /*output*/, + wsrep_enc_direction_t /*direction*/, + bool /*final*/) + { + return WSREP_CB_SUCCESS; + } wsrep_cb_status_t apply_cb(void* ctx, const wsrep_ws_handle_t* wsh, @@ -497,6 +506,7 @@ wsrep::wsrep_provider_v26::wsrep_provider_v26( init_args.connected_cb = &connected_cb; init_args.view_cb = &view_cb; init_args.sst_request_cb = &sst_request_cb; + init_args.encrypt_cb = &encrypt_cb; init_args.apply_cb = &apply_cb; init_args.unordered_cb = 0; init_args.sst_donate_cb = &sst_donate_cb; diff --git a/wsrep b/wsrep deleted file mode 160000 index eb7d6b8..0000000 --- a/wsrep +++ /dev/null @@ -1 +0,0 @@ -Subproject commit eb7d6b8dd1f53006bdc69e451b67039836fd3c3a diff --git a/wsrep-API/v26 b/wsrep-API/v26 index a306d72..0c1da9e 160000 --- a/wsrep-API/v26 +++ b/wsrep-API/v26 @@ -1 +1 @@ -Subproject commit a306d72fd930e4cb39cba6308f05ace4584919cf +Subproject commit 0c1da9e7c04aebf00084f3e3e3855ec5fe635c21