Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
13752faa
Commit
13752faa
authored
May 05, 2017
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation of aws_key_management plugin
parent
bc6426e4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
plugin/aws_key_management/aws_key_management_plugin.cc
plugin/aws_key_management/aws_key_management_plugin.cc
+5
-4
No files found.
plugin/aws_key_management/aws_key_management_plugin.cc
View file @
13752faa
...
...
@@ -23,6 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <mysqld_error.h>
#include <my_sys.h>
#include <map>
#include <algorithm>
#include <string>
...
...
@@ -194,7 +195,7 @@ static int plugin_init(void *p)
client
=
new
KMSClient
(
clientConfiguration
);
if
(
!
client
)
{
my_printf_error
(
ER_UNKNOWN_ERROR
,
"Can not initialize KMS client"
,
ME_ERROR_LOG
,
);
my_printf_error
(
ER_UNKNOWN_ERROR
,
"Can not initialize KMS client"
,
ME_ERROR_LOG
|
ME_WARNING
);
return
-
1
;
}
...
...
@@ -259,12 +260,12 @@ static int load_key(KEY_INFO *info)
if
(
!
ret
)
{
my_printf_error
(
ER_UNKNOWN_ERROR
,
"AWS KMS plugin: loaded key %u, version %u, key length %u bit"
,
ME_ERROR_LOG
|
ER
_NOTE
,
my_printf_error
(
ER_UNKNOWN_ERROR
,
"AWS KMS plugin: loaded key %u, version %u, key length %u bit"
,
ME_ERROR_LOG
|
ME
_NOTE
,
info
->
key_id
,
info
->
key_version
,(
uint
)
info
->
length
*
8
);
}
else
{
my_printf_error
(
ER_UNKNOWN_ERROR
,
"AWS KMS plugin: key %u, version %u could not be decrypted"
,
ME_ERROR_LOG
|
ER
_WARNING
,
my_printf_error
(
ER_UNKNOWN_ERROR
,
"AWS KMS plugin: key %u, version %u could not be decrypted"
,
ME_ERROR_LOG
|
ME
_WARNING
,
info
->
key_id
,
info
->
key_version
);
}
return
ret
;
...
...
@@ -421,7 +422,7 @@ static int aws_generate_datakey(uint keyid, uint version)
return
(
-
1
);
}
close
(
fd
);
my_printf_error
(
ER_UNKNOWN_ERROR
,
"AWS KMS plugin: generated encrypted datakey for key id=%u, version=%u"
,
ME_ERROR_LOG
|
ER
_NOTE
,
my_printf_error
(
ER_UNKNOWN_ERROR
,
"AWS KMS plugin: generated encrypted datakey for key id=%u, version=%u"
,
ME_ERROR_LOG
|
ME
_NOTE
,
keyid
,
version
);
return
(
0
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment