database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Revert "MDEV-25343 add read secret size in file key plugin"

Browse Source 
This reverts commit cee7175b79.
This commit is contained in:
Daniel Black
2022-10-19 19:25:48 +11:00
parent cee7175b79
commit 3a62ff7e89
5 changed files with 1 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugin/file_key_management/parser.cc
View File

@ -174,24 +174,13 @@ bool Parser::read_filekey(const char *filekey, char *secret)
return 1;
}
int len= read(f, secret, MAX_SECRET_SIZE + 1);
int len= read(f, secret, MAX_SECRET_SIZE);
if (len <= 0)
{
my_error(EE_READ,ME_ERROR_LOG, filekey, errno);
close(f);
return 1;
}
if (len > MAX_SECRET_SIZE)
{
my_printf_error(EE_READ,
"Cannot decrypt %s, the secret file has incorrect length, "
"max secret size is %dB ",
ME_ERROR_LOG, filekey, MAX_SECRET_SIZE);
close(f);
return 1;
}
close(f);
while (secret[len - 1] == '\r' || secret[len - 1] == '\n') len--;
secret[len]= '\0';