Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,7 @@ dependencies {
annotationProcessor "org.projectlombok:lombok:1.18.8"

ktlint "com.pinterest:ktlint:0.34.2"
implementation 'org.conscrypt:conscrypt-android:2.2.1'

// dependencies for local unit tests
testImplementation 'junit:junit:4.12'
Expand Down
27 changes: 27 additions & 0 deletions src/main/java/com/owncloud/android/MainApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,21 @@
import com.owncloud.android.utils.ReceiversHelper;
import com.owncloud.android.utils.SecurityUtils;

import org.conscrypt.Conscrypt;

import java.lang.reflect.Method;
import java.security.NoSuchAlgorithmException;
import java.security.Security;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;

import javax.inject.Inject;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;

import androidx.annotation.RequiresApi;
import androidx.annotation.StringRes;
Expand Down Expand Up @@ -218,6 +225,8 @@ protected void attachBaseContext(Context base) {
public void onCreate() {
super.onCreate();

insertConscrypt();

SecurityKeyManager securityKeyManager = SecurityKeyManager.getInstance();
SecurityKeyManagerConfig config = new SecurityKeyManagerConfig.Builder()
.setEnableDebugLogging(BuildConfig.DEBUG)
Expand Down Expand Up @@ -345,7 +354,25 @@ public static void initContactsBackup(UserAccountManager accountManager) {
ContactsPreferenceActivity.startContactBackupJob(account);
}
}
}

private void insertConscrypt() {
Security.insertProviderAt(Conscrypt.newProvider(), 1);

try {
Conscrypt.Version version = Conscrypt.version();
Log_OC.i(TAG, "Using Conscrypt/"
+ version.major()
+ "."
+ version.minor()
+ "." + version.patch()
+ " for TLS");
SSLEngine engine = SSLContext.getDefault().createSSLEngine();
Log_OC.i(TAG, "Enabled protocols: " + Arrays.toString(engine.getEnabledProtocols()) + " }");
Log_OC.i(TAG, "Enabled ciphers: " + Arrays.toString(engine.getEnabledCipherSuites()) + " }");
} catch (NoSuchAlgorithmException e) {
Log_OC.e(TAG, e.getMessage());
}
}

@SuppressLint("ApplySharedPref") // commit is done on purpose to write immediately
Expand Down