Crypto: complete merge to 1.4.2

This commit is contained in:
Marian Krivos
2011-09-14 16:41:40 +00:00
parent e0c42bb6f4
commit bcf1d5b6a7
56 changed files with 6736 additions and 3766 deletions

View File

@@ -50,35 +50,25 @@ namespace Poco {
namespace Crypto {
int CipherFactory::_instanceCount = 0;
CipherFactory::CipherFactory()
{
if (_instanceCount == 0)
{
OpenSSL_add_all_algorithms();
ERR_load_crypto_strings();
}
++_instanceCount;
}
CipherFactory::~CipherFactory()
{
--_instanceCount;
if (_instanceCount == 0)
{
ERR_free_strings();
EVP_cleanup();
}
}
namespace
{
static Poco::SingletonHolder<CipherFactory> holder;
}
CipherFactory& CipherFactory::defaultFactory()
{
static Poco::SingletonHolder<CipherFactory> holder;
return *holder.get();
return *holder.get();
}