hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.1.7' into develop-2.1-merge

Browse Source
This commit is contained in:
Johan Wikman
2017-09-12 11:08:02 +03:00
parent 65066ae126 2a4bfc31ec
commit 02b9e0a01d
28 changed files with 367 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/secrets.cc
View File

@ -413,7 +413,7 @@ encrypt_password(const char* path, const char *password)
AES_set_encrypt_key(keys->enckey, 8 * MAXSCALE_KEYLEN, &aeskey);
AES_cbc_encrypt(padded_passwd, encrypted, padded_len, &aeskey, keys->initvector, AES_ENCRYPT);
hex_output = (char *) MXS_MALLOC(padded_len * 2);
hex_output = (char *) MXS_MALLOC(padded_len * 2 + 1);
if (hex_output)
{
gw_bin2hex(hex_output, encrypted, padded_len);