Merge branch 'upstream-openssl' into restricted_routes

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);

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");
 		}
 	}	

qt/i2pd_qt/android/AndroidManifest.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <manifest package="org.purplei2p.i2pd" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.8.0" android:versionCode="1" android:installLocation="auto">
-    <uses-sdk android:minSdkVersion="11" android:targetSdkVersion="24"/>
+    <uses-sdk android:minSdkVersion="11"/>
         <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
     <!-- <application android:hardwareAccelerated="true" -->
-        <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="i2pd">
+        <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="i2pd" android:icon="@drawable/icon">
         <!-- android:configChanges="screenSize|smallestScreenSize" are since api 13, "layoutDirection" since api 17 -->
-        <activity android:configChanges="orientation|uiMode|screenLayout|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.purplei2p.i2pd.I2PDMainActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleTop">
+        <activity android:configChanges="orientation|uiMode|screenLayout|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.purplei2p.i2pd.I2PDMainActivity" android:label="i2pd" android:screenOrientation="unspecified" android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -60,4 +60,5 @@
          Remove the comment if you do not require these default features. -->
     <!-- %%INSERT_FEATURES -->
 
+<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 </manifest>

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)