Skip to content

Commit 21430e4

Browse files
vuvovavuvova
committed
encryption keys service
1 parent cf8bf0b commit 21430e4

25 files changed

+245
-44
lines changed

‎include/my_crypt_key_management.h‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎include/mysql/plugin_audit.h.pp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,19 @@
197197
void thd_key_delete(MYSQL_THD_KEY_T *key);
198198
void* thd_getspecific(void* thd, MYSQL_THD_KEY_T key);
199199
int thd_setspecific(void* thd, MYSQL_THD_KEY_T key, void *value);
200+
#include <mysql/service_encryption_keys.h>
201+
extern struct encryption_keys_service_st {
202+
unsigned int (*get_latest_encryption_key_version_func)();
203+
unsigned int (*has_encryption_key_func)(unsigned int);
204+
unsigned int (*get_encryption_key_size_func)(unsigned int);
205+
int (*get_encryption_key_func)(unsigned int, unsigned char*, unsigned int);
206+
int (*get_encryption_iv_func)(unsigned int, unsigned char*, unsigned int);
207+
} *encryption_keys_service;
208+
unsigned int get_latest_encryption_key_version();
209+
unsigned int has_encryption_key(unsigned int version);
210+
unsigned int get_encryption_key_size(unsigned int version);
211+
int get_encryption_key(unsigned int version, unsigned char* key, unsigned int keybufsize);
212+
int get_encryption_iv(unsigned int version, unsigned char* iv, unsigned int ivbufsize);
200213
struct st_mysql_xid {
201214
long formatID;
202215
long gtrid_length;

‎include/mysql/plugin_auth.h.pp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,19 @@
197197
void thd_key_delete(MYSQL_THD_KEY_T *key);
198198
void* thd_getspecific(void* thd, MYSQL_THD_KEY_T key);
199199
int thd_setspecific(void* thd, MYSQL_THD_KEY_T key, void *value);
200+
#include <mysql/service_encryption_keys.h>
201+
extern struct encryption_keys_service_st {
202+
unsigned int (*get_latest_encryption_key_version_func)();
203+
unsigned int (*has_encryption_key_func)(unsigned int);
204+
unsigned int (*get_encryption_key_size_func)(unsigned int);
205+
int (*get_encryption_key_func)(unsigned int, unsigned char*, unsigned int);
206+
int (*get_encryption_iv_func)(unsigned int, unsigned char*, unsigned int);
207+
} *encryption_keys_service;
208+
unsigned int get_latest_encryption_key_version();
209+
unsigned int has_encryption_key(unsigned int version);
210+
unsigned int get_encryption_key_size(unsigned int version);
211+
int get_encryption_key(unsigned int version, unsigned char* key, unsigned int keybufsize);
212+
int get_encryption_iv(unsigned int version, unsigned char* iv, unsigned int ivbufsize);
200213
struct st_mysql_xid {
201214
long formatID;
202215
long gtrid_length;

‎include/mysql/plugin_encryption_key_management.h.pp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,19 @@
197197
void thd_key_delete(MYSQL_THD_KEY_T *key);
198198
void* thd_getspecific(void* thd, MYSQL_THD_KEY_T key);
199199
int thd_setspecific(void* thd, MYSQL_THD_KEY_T key, void *value);
200+
#include <mysql/service_encryption_keys.h>
201+
extern struct encryption_keys_service_st {
202+
unsigned int (*get_latest_encryption_key_version_func)();
203+
unsigned int (*has_encryption_key_func)(unsigned int);
204+
unsigned int (*get_encryption_key_size_func)(unsigned int);
205+
int (*get_encryption_key_func)(unsigned int, unsigned char*, unsigned int);
206+
int (*get_encryption_iv_func)(unsigned int, unsigned char*, unsigned int);
207+
} *encryption_keys_service;
208+
unsigned int get_latest_encryption_key_version();
209+
unsigned int has_encryption_key(unsigned int version);
210+
unsigned int get_encryption_key_size(unsigned int version);
211+
int get_encryption_key(unsigned int version, unsigned char* key, unsigned int keybufsize);
212+
int get_encryption_iv(unsigned int version, unsigned char* iv, unsigned int ivbufsize);
200213
struct st_mysql_xid {
201214
long formatID;
202215
long gtrid_length;

‎include/mysql/plugin_ftparser.h.pp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,19 @@
197197
void thd_key_delete(MYSQL_THD_KEY_T *key);
198198
void* thd_getspecific(void* thd, MYSQL_THD_KEY_T key);
199199
int thd_setspecific(void* thd, MYSQL_THD_KEY_T key, void *value);
200+
#include <mysql/service_encryption_keys.h>
201+
extern struct encryption_keys_service_st {
202+
unsigned int (*get_latest_encryption_key_version_func)();
203+
unsigned int (*has_encryption_key_func)(unsigned int);
204+
unsigned int (*get_encryption_key_size_func)(unsigned int);
205+
int (*get_encryption_key_func)(unsigned int, unsigned char*, unsigned int);
206+
int (*get_encryption_iv_func)(unsigned int, unsigned char*, unsigned int);
207+
} *encryption_keys_service;
208+
unsigned int get_latest_encryption_key_version();
209+
unsigned int has_encryption_key(unsigned int version);
210+
unsigned int get_encryption_key_size(unsigned int version);
211+
int get_encryption_key(unsigned int version, unsigned char* key, unsigned int keybufsize);
212+
int get_encryption_iv(unsigned int version, unsigned char* iv, unsigned int ivbufsize);
200213
struct st_mysql_xid {
201214
long formatID;
202215
long gtrid_length;

‎include/mysql/plugin_password_validation.h.pp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,19 @@
197197
void thd_key_delete(MYSQL_THD_KEY_T *key);
198198
void* thd_getspecific(void* thd, MYSQL_THD_KEY_T key);
199199
int thd_setspecific(void* thd, MYSQL_THD_KEY_T key, void *value);
200+
#include <mysql/service_encryption_keys.h>
201+
extern struct encryption_keys_service_st {
202+
unsigned int (*get_latest_encryption_key_version_func)();
203+
unsigned int (*has_encryption_key_func)(unsigned int);
204+
unsigned int (*get_encryption_key_size_func)(unsigned int);
205+
int (*get_encryption_key_func)(unsigned int, unsigned char*, unsigned int);
206+
int (*get_encryption_iv_func)(unsigned int, unsigned char*, unsigned int);
207+
} *encryption_keys_service;
208+
unsigned int get_latest_encryption_key_version();
209+
unsigned int has_encryption_key(unsigned int version);
210+
unsigned int get_encryption_key_size(unsigned int version);
211+
int get_encryption_key(unsigned int version, unsigned char* key, unsigned int keybufsize);
212+
int get_encryption_iv(unsigned int version, unsigned char* iv, unsigned int ivbufsize);
200213
struct st_mysql_xid {
201214
long formatID;
202215
long gtrid_length;

‎include/mysql/service_cryptokeys.h‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
#ifndef MYSQL_SERVICE_CRYPTOKEYS_INCLUDED
2+
/* Copyright (c) 2015, MariaDB
3+
4+
This program is free software; you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation; version 2 of the License.
7+
8+
This program is distributed in the hope that it will be useful,
9+
but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
GNU General Public License for more details.
12+
13+
You should have received a copy of the GNU General Public License
14+
along with this program; if not, write to the Free Software
15+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
16+
17+
/**
18+
@file
19+
cryptokeys service
20+
21+
Functions get cryptographical keys and IV from the cryptokey management plugin
22+
*/
23+
24+
#ifdef __cplusplus
25+
extern "C" {
26+
#endif
27+
28+
extern struct cryptokeys_service_st {
29+
unsigned int (*get_latest_crypto_key_version_func)();
30+
unsigned int (*has_crypto_key_func)(unsigned int);
31+
unsigned int (*get_crypto_key_size_func)(unsigned int);
32+
int (*get_crypto_key_func)(unsigned int, unsigned char*, unsigned int);
33+
int (*get_crypto_iv_func)(unsigned int, unsigned char*, unsigned int);
34+
} *cryptokeys_service;
35+
36+
#ifdef MYSQL_DYNAMIC_PLUGIN
37+
38+
#define get_latest_crypto_key_version() cryptokeys_service->get_latest_crypto_key_version_func()
39+
#define has_crypto_key(V) cryptokeys_service->has_crypto_key_func(V)
40+
#define get_crypto_key_size(V) cryptokeys_service->get_crypto_key_size_func(V)
41+
#define get_crypto_key(V,K,S) cryptokeys_service->get_crypto_key_func((V), (K), (S))
42+
#define get_crypto_iv(V, I, S) cryptokeys_service->get_crypto_iv_func((V), (I), (S))
43+
44+
#else
45+
46+
unsigned int get_latest_crypto_key_version();
47+
unsigned int has_crypto_key(unsigned int version);
48+
unsigned int get_crypto_key_size(unsigned int version);
49+
int get_crypto_key(unsigned int version, unsigned char* key, unsigned int keybufsize);
50+
int get_crypto_iv(unsigned int version, unsigned char* iv, unsigned int ivbufsize);
51+
52+
#endif
53+
54+
#ifdef __cplusplus
55+
}
56+
#endif
57+
58+
#define MYSQL_SERVICE_CRYPTOKEYS_INCLUDED
59+
#endif
60+

‎include/mysql/service_encryption_keys.h‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
#ifndef MYSQL_SERVICE_ENCRYPTION_KEYS_INCLUDED
2+
/* Copyright (c) 2015, MariaDB
3+
4+
This program is free software; you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation; version 2 of the License.
7+
8+
This program is distributed in the hope that it will be useful,
9+
but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
GNU General Public License for more details.
12+
13+
You should have received a copy of the GNU General Public License
14+
along with this program; if not, write to the Free Software
15+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
16+
17+
/**
18+
@file
19+
encryption keys service
20+
21+
Functions to get encryption keys and IV from the encryption key management plugin
22+
*/
23+
24+
#ifdef __cplusplus
25+
extern "C" {
26+
#endif
27+
28+
extern struct encryption_keys_service_st {
29+
unsigned int (*get_latest_encryption_key_version_func)();
30+
unsigned int (*has_encryption_key_func)(unsigned int);
31+
unsigned int (*get_encryption_key_size_func)(unsigned int);
32+
int (*get_encryption_key_func)(unsigned int, unsigned char*, unsigned int);
33+
int (*get_encryption_iv_func)(unsigned int, unsigned char*, unsigned int);
34+
} *encryption_keys_service;
35+
36+
#ifdef MYSQL_DYNAMIC_PLUGIN
37+
38+
#define get_latest_encryption_key_version() encryption_keys_service->get_latest_encryption_key_version_func()
39+
#define has_encryption_key(V) encryption_keys_service->has_encryption_key_func(V)
40+
#define get_encryption_key_size(V) encryption_keys_service->get_encryption_key_size_func(V)
41+
#define get_encryption_key(V,K,S) encryption_keys_service->get_encryption_key_func((V), (K), (S))
42+
#define get_encryption_iv(V, I, S) encryption_keys_service->get_encryption_iv_func((V), (I), (S))
43+
44+
#else
45+
46+
unsigned int get_latest_encryption_key_version();
47+
unsigned int has_encryption_key(unsigned int version);
48+
unsigned int get_encryption_key_size(unsigned int version);
49+
int get_encryption_key(unsigned int version, unsigned char* key, unsigned int keybufsize);
50+
int get_encryption_iv(unsigned int version, unsigned char* iv, unsigned int ivbufsize);
51+
52+
#endif
53+
54+
#ifdef __cplusplus
55+
}
56+
#endif
57+
58+
#define MYSQL_SERVICE_ENCRYPTION_KEYS_INCLUDED
59+
#endif
60+

‎include/mysql/services.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ extern "C" {
3232
#include <mysql/service_thd_autoinc.h>
3333
#include <mysql/service_thd_error_context.h>
3434
#include <mysql/service_thd_specifics.h>
35+
#include <mysql/service_encryption_keys.h>
3536
/*#include <mysql/service_wsrep.h>*/
3637

3738
#ifdef __cplusplus

‎include/service_versions.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,5 @@
3535
#define VERSION_thd_autoinc 0x0100
3636
#define VERSION_thd_error_context 0x0100
3737
#define VERSION_thd_specifics 0x0100
38+
#define VERSION_encryption_keys 0x0100
3839

0 commit comments

Comments
 (0)