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

Merge branch 'devel' of github.com:pocoproject/poco into devel

Browse Source
This commit is contained in:
Francis ANDRE 2022-08-22 10:53:29 +02:00
commit 5c3f827c86
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Crypto/src/EVPCipherImpl.cpp
View File

@ -130,7 +130,7 @@ namespace
throwError(Poco::format(fmt, std::string("EVP_PKEY_encrypt(NULL)")));
if (EVP_PKEY_encrypt(_pCtx, output, &outLen, _pBuf, static_cast<std::size_t>(maxSize)) <= 0)
throwError(Poco::format(fmt, std::string("EVP_PKEY_encrypt")));
rc += outLen;
rc += static_cast<int>(outLen);
output += outLen;
outputLength -= outLen;
_pos = 0;
@ -241,7 +241,7 @@ namespace
throwError(Poco::format(fmt, std::string("EVP_PKEY_decrypt(NULL)")));
if (EVP_PKEY_decrypt(_pCtx, output, &outLen, _pBuf, static_cast<std::size_t>(_pos)) <= 0)
throwError(Poco::format(fmt, std::string("EVP_PKEY_decrypt")));
rc += outLen;
rc += static_cast<int>(outLen);
output += outLen;
outputLength -= outLen;
_pos = 0;

4
Crypto/src/Envelope.cpp
View File

@ -15,7 +15,9 @@
#include "Poco/Crypto/Envelope.h"
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
#define EVP_CIPHER_CTX_init(a) 1
#if !defined(EVP_CIPHER_CTX_init)
#define EVP_CIPHER_CTX_init(a)
#endif
#endif
namespace Poco {

2
Util/include/Poco/Util/Application.h
View File

@ -520,7 +520,7 @@ inline Poco::Timespan Application::uptime() const
} \
return pApp->run(); \
}
#elif defined(POCO_VXWORKS)
#elif defined(POCO_VXWORKS) && !defined(POCO_VXWORKS_RTP)
#define POCO_APP_MAIN(App) \
int pocoAppMain(const char* appName, ...) \
{ \