generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-29 12:18:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'poco-1.10.0' into devel

Browse Source
This commit is contained in:
Günter Obiltschnig
2020-01-23 10:42:31 +01:00
parent 303ddeec9e 0f49493d0e
commit bccea84322
14 changed files with 100 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Crypto/include/Poco/Crypto/Cipher.h
View File

@@ -19,6 +19,7 @@
#include "Poco/Crypto/Crypto.h"
#include "Poco/Crypto/CryptoTransform.h"
#include "Poco/RefCountedObject.h"
#include "Poco/AutoPtr.h"
#include <istream>
@@ -30,9 +31,6 @@ namespace Poco {
namespace Crypto {
class CryptoTransform;
class Crypto_API Cipher: public Poco::RefCountedObject
/// Represents the abstract base class from which all implementations of
/// symmetric/asymmetric encryption algorithms must inherit. Use the CipherFactory
@@ -104,10 +102,10 @@ public:
virtual const std::string& name() const = 0;
/// Returns the name of the Cipher.
virtual CryptoTransform* createEncryptor() = 0;
virtual CryptoTransform::Ptr createEncryptor() = 0;
/// Creates an encryptor object to be used with a CryptoStream.
virtual CryptoTransform* createDecryptor() = 0;
virtual CryptoTransform::Ptr createDecryptor() = 0;
/// Creates a decryptor object to be used with a CryptoStream.
virtual std::string encryptString(const std::string& str, Encoding encoding = ENC_NONE);

4
Crypto/include/Poco/Crypto/CipherImpl.h
View File

@@ -42,10 +42,10 @@ public:
const std::string& name() const;
/// Returns the name of the cipher.
CryptoTransform* createEncryptor();
CryptoTransform::Ptr createEncryptor();
/// Creates an encryptor object.
CryptoTransform* createDecryptor();
CryptoTransform::Ptr createDecryptor();
/// Creates a decryptor object.
private:

15
Crypto/include/Poco/Crypto/CryptoStream.h
View File

@@ -20,6 +20,7 @@
#include "Poco/Crypto/Crypto.h"
#include "Poco/Crypto/CryptoTransform.h"
#include "Poco/BufferedStreamBuf.h"
#include "Poco/Buffer.h"
#include <iostream>
@@ -38,8 +39,8 @@ class Crypto_API CryptoStreamBuf: public Poco::BufferedStreamBuf
/// going through it.
{
public:
CryptoStreamBuf(std::istream& istr, CryptoTransform* pTransform, std::streamsize bufferSize = 8192);
CryptoStreamBuf(std::ostream& ostr, CryptoTransform* pTransform, std::streamsize bufferSize = 8192);
CryptoStreamBuf(std::istream& istr, CryptoTransform::Ptr pTransform, std::streamsize bufferSize = 8192);
CryptoStreamBuf(std::ostream& ostr, CryptoTransform::Ptr pTransform, std::streamsize bufferSize = 8192);
virtual ~CryptoStreamBuf();
@@ -51,7 +52,7 @@ protected:
int writeToDevice(const char* buffer, std::streamsize length);
private:
CryptoTransform* _pTransform;
CryptoTransform::Ptr _pTransform;
std::istream* _pIstr;
std::ostream* _pOstr;
bool _eof;
@@ -70,8 +71,8 @@ class Crypto_API CryptoIOS: public virtual std::ios
/// stream buffer and base classes.
{
public:
CryptoIOS(std::istream& istr, CryptoTransform* pTransform, std::streamsize bufferSize = 8192);
CryptoIOS(std::ostream& ostr, CryptoTransform* pTransform, std::streamsize bufferSize = 8192);
CryptoIOS(std::istream& istr, CryptoTransform::Ptr pTransform, std::streamsize bufferSize = 8192);
CryptoIOS(std::ostream& ostr, CryptoTransform::Ptr pTransform, std::streamsize bufferSize = 8192);
~CryptoIOS();
CryptoStreamBuf* rdbuf();
@@ -89,7 +90,7 @@ class Crypto_API CryptoInputStream: public CryptoIOS, public std::istream
/// respectively.
{
public:
CryptoInputStream(std::istream& istr, CryptoTransform* pTransform, std::streamsize bufferSize = 8192);
CryptoInputStream(std::istream& istr, CryptoTransform::Ptr pTransform, std::streamsize bufferSize = 8192);
/// Create a new CryptoInputStream object. The CryptoInputStream takes the
/// ownership of the given CryptoTransform object.
@@ -113,7 +114,7 @@ class Crypto_API CryptoOutputStream: public CryptoIOS, public std::ostream
/// to ensure completion of cryptographic transformation.
{
public:
CryptoOutputStream(std::ostream& ostr, CryptoTransform* pTransform, std::streamsize bufferSize = 8192);
CryptoOutputStream(std::ostream& ostr, CryptoTransform::Ptr pTransform, std::streamsize bufferSize = 8192);
/// Create a new CryptoOutputStream object. The CryptoOutputStream takes the
/// ownership of the given CryptoTransform object.

3
Crypto/include/Poco/Crypto/CryptoTransform.h
View File

@@ -19,6 +19,7 @@
#include "Poco/Crypto/Crypto.h"
#include "Poco/SharedPtr.h"
#include <ios>
@@ -35,6 +36,8 @@ class Crypto_API CryptoTransform
/// perform encryption or decryption of data.
{
public:
using Ptr = Poco::SharedPtr<CryptoTransform>;
CryptoTransform();
/// Creates a new CryptoTransform object.

4
Crypto/include/Poco/Crypto/RSACipherImpl.h
View File

@@ -49,10 +49,10 @@ public:
const std::string& name() const;
/// Returns the name of the Cipher.
CryptoTransform* createEncryptor();
CryptoTransform::Ptr createEncryptor();
/// Creates an encryptor object.
CryptoTransform* createDecryptor();
CryptoTransform::Ptr createDecryptor();
/// Creates a decryptor object.
private:

4
Crypto/src/CipherImpl.cpp
View File

@@ -255,14 +255,14 @@ CipherImpl::~CipherImpl()
}
CryptoTransform* CipherImpl::createEncryptor()
CryptoTransform::Ptr CipherImpl::createEncryptor()
{
CipherKeyImpl::Ptr p = _key.impl();
return new CryptoTransformImpl(p->cipher(), p->getKey(), p->getIV(), CryptoTransformImpl::DIR_ENCRYPT);
}
CryptoTransform* CipherImpl::createDecryptor()
CryptoTransform::Ptr CipherImpl::createDecryptor()
{
CipherKeyImpl::Ptr p = _key.impl();
return new CryptoTransformImpl(p->cipher(), p->getKey(), p->getIV(), CryptoTransformImpl::DIR_DECRYPT);

13
Crypto/src/CryptoStream.cpp
View File

@@ -32,7 +32,7 @@ namespace Crypto {
//
CryptoStreamBuf::CryptoStreamBuf(std::istream& istr, CryptoTransform* pTransform, std::streamsize bufferSize):
CryptoStreamBuf::CryptoStreamBuf(std::istream& istr, CryptoTransform::Ptr pTransform, std::streamsize bufferSize):
Poco::BufferedStreamBuf(bufferSize, std::ios::in),
_pTransform(pTransform),
_pIstr(&istr),
@@ -45,7 +45,7 @@ CryptoStreamBuf::CryptoStreamBuf(std::istream& istr, CryptoTransform* pTransform
}
CryptoStreamBuf::CryptoStreamBuf(std::ostream& ostr, CryptoTransform* pTransform, std::streamsize bufferSize):
CryptoStreamBuf::CryptoStreamBuf(std::ostream& ostr, CryptoTransform::Ptr pTransform, std::streamsize bufferSize):
Poco::BufferedStreamBuf(bufferSize, std::ios::out),
_pTransform(pTransform),
_pIstr(0),
@@ -67,7 +67,6 @@ CryptoStreamBuf::~CryptoStreamBuf()
catch (...)
{
}
delete _pTransform;
}
@@ -193,14 +192,14 @@ int CryptoStreamBuf::writeToDevice(const char* buffer, std::streamsize length)
//
CryptoIOS::CryptoIOS(std::istream& istr, CryptoTransform* pTransform, std::streamsize bufferSize):
CryptoIOS::CryptoIOS(std::istream& istr, CryptoTransform::Ptr pTransform, std::streamsize bufferSize):
_buf(istr, pTransform, bufferSize)
{
poco_ios_init(&_buf);
}
CryptoIOS::CryptoIOS(std::ostream& ostr, CryptoTransform* pTransform, std::streamsize bufferSize):
CryptoIOS::CryptoIOS(std::ostream& ostr, CryptoTransform::Ptr pTransform, std::streamsize bufferSize):
_buf(ostr, pTransform, bufferSize)
{
poco_ios_init(&_buf);
@@ -223,7 +222,7 @@ CryptoStreamBuf* CryptoIOS::rdbuf()
//
CryptoInputStream::CryptoInputStream(std::istream& istr, CryptoTransform* pTransform, std::streamsize bufferSize):
CryptoInputStream::CryptoInputStream(std::istream& istr, CryptoTransform::Ptr pTransform, std::streamsize bufferSize):
CryptoIOS(istr, pTransform, bufferSize),
std::istream(&_buf)
{
@@ -247,7 +246,7 @@ CryptoInputStream::~CryptoInputStream()
//
CryptoOutputStream::CryptoOutputStream(std::ostream& ostr, CryptoTransform* pTransform, std::streamsize bufferSize):
CryptoOutputStream::CryptoOutputStream(std::ostream& ostr, CryptoTransform::Ptr pTransform, std::streamsize bufferSize):
CryptoIOS(ostr, pTransform, bufferSize),
std::ostream(&_buf)
{

4
Crypto/src/RSACipherImpl.cpp
View File

@@ -329,13 +329,13 @@ RSACipherImpl::~RSACipherImpl()
}
CryptoTransform* RSACipherImpl::createEncryptor()
CryptoTransform::Ptr RSACipherImpl::createEncryptor()
{
return new RSAEncryptImpl(_key.impl()->getRSA(), _paddingMode);
}
CryptoTransform* RSACipherImpl::createDecryptor()
CryptoTransform::Ptr RSACipherImpl::createDecryptor()
{
return new RSADecryptImpl(_key.impl()->getRSA(), _paddingMode);
}

4
Crypto/testsuite/src/CryptoTest.cpp
View File

@@ -222,7 +222,7 @@ void CryptoTest::testEncryptDecryptGCM()
for (std::size_t n = 1; n < MAX_DATA_SIZE; n++)
{
std::stringstream str;
CryptoTransform* pEncryptor = pCipher->createEncryptor();
CryptoTransform::Ptr pEncryptor = pCipher->createEncryptor();
CryptoOutputStream encryptorStream(str, pEncryptor);
std::string in(n, 'x');
encryptorStream << in;
@@ -231,7 +231,7 @@ void CryptoTest::testEncryptDecryptGCM()
std::string tag = pEncryptor->getTag();
CryptoTransform* pDecryptor = pCipher->createDecryptor();
CryptoTransform::Ptr pDecryptor = pCipher->createDecryptor();
pDecryptor->setTag(tag);
CryptoInputStream decryptorStream(str, pDecryptor);
std::string out;

11
Crypto/testsuite/src/EVPTest.cpp
View File

@@ -16,6 +16,7 @@
#include "Poco/StreamCopier.h"
#include "CppUnit/TestCaller.h"
#include "CppUnit/TestSuite.h"
#include <memory>
#include <sstream>
#include <fstream>
#include <iostream>
@@ -41,12 +42,12 @@ void EVPTest::testRSAEVPPKey()
{
try
{
RSAKey* key = new RSAKey(RSAKey::KL_1024, RSAKey::EXP_SMALL);
std::unique_ptr<RSAKey> key(new RSAKey(RSAKey::KL_1024, RSAKey::EXP_SMALL));
assertTrue(key->type() == Poco::Crypto::KeyPair::KT_RSA);
// construct EVPPKey from RSAKey*
EVPPKey* pKey = new EVPPKey(key);
EVPPKey* pKey = new EVPPKey(key.get());
// EVPPKey increments reference count, so freeing the original must be ok
delete key;
key.reset();
assertTrue (!pKey->isSupported(0));
assertTrue (!pKey->isSupported(-1));
@@ -54,11 +55,11 @@ void EVPTest::testRSAEVPPKey()
assertTrue (pKey->type() == EVP_PKEY_RSA);
// construct RSAKey from const EVPPKey&
key = new RSAKey(*pKey);
key.reset(new RSAKey(*pKey));
delete pKey;
assertTrue(key->type() == Poco::Crypto::KeyPair::KT_RSA);
// construct EVPPKey from RSAKey*
pKey = new EVPPKey(key);
pKey = new EVPPKey(key.get());
assertTrue (pKey->type() == EVP_PKEY_RSA);
BIO* bioPriv1 = BIO_new(BIO_s_mem());

5
Data/SQLite/src/SessionImpl.cpp
View File

@@ -163,14 +163,15 @@ void SessionImpl::open(const std::string& connect)
if (rc == SQLITE_OK) break;
if (sw.elapsedSeconds() >= tout)
{
close();
Utility::throwException(_pDB, rc);
}
else Thread::sleep(10);
Thread::sleep(10);
close();
}
}
catch (SQLiteException& ex)
{
close();
throw ConnectionFailedException(ex.displayText());
}

2
Data/SQLite/testsuite/src/SQLiteTest.cpp
View File

@@ -3410,7 +3410,7 @@ void SQLiteTest::testIllegalFilePath()
{
try
{
Session tmp (Poco::Data::SQLite::Connector::KEY, "\\/some\\/illegal\\/path\\/dummy.db", 1);
Session tmp(Poco::Data::SQLite::Connector::KEY, "\\/some\\/illegal\\/path\\/dummy.db", 1);
fail("must fail");
}
catch (ConnectionFailedException&)

29
Foundation/include/Poco/Buffer.h
View File

@@ -94,8 +94,8 @@ public:
}
}
Buffer(Buffer&& other) :
/// Copy constructor.
Buffer(Buffer&& other) noexcept:
/// Move constructor.
_capacity(other._capacity),
_used(other._used),
_ptr(other._ptr),
@@ -119,21 +119,20 @@ public:
return *this;
}
Buffer& operator = (Buffer&& other)
/// Assignment operator.
Buffer& operator = (Buffer&& other) noexcept
/// Move assignment operator.
{
if (this != &other)
{
_capacity = other._capacity;
_used = other._used;
_ptr = other._ptr;
_ownMem = other._ownMem;
if (_ownMem) delete [] _ptr;
other._capacity = 0;
other._used = 0;
other._ownMem = false;
other._ptr = nullptr;
}
_capacity = other._capacity;
_used = other._used;
_ptr = other._ptr;
_ownMem = other._ownMem;
other._capacity = 0;
other._used = 0;
other._ownMem = false;
other._ptr = nullptr;
return *this;
}

15
Net/testsuite/src/SocketReactorTest.cpp
View File

@@ -87,7 +87,8 @@ namespace
_reactor(reactor),
_or(*this, &ClientServiceHandler::onReadable),
_ow(*this, &ClientServiceHandler::onWritable),
_ot(*this, &ClientServiceHandler::onTimeout)
_ot(*this, &ClientServiceHandler::onTimeout),
_os(*this, &ClientServiceHandler::onShutdown)
{
_timeout = false;
_readableError = false;
@@ -102,10 +103,15 @@ namespace
checkTimeoutObserverCount(0);
_reactor.addEventHandler(_socket, _ot);
checkTimeoutObserverCount(1);
_reactor.addEventHandler(_socket, _os);
}
~ClientServiceHandler()
{
_reactor.removeEventHandler(_socket, _or);
_reactor.removeEventHandler(_socket, _ow);
_reactor.removeEventHandler(_socket, _ot);
_reactor.removeEventHandler(_socket, _os);
}
void onReadable(ReadableNotification* pNf)
@@ -154,6 +160,12 @@ namespace
}
}
void onShutdown(ShutdownNotification* pNf)
{
pNf->release();
delete this;
}
static std::string data()
{
return _data;
@@ -232,6 +244,7 @@ namespace
Observer<ClientServiceHandler, ReadableNotification> _or;
Observer<ClientServiceHandler, WritableNotification> _ow;
Observer<ClientServiceHandler, TimeoutNotification> _ot;
Observer<ClientServiceHandler, ShutdownNotification> _os;
std::stringstream _str;
static std::string _data;
static bool _readableError;