diff --git a/Crypto.cpp b/Crypto.cpp index 90b74179..885c65f4 100644 --- a/Crypto.cpp +++ b/Crypto.cpp @@ -298,11 +298,13 @@ namespace crypto BN_rand (k, ELGAMAL_SHORT_EXPONENT_NUM_BITS, -1, 1); // short exponent of 226 bits #endif // calculate a - a = BN_new (); if (g_ElggTable) a = ElggPow (k, g_ElggTable, ctx); else + { + a = BN_new (); BN_mod_exp (a, elgg, k, elgp, ctx); + } BIGNUM * y = BN_new (); BN_bin2bn (key, 256, y); diff --git a/Transports.cpp b/Transports.cpp index 903e257c..1cfb5686 100644 --- a/Transports.cpp +++ b/Transports.cpp @@ -470,12 +470,11 @@ namespace transport { m_SSUServer->DeleteSession (ssuSession); LogPrint (eLogDebug, "Transports: SSU session closed"); - } - // TODO: delete NTCP + } auto ntcpSession = m_NTCPServer ? m_NTCPServer->FindNTCPSession(router->GetIdentHash()) : nullptr; - if (ntcpSession) + if (ntcpSession) // try deleting ntcp session too { - m_NTCPServer->RemoveNTCPSession(ntcpSession); + ntcpSession->Terminate (); LogPrint(eLogDebug, "Transports: NTCP session closed"); } } diff --git a/qt/i2pd_qt/android/AndroidManifest.xml b/qt/i2pd_qt/android/AndroidManifest.xml index 69f6fde3..471b312c 100644 --- a/qt/i2pd_qt/android/AndroidManifest.xml +++ b/qt/i2pd_qt/android/AndroidManifest.xml @@ -1,11 +1,11 @@ - + - + - + @@ -60,4 +60,5 @@ Remove the comment if you do not require these default features. --> + diff --git a/qt/i2pd_qt/android/res/drawable-hdpi/icon.png b/qt/i2pd_qt/android/res/drawable-hdpi/icon.png new file mode 100644 index 00000000..a5dc7b68 Binary files /dev/null and b/qt/i2pd_qt/android/res/drawable-hdpi/icon.png differ diff --git a/version.h b/version.h index 5d07c596..46d170db 100644 --- a/version.h +++ b/version.h @@ -7,7 +7,7 @@ #define MAKE_VERSION(a,b,c) STRINGIZE(a) "." STRINGIZE(b) "." STRINGIZE(c) #define I2PD_VERSION_MAJOR 2 -#define I2PD_VERSION_MINOR 7 +#define I2PD_VERSION_MINOR 8 #define I2PD_VERSION_MICRO 0 #define I2PD_VERSION_PATCH 0 #define I2PD_VERSION MAKE_VERSION(I2PD_VERSION_MAJOR, I2PD_VERSION_MINOR, I2PD_VERSION_MICRO)