summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-03-09 19:53:47 +0100
committerSergei Golubchik <serg@mariadb.org>2015-04-05 13:14:37 +0200
commit87604c4cadac0c9f86068d7f0075bb3cdeabdf0b (patch)
treeedc66876c461d5f5f8d5a3dc041d50acb5532852
parent16a7738bc98098033fc6e524654a008b9d2830d8 (diff)
downloadmariadb-git-87604c4cadac0c9f86068d7f0075bb3cdeabdf0b.tar.gz
encryption cleanup: delete obsolete files
they should've been deleted long ago, but weren't
-rw-r--r--include/mysql/service_cryptokeys.h60
-rw-r--r--libservices/cryptokeys_service.c17
2 files changed, 0 insertions, 77 deletions
diff --git a/include/mysql/service_cryptokeys.h b/include/mysql/service_cryptokeys.h
deleted file mode 100644
index d5321e2f257..00000000000
--- a/include/mysql/service_cryptokeys.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef MYSQL_SERVICE_CRYPTOKEYS_INCLUDED
-/* 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 */
-
-/**
- @file
- cryptokeys service
-
- Functions get cryptographical keys and IV from the cryptokey management plugin
-*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern struct cryptokeys_service_st {
- unsigned int (*get_latest_crypto_key_version_func)();
- unsigned int (*has_crypto_key_func)(unsigned int);
- unsigned int (*get_crypto_key_size_func)(unsigned int);
- int (*get_crypto_key_func)(unsigned int, unsigned char*, unsigned int);
- int (*get_crypto_iv_func)(unsigned int, unsigned char*, unsigned int);
-} *cryptokeys_service;
-
-#ifdef MYSQL_DYNAMIC_PLUGIN
-
-#define get_latest_crypto_key_version() cryptokeys_service->get_latest_crypto_key_version_func()
-#define has_crypto_key(V) cryptokeys_service->has_crypto_key_func(V)
-#define get_crypto_key_size(V) cryptokeys_service->get_crypto_key_size_func(V)
-#define get_crypto_key(V,K,S) cryptokeys_service->get_crypto_key_func((V), (K), (S))
-#define get_crypto_iv(V, I, S) cryptokeys_service->get_crypto_iv_func((V), (I), (S))
-
-#else
-
-unsigned int get_latest_crypto_key_version();
-unsigned int has_crypto_key(unsigned int version);
-unsigned int get_crypto_key_size(unsigned int version);
-int get_crypto_key(unsigned int version, unsigned char* key, unsigned int keybufsize);
-int get_crypto_iv(unsigned int version, unsigned char* iv, unsigned int ivbufsize);
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#define MYSQL_SERVICE_CRYPTOKEYS_INCLUDED
-#endif
-
diff --git a/libservices/cryptokeys_service.c b/libservices/cryptokeys_service.c
deleted file mode 100644
index 1af64aab450..00000000000
--- a/libservices/cryptokeys_service.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* 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 cryptokeys_service= (void*)VERSION_cryptokeys;