Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api

This commit is contained in:
jsteemann 2017-04-19 17:14:25 +02:00
parent c5854d050b 55643cf5ff
commit 2ee97ca38f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Ssl/SslInterface.cpp
View File

@ -217,7 +217,7 @@ void sslBASE64(char const* inputStr, char*& outputStr, size_t& outputLen) {
std::string sslPBKDF2HS1(char const* salt, size_t saltLength, char const* pass,
size_t passLength, int iter, int keyLength) {
unsigned char* dk =
(unsigned char*)TRI_SystemAllocate(EVP_MAX_MD_SIZE + 1, false);
(unsigned char*)TRI_SystemAllocate(keyLength + 1, false);
PKCS5_PBKDF2_HMAC_SHA1(pass, (int)passLength, (const unsigned char*)salt,
(int)saltLength, iter, keyLength, dk);
@ -250,7 +250,7 @@ std::string sslPBKDF2(char const* salt, size_t saltLength, char const* pass,
}
unsigned char* dk =
(unsigned char*)TRI_SystemAllocate(EVP_MAX_MD_SIZE + 1, false);
(unsigned char*)TRI_SystemAllocate(keyLength + 1, false);
PKCS5_PBKDF2_HMAC(pass, (int)passLength, (const unsigned char*)salt,
(int)saltLength, iter, evp_md, keyLength, dk);