diff --git a/Crypto/src/EVPCipherImpl.cpp b/Crypto/src/EVPCipherImpl.cpp index 264144f38..76385c53a 100644 --- a/Crypto/src/EVPCipherImpl.cpp +++ b/Crypto/src/EVPCipherImpl.cpp @@ -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(maxSize)) <= 0) throwError(Poco::format(fmt, std::string("EVP_PKEY_encrypt"))); - rc += outLen; + rc += static_cast(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(_pos)) <= 0) throwError(Poco::format(fmt, std::string("EVP_PKEY_decrypt"))); - rc += outLen; + rc += static_cast(outLen); output += outLen; outputLength -= outLen; _pos = 0; diff --git a/Crypto/src/Envelope.cpp b/Crypto/src/Envelope.cpp index 03410af35..bfce72685 100644 --- a/Crypto/src/Envelope.cpp +++ b/Crypto/src/Envelope.cpp @@ -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 { diff --git a/Util/include/Poco/Util/Application.h b/Util/include/Poco/Util/Application.h index f149f2d75..5d4f518a5 100644 --- a/Util/include/Poco/Util/Application.h +++ b/Util/include/Poco/Util/Application.h @@ -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, ...) \ { \