Skip to content

MDEV-27561 Fix uninitialized memory in DES_ENCRYPT #5381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vaintroub wants to merge 1 commit into
base: 10.11
Choose a base branch
from
Open

MDEV-27561 Fix uninitialized memory in DES_ENCRYPT #5381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions mysql-test/main/func_des_encrypt.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,10 @@ hex(des_encrypt('a'))
#
# End of 10.10 tests
#
#
# MDEV-27561: Valgrind/MSAN errors in Item_func_des_encrypt::val_str
#
SELECT VARIANCE(0), HEX(DES_ENCRYPT('foo', ExtractValue('<foo></foo>', '/foo')));
VARIANCE(0) HEX(DES_ENCRYPT('foo', ExtractValue('<foo></foo>', '/foo')))
0.0000 FFD41F3FDEBD4F0F62
# End of 10.11 tests
9 changes: 9 additions & 0 deletions mysql-test/main/func_des_encrypt.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,12 @@ select hex(des_encrypt('a'));
--echo #
--echo # End of 10.10 tests
--echo #


--echo #
--echo # MDEV-27561: Valgrind/MSAN errors in Item_func_des_encrypt::val_str
--echo #

SELECT VARIANCE(0), HEX(DES_ENCRYPT('foo', ExtractValue('<foo></foo>', '/foo')));

--echo # End of 10.11 tests
8 changes: 6 additions & 2 deletions sql/item_strfunc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,13 +786,15 @@ String *Item_func_des_encrypt::val_str(String *str)
}
else
{
String *keystr= args[1]->val_str(str);
String key_value;
String *keystr= args[1]->val_str(&key_value);
if (!keystr)
goto error;
key_number=127; // User key string

/* We make good 24-byte (168 bit) key from given plaintext key with MD5 */
bzero((char*) &ivec,sizeof(ivec));
bzero((char*) &keyblock,sizeof(keyblock));
if (!EVP_BytesToKey(EVP_des_ede3_cbc(),EVP_md5(),NULL,
(uchar*) keystr->ptr(), (int) keystr->length(),
1, (uchar*) &keyblock,ivec))
Expand Down Expand Up @@ -897,11 +899,13 @@ String *Item_func_des_decrypt::val_str(String *str)
else
{
// We make good 24-byte (168 bit) key from given plaintext key with MD5
String *keystr= args[1]->val_str(str);
String key_value;
String *keystr= args[1]->val_str(&key_value);
if (!keystr)
goto error;

bzero((char*) &ivec,sizeof(ivec));
bzero((char*) &keyblock,sizeof(keyblock));
if (!EVP_BytesToKey(EVP_des_ede3_cbc(),EVP_md5(),NULL,
(uchar*) keystr->ptr(),(int) keystr->length(),
1,(uchar*) &keyblock,ivec))
Expand Down