Merge branch 'master' into pisteampackerconfig

# Conflicts:
#	libs/client_server/piclientserver_server.cpp
#	libs/crypt/picrypt.cpp
#	libs/io_utils/pistreampacker.cpp
#	main.cpp
This commit is contained in:
2024-11-16 14:34:34 +03:00
83 changed files with 3583 additions and 848 deletions

View File

@@ -18,6 +18,8 @@
*/
#include "piethutilbase.h"
#include "pitranslator.h"
#ifdef PIP_CRYPT
# include "picrypt.h"
#endif
@@ -85,7 +87,8 @@ void PIEthUtilBase::createCryptKey(const PIString & k) {
_key = PICrypt::hash("sodium_bug");
_key = PICrypt::hash(k);
#else
piCout << "[PIEthUtilBase] PICrypt wasn`t built!";
piCout << "[PIEthUtilBase]"
<< "PICrypt wasn`t built!"_tr("PIEthUtilBase");
#endif
_crypt = true;
}