Identical key derivation code in XtraDB/InnoDB/Aria

* Extract it into the "encryption_scheme" service.
* Make these engines to use the service, remove duplicate code.
* Change MY_AES_xxx error codes, to return them safely
  from encryption_scheme_encrypt/decrypt without conflicting
  with ENCRYPTION_SCHEME_KEY_INVALID error

2 files changed, 18 insertions, 0 deletions

diff --git a/libservices/CMakeLists.txt b/libservices/CMakeLists.txt
index 1dc472612e6..62181a00aa2 100644
--- a/libservices/CMakeLists.txt
+++ b/libservices/CMakeLists.txt
@@ -29,6 +29,7 @@ SET(MYSQLSERVICES_SOURCES
   my_md5_service.c
   wsrep_service.c
   encryption_service.c
+  encryption_scheme_service.c
   kill_statement_service.c
   logger_service.c)
 
diff --git a/libservices/encryption_scheme_service.c b/libservices/encryption_scheme_service.c
new file mode 100644
index 00000000000..87d85df16b4
--- /dev/null
+++ b/libservices/encryption_scheme_service.c
@@ -0,0 +1,17 @@
+/* Copyright (c) 2015 MariaDB
+
+   This program 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; version 2 of the License.
+
+   This program 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 this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include <service_versions.h>
+SERVICE_VERSION encryption_scheme_service= (void*)VERSION_encryption_scheme;