From 5e6905bb7f1c80e5cc368bb917f6e15afc73a269 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Tue, 17 Mar 2015 10:59:25 +0200
Subject: [PATCH] Replace static usage of AES_CTR with current encryption
 algorithm.

---
 .../example_key_management_plugin.cc                   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugin/example_key_management_plugin/example_key_management_plugin.cc b/plugin/example_key_management_plugin/example_key_management_plugin.cc
index f590fbb55b8..580e9ea7091 100644
--- a/plugin/example_key_management_plugin/example_key_management_plugin.cc
+++ b/plugin/example_key_management_plugin/example_key_management_plugin.cc
@@ -6,6 +6,7 @@
 #include <mysql/plugin_encryption_key_management.h>
 #include <my_md5.h>
 #include <my_rnd.h>
+#include "sql_class.h"
 
 /* rotate key randomly between 45 and 90 seconds */
 #define KEY_ROTATION_MIN 45
@@ -80,7 +81,14 @@ static int example_key_management_plugin_init(void *p)
   my_rnd_init(&seed, time(0), 0);
   get_latest_key_version();
 
-  my_aes_init_dynamic_encrypt(MY_AES_ALGORITHM_CTR);
+  if (current_aes_dynamic_method == MY_AES_ALGORITHM_NONE)
+  {
+    sql_print_error("No encryption method choosen with --encryption-algorithm. "
+                    "example_key_management_plugin disabled");
+    return 1;
+  }
+
+  my_aes_init_dynamic_encrypt(current_aes_dynamic_method);
 
   pthread_mutex_init(&mutex, NULL);