Library upgrade for Android client

Version 5.0.8 Build 115080 Changelog update
iiordanov · Mar 19, 2022 · c56ad65 · c56ad65
1 parent 52acce1
commit c56ad65
Show file tree

Hide file tree

Showing 16 changed files with 41 additions and 38 deletions.
diff --git a/CustomVnc-app/src/main/AndroidManifest.xml b/CustomVnc-app/src/main/AndroidManifest.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.iiordanov.CUSTOM_VNC_APP_PACKAGE_NAME"
     android:installLocation="auto"
-    android:versionCode="115072"
-    android:versionName="v5.0.7">
+    android:versionCode="115080"
+    android:versionName="v5.0.8">
 
     <uses-permission tools:node="removeAll" />
     <uses-permission android:name="android.permission.INTERNET" />

diff --git a/Opaque-app/src/main/AndroidManifest.xml b/Opaque-app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.undatech.opaque"
-    android:versionCode="115072"
-    android:versionName="v5.0.7">
+    android:versionCode="115080"
+    android:versionName="v5.0.8">
 
     <uses-feature android:name="android.hardware.usb.host" />
     <uses-sdk android:minSdkVersion="12" />

diff --git a/aRDP-app/src/main/AndroidManifest.xml b/aRDP-app/src/main/AndroidManifest.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.iiordanov.aRDP"
     android:installLocation="auto"
-    android:versionCode="115072"
-    android:versionName="v5.0.7">
+    android:versionCode="115080"
+    android:versionName="v5.0.8">
 
     <uses-permission tools:node="removeAll" />
     <uses-permission android:name="android.permission.INTERNET" />

diff --git a/aSPICE-app/src/main/AndroidManifest.xml b/aSPICE-app/src/main/AndroidManifest.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.iiordanov.aSPICE"
     android:installLocation="auto"
-    android:versionCode="115072"
-    android:versionName="v5.0.7">
+    android:versionCode="115080"
+    android:versionName="v5.0.8">
 
     <uses-feature android:name="android.hardware.usb.host" />
     <uses-sdk android:minSdkVersion="12" />

diff --git a/bVNC-app/src/main/AndroidManifest.xml b/bVNC-app/src/main/AndroidManifest.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.iiordanov.bVNC"
     android:installLocation="auto"
-    android:versionCode="115072"
-    android:versionName="v5.0.7">
+    android:versionCode="115080"
+    android:versionName="v5.0.8">
 
     <uses-permission tools:node="removeAll" />
     <uses-permission android:name="android.permission.INTERNET" />

diff --git a/bVNC/CHANGELOG-aRDP b/bVNC/CHANGELOG-aRDP
@@ -1,3 +1,5 @@
+v5.0.8
+- Security library upgrade
 v5.0.7
 - Finer-grained permissions requests
 - Fix for layouts including QWERTZ, AZERTY

diff --git a/bVNC/CHANGELOG-aSPICE b/bVNC/CHANGELOG-aSPICE
@@ -1,3 +1,5 @@
+v5.0.8
+- Security library upgrade
 v5.0.7
 - Finer-grained permissions requests
 - Fixes for hardware keyboards

diff --git a/bVNC/CHANGELOG-bVNC b/bVNC/CHANGELOG-bVNC
@@ -1,3 +1,5 @@
+v5.0.8
+- Security library upgrade
 v5.0.7
 - Finer-grained permissions requests
 - Fixes for hardware keyboards

diff --git a/bVNC/build.gradle b/bVNC/build.gradle
@@ -38,12 +38,12 @@ dependencies {
     implementation project(':pubkeyGenerator')
     implementation project(':remoteClientLib:jni:libs:deps:FreeRDP:client:Android:Studio:freeRDPCore')
     implementation project(':remoteClientLib')
-    implementation group: 'androidx.appcompat', name: 'appcompat', version: '1.4.0'
+    implementation group: 'androidx.appcompat', name: 'appcompat', version: '1.4.1'
     implementation group: 'androidx.legacy', name: 'legacy-support-v4', version: '1.0.0'
     implementation group: 'androidx.vectordrawable', name: 'vectordrawable', version: '1.1.0'
-    implementation group: 'androidx.preference', name: 'preference', version: '1.1.1'
-    implementation 'net.zetetic:android-database-sqlcipher:4.2.0@aar'
-    implementation "androidx.sqlite:sqlite:2.2.0"
+    implementation group: 'androidx.preference', name: 'preference-ktx', version: '1.2.0'
+    implementation 'net.zetetic:android-database-sqlcipher:4.5.1@aar'
+    implementation "androidx.sqlite:sqlite-ktx:2.2.0"
     implementation files('libs/com.antlersoft.android.contentxml.jar')
     implementation files('libs/com.antlersoft.android.db.jar')
     implementation group: 'org.yaml', name: 'snakeyaml', version: '1.23'

diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.5.20'
+    ext.kotlin_version = '1.5.30'
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
     dependencies {
@@ -13,7 +13,7 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
 }

diff --git a/freeaRDP-app/src/main/AndroidManifest.xml b/freeaRDP-app/src/main/AndroidManifest.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.iiordanov.freeaRDP"
     android:installLocation="auto"
-    android:versionCode="115072"
-    android:versionName="v5.0.7">
+    android:versionCode="115080"
+    android:versionName="v5.0.8">
 
     <uses-permission tools:node="removeAll" />
     <uses-permission android:name="android.permission.INTERNET" />

diff --git a/freeaSPICE-app/src/main/AndroidManifest.xml b/freeaSPICE-app/src/main/AndroidManifest.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.iiordanov.freeaSPICE"
     android:installLocation="auto"
-    android:versionCode="115072"
-    android:versionName="v5.0.7">
+    android:versionCode="115080"
+    android:versionName="v5.0.8">
 
     <uses-permission tools:node="removeAll" />
     <uses-permission android:name="android.permission.INTERNET" />

diff --git a/freebVNC-app/src/main/AndroidManifest.xml b/freebVNC-app/src/main/AndroidManifest.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.iiordanov.freebVNC"
     android:installLocation="auto"
-    android:versionCode="115072"
-    android:versionName="v5.0.7">
+    android:versionCode="115080"
+    android:versionName="v5.0.8">
 
     <uses-permission tools:node="removeAll" />
     <uses-permission android:name="android.permission.INTERNET" />

diff --git a/gradle.properties b/gradle.properties
@@ -3,5 +3,6 @@ org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=512m -XX:-HeapDumpOnOutOfMemoryError -
 SDK_VERSION=21
 CUSTOM_VNC_APP_NAME=Custom VNC Viewer
 CUSTOM_VNC_APP_ICON=icon
-android.useAndroidX = true
-android.enableJetifier = true
+android.useAndroidX=true
+android.enableJetifier=true
+android.jetifier.blacklist=bcprov
diff --git a/pubkeyGenerator/build.gradle b/pubkeyGenerator/build.gradle
@@ -33,14 +33,11 @@ buildscript {
 apply plugin: "com.google.osdetector"
 
 dependencies {
-    api 'org.connectbot:sshlib:2.2.13'
-    // https://mvnrepository.com/artifact/com.madgag.spongycastle/core
-    api group: 'com.madgag.spongycastle', name: 'core', version: '1.58.0.0'
-    api group: 'com.madgag.spongycastle', name: 'prov', version: '1.58.0.0'
-    api group: 'com.madgag.spongycastle', name: 'pkix', version: '1.54.0.0'
-    api group: 'com.madgag.spongycastle', name: 'pg', version: '1.54.0.0'
+    api 'org.connectbot:sshlib:2.2.20'
+    implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.70'
+    implementation group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.70'
+    implementation group: 'org.bouncycastle', name: 'bcpg-jdk15on', version: '1.70'
     api 'net.vrallev.ecc:ecc-25519-java:1.0.3'
-    api 'io.moatwel.crypto:eddsa:0.7.0-beta'
-    // https://mvnrepository.com/artifact/net.i2p.crypto/eddsa
+    api 'io.moatwel.crypto:eddsa:0.8.1'
     api group: 'net.i2p.crypto', name: 'eddsa', version: '0.3.0'
 }
diff --git a/pubkeyGenerator/src/main/java/com/iiordanov/pubkeygenerator/PubkeyUtils.java b/pubkeyGenerator/src/main/java/com/iiordanov/pubkeygenerator/PubkeyUtils.java
@@ -35,7 +35,6 @@
 import java.security.interfaces.DSAPrivateKey;
 import java.security.interfaces.DSAPublicKey;
 import java.security.interfaces.RSAPrivateCrtKey;
-import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
 import java.security.spec.DSAPublicKeySpec;
 import java.security.spec.InvalidKeySpecException;
@@ -170,7 +169,7 @@ public static KeyPair recoverKeyPair(byte[] encoded) throws NoSuchAlgorithmExcep
 		PublicKey pub;
 		KeyFactory kf;
 		try {
-			kf = KeyFactory.getInstance(PubkeyDatabase.KEY_TYPE_RSA, new org.spongycastle.jce.provider.BouncyCastleProvider());
+			kf = KeyFactory.getInstance(PubkeyDatabase.KEY_TYPE_RSA, new org.bouncycastle.jce.provider.BouncyCastleProvider());
 			priv = kf.generatePrivate(privKeySpec);
 
 			pubKeySpec = new RSAPublicKeySpec(((RSAPrivateCrtKey) priv)
@@ -179,7 +178,7 @@ public static KeyPair recoverKeyPair(byte[] encoded) throws NoSuchAlgorithmExcep
 
 			pub = kf.generatePublic(pubKeySpec);
         } catch (ClassCastException e) {
-            kf = KeyFactory.getInstance(PubkeyDatabase.KEY_TYPE_DSA, new org.spongycastle.jce.provider.BouncyCastleProvider());
+            kf = KeyFactory.getInstance(PubkeyDatabase.KEY_TYPE_DSA, new org.bouncycastle.jce.provider.BouncyCastleProvider());
             priv = kf.generatePrivate(privKeySpec);
 
             DSAParams params = ((DSAPrivateKey) priv).getParams();
@@ -262,11 +261,11 @@ public static String convertToOpenSSHFormat(PublicKey pk, String origNickname) t
 
         if (pk instanceof RSAPublicKey) {
             String data = "ssh-rsa ";
-            data += String.valueOf(Base64.encode(RSASHA1Verify.encodeSSHRSAPublicKey((RSAPublicKey)pk)));
+            data += String.valueOf(Base64.encode(RSASHA1Verify.get().encodePublicKey(pk)));
             return data + " " + nickname;
         } else if (pk instanceof DSAPublicKey) {
             String data = "ssh-dss ";
-            data += String.valueOf(Base64.encode(DSASHA1Verify.encodeSSHDSAPublicKey((DSAPublicKey)pk)));
+            data += String.valueOf(Base64.encode(DSASHA1Verify.get().encodePublicKey(pk)));
             return data + " " + nickname;
         }