generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-23 00:48:52 +02:00
Code Issues Projects Releases Wiki Activity

always init CipherKey digest pointer

Browse Source
This commit is contained in:
Alex Fabijanic 2017-09-26 11:43:59 -05:00
parent 79b35fd0f3
commit 01f90c7632
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Crypto/src/CipherKeyImpl.cpp
View File

@ -29,8 +29,7 @@ CipherKeyImpl::CipherKeyImpl(const std::string& name,
const std::string& passphrase, const std::string& passphrase,
const std::string& salt, const std::string& salt,
int iterationCount, int iterationCount,
const std::string& digest): const std::string& digest): _pCipher(0),
_pCipher(0),
_pDigest(0), _pDigest(0),
_name(name), _name(name),
_key(), _key(),
@ -57,8 +56,8 @@ CipherKeyImpl::CipherKeyImpl(const std::string& name,
CipherKeyImpl::CipherKeyImpl(const std::string& name, CipherKeyImpl::CipherKeyImpl(const std::string& name,
const ByteVec& key, const ByteVec& key,
const ByteVec& iv): const ByteVec& iv): _pCipher(0),
_pCipher(0), _pDigest(0),
_name(name), _name(name),
_key(key), _key(key),
_iv(iv) _iv(iv)
@ -72,8 +71,8 @@ CipherKeyImpl::CipherKeyImpl(const std::string& name,
} }
CipherKeyImpl::CipherKeyImpl(const std::string& name): CipherKeyImpl::CipherKeyImpl(const std::string& name): _pCipher(0),
_pCipher(0), _pDigest(0),
_name(name), _name(name),
_key(), _key(),
_iv() _iv()
@ -165,7 +164,7 @@ void CipherKeyImpl::generateKey(
// Now create the key and IV, using the digest set in the constructor. // Now create the key and IV, using the digest set in the constructor.
int keySize = EVP_BytesToKey( int keySize = EVP_BytesToKey(
_pCipher, _pCipher,
_pDigest, _pDigest ? _pDigest : EVP_md5(),
(salt.empty() ? 0 : saltBytes), (salt.empty() ? 0 : saltBytes),
reinterpret_cast<const unsigned char*>(password.data()), reinterpret_cast<const unsigned char*>(password.data()),
static_cast<int>(password.size()), static_cast<int>(password.size()),

2
openssl

@ -1 +1 @@
Subproject commit 91c24b8028baf6cc91e77e154d6a90a850bcb558 Subproject commit 26b1673caad94a702b6d694f48f917a283b30777