am 6b1f5824: am 94190da3: am dc6f3aaf: am 85d0fdbe: am 303b553b: Allow an external security provider to be installed
* commit '6b1f582457c907acb154f5f326aa6c7a602105c4': Allow an external security provider to be installed
This commit is contained in:
commit
6b9592b084
|
@ -138,16 +138,15 @@ public class SSLUtils {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static abstract class ExternalSecureSocketFactoryBuilder {
|
public static abstract class ExternalSecurityProviderInstaller {
|
||||||
abstract public javax.net.ssl.SSLSocketFactory createSecureSocketFactory(
|
abstract public void installIfNeeded(final Context context);
|
||||||
final Context context, final int handshakeTimeoutMillis);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ExternalSecureSocketFactoryBuilder sExternalSocketFactoryBuilder;
|
private static ExternalSecurityProviderInstaller sExternalSecurityProviderInstaller;
|
||||||
|
|
||||||
public static void setExternalSecureSocketFactoryBuilder(
|
public static void setExternalSecurityProviderInstaller (
|
||||||
ExternalSecureSocketFactoryBuilder builder) {
|
ExternalSecurityProviderInstaller installer) {
|
||||||
sExternalSocketFactoryBuilder = builder;
|
sExternalSecurityProviderInstaller = installer;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -159,6 +158,11 @@ public class SSLUtils {
|
||||||
public synchronized static javax.net.ssl.SSLSocketFactory getSSLSocketFactory(
|
public synchronized static javax.net.ssl.SSLSocketFactory getSSLSocketFactory(
|
||||||
final Context context, final HostAuth hostAuth, final KeyManager keyManager,
|
final Context context, final HostAuth hostAuth, final KeyManager keyManager,
|
||||||
final boolean insecure) {
|
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 {
|
try {
|
||||||
final KeyManager[] keyManagers = (keyManager == null ? null :
|
final KeyManager[] keyManagers = (keyManager == null ? null :
|
||||||
new KeyManager[]{keyManager});
|
new KeyManager[]{keyManager});
|
||||||
|
|
Loading…
Reference in New Issue