generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-15 23:20:06 +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
Download Patch File Download Diff File Expand all files Collapse all files

27
Crypto/src/CipherKeyImpl.cpp
View File

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

2
openssl

Submodule openssl updated: 91c24b8028...26b1673caa