ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow an external security provider to be installed 

b/18001842

Change-Id: I8312fe541896e1ceeb6c5102f90bdbb0bb945151
This commit is contained in:
Martin Hibdon 2014-10-21 15:11:40 -07:00
parent a908d45ae3
commit 303b553b13
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
emailcommon/src/com/android/emailcommon/utility/SSLUtils.java
View File

@ -138,16 +138,15 @@ public class SSLUtils {
}
}
public static abstract class ExternalSecureSocketFactoryBuilder {
abstract public javax.net.ssl.SSLSocketFactory createSecureSocketFactory(
final Context context, final int handshakeTimeoutMillis);
public static abstract class ExternalSecurityProviderInstaller {
abstract public void installIfNeeded(final Context context);
}
private static ExternalSecureSocketFactoryBuilder sExternalSocketFactoryBuilder;
private static ExternalSecurityProviderInstaller sExternalSecurityProviderInstaller;
public static void setExternalSecureSocketFactoryBuilder(
ExternalSecureSocketFactoryBuilder builder) {
sExternalSocketFactoryBuilder = builder;
public static void setExternalSecurityProviderInstaller (
ExternalSecurityProviderInstaller installer) {
sExternalSecurityProviderInstaller = installer;
}
/**
@ -159,6 +158,11 @@ public class SSLUtils {
public synchronized static javax.net.ssl.SSLSocketFactory getSSLSocketFactory(
final Context context, final HostAuth hostAuth, final KeyManager keyManager,
final boolean insecure) {
// If we have an external security provider installer, then install. This will
// potentially replace the default implementation of SSLSocketFactory.
if (sExternalSecurityProviderInstaller != null) {
sExternalSecurityProviderInstaller.installIfNeeded(context);
}
try {
final KeyManager[] keyManagers = (keyManager == null ? null :
new KeyManager[]{keyManager});