diff --git a/src/cpp/Crypto/KeyPair.cpp b/src/cpp/Crypto/KeyPair.cpp index 9bccc3fd8..35e659a51 100644 --- a/src/cpp/Crypto/KeyPair.cpp +++ b/src/cpp/Crypto/KeyPair.cpp @@ -135,7 +135,8 @@ bool KeyPair::savePrivKey(int userId) { auto cm = ConnectionManager::getInstance(); auto em = ErrorManager::getInstance(); - Poco::Data::Statement update(cm->getConnection(CONNECTION_MYSQL_LOGIN_SERVER)); + auto mysql_session = cm->getConnection(CONNECTION_MYSQL_LOGIN_SERVER); + Poco::Data::Statement update(mysql_session); Poco::Data::BLOB privkey_blob((const unsigned char*)(*mPrivateKey), mPrivateKey->size()); update << "UPDATE users set privkey = ? where id = ?", diff --git a/src/cpp/Crypto/Obfus_array.h b/src/cpp/Crypto/Obfus_array.h index c9affd91a..421d864c5 100644 --- a/src/cpp/Crypto/Obfus_array.h +++ b/src/cpp/Crypto/Obfus_array.h @@ -1,7 +1,7 @@ #ifndef GRADIDO_LOGIN_SERVER_CRYPTO_OBFUS_ARRAY #define GRADIDO_LOGIN_SERVER_CRYPTO_OBFUS_ARRAY - +#include class ObfusArray { diff --git a/src/cpp/ServerConfig.cpp b/src/cpp/ServerConfig.cpp index 975dbb8be..e3fd2a189 100644 --- a/src/cpp/ServerConfig.cpp +++ b/src/cpp/ServerConfig.cpp @@ -63,7 +63,7 @@ namespace ServerConfig { return false; } if (realBinSize != crypto_shorthash_KEYBYTES) { - printf("[%s] serverKey hasn't valid size, expecting: %d, get: %d\n", + printf("[%s] serverKey hasn't valid size, expecting: %u, get: %lu\n", __FUNCTION__, crypto_shorthash_KEYBYTES, realBinSize); return false; } @@ -96,8 +96,9 @@ namespace ServerConfig { int options = OPT_DEFAULTS, const std::string& certificateStoreName = CERT_STORE_MY); */ - - g_SSL_CLient_Context = new Context(Context::CLIENT_USE, "", Context::VERIFY_RELAXED, Context::OPT_DEFAULTS); + g_SSL_CLient_Context = new Context(Context::CLIENT_USE, "", "", "", Context::VERIFY_RELAXED, 9, true, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"); + // another poco version? + //g_SSL_CLient_Context = new Context(Context::CLIENT_USE, "", Context::VERIFY_RELAXED, Context::OPT_DEFAULTS); SSLManager::instance().initializeClient(0, pCert, g_SSL_CLient_Context); return true; diff --git a/src/cpp/SingletonManager/ConnectionManager.h b/src/cpp/SingletonManager/ConnectionManager.h index 03571f750..7562fdacf 100644 --- a/src/cpp/SingletonManager/ConnectionManager.h +++ b/src/cpp/SingletonManager/ConnectionManager.h @@ -9,7 +9,7 @@ #include "Poco/Data/MySQL/Connector.h" #include "Poco/Exception.h" -#include "../Model/ErrorList.h" +#include "../model/ErrorList.h" enum ConnectionType { CONNECTION_MYSQL_LOGIN_SERVER, diff --git a/src/cpp/SingletonManager/ErrorManager.h b/src/cpp/SingletonManager/ErrorManager.h index 802728ff1..442ccdbd8 100644 --- a/src/cpp/SingletonManager/ErrorManager.h +++ b/src/cpp/SingletonManager/ErrorManager.h @@ -15,7 +15,7 @@ #include #include #include -#include "../Model/Error.h" +#include "../model/Error.h" #include "../Crypto/DRHash.h" #include "../tasks/CPUTask.h" diff --git a/src/cpp/SingletonManager/SessionManager.h b/src/cpp/SingletonManager/SessionManager.h index 6998e5cc6..ad09c6736 100644 --- a/src/cpp/SingletonManager/SessionManager.h +++ b/src/cpp/SingletonManager/SessionManager.h @@ -11,7 +11,7 @@ #define DR_LUA_WEB_MODULE_SESSION_MANAGER_H -#include "../Model/Session.h" +#include "../model/Session.h" #include "Poco/RegularExpression.h" diff --git a/src/cpp/tasks/Task.h b/src/cpp/tasks/Task.h index d69ddf4ba..aa2b1f14d 100644 --- a/src/cpp/tasks/Task.h +++ b/src/cpp/tasks/Task.h @@ -130,4 +130,4 @@ namespace UniLib { } } -#endif __DR_UNIVERSUM_LIB_CONTROLLER_TASK_H__ \ No newline at end of file +#endif //__DR_UNIVERSUM_LIB_CONTROLLER_TASK_H__ \ No newline at end of file