mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 23:54:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-7993 file_key_management_filekey doesn't work as expected with FILE:

Browse source 
chomp the secret, as read from the file. remove trailing
CR and LF bytes.
This commit is contained in:
Sergei Golubchik 2015-05-10 11:03:33 +02:00
commit 66380916ee
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/suite/encryption/t/filekeys-data.key
View file

@ -1 +1,2 @@
secret secret

1
plugin/file_key_management/parser.cc
View file

@ -173,6 +173,7 @@ bool Parser::read_filekey(const char *filekey, char *secret)
my_close(f, MYF(MY_WME)); my_close(f, MYF(MY_WME));
if (len <= 0) if (len <= 0)
return 1; return 1;
while (secret[len - 1] == '\r' || secret[len - 1] == '\n') len--;
secret[len]= '\0'; secret[len]= '\0';
return 0; return 0;
} }