diff options
| author | Grant Oakley <groakley@gmail.com> | 2018-10-09 11:33:41 -0700 |
|---|---|---|
| committer | Eric Anderson <ejona@google.com> | 2018-10-10 11:39:10 -0700 |
| commit | 4ce9c0492d0d03731d7ab8023f95ea562ee0d5e2 (patch) | |
| tree | 64071ac94f1b8fec156f8093b0c363f7b3f77824 /okhttp | |
| parent | c0a3c4ab754b68ea65ddb72c1cffde5bb981e44b (diff) | |
| download | grpc-grpc-java-4ce9c0492d0d03731d7ab8023f95ea562ee0d5e2.tar.gz | |
okhttp: Add SslGuard to list of allowed security providers. See internal issue b/116007005 for more details.
Diffstat (limited to 'okhttp')
| -rw-r--r-- | okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/Platform.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/Platform.java b/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/Platform.java index 51244c902..2610932a5 100644 --- a/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/Platform.java +++ b/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/Platform.java @@ -89,7 +89,8 @@ public class Platform { "com.google.android.gms.org.conscrypt.OpenSSLProvider", "org.conscrypt.OpenSSLProvider", "com.android.org.conscrypt.OpenSSLProvider", - "org.apache.harmony.xnet.provider.jsse.OpenSSLProvider" + "org.apache.harmony.xnet.provider.jsse.OpenSSLProvider", + "com.google.android.libraries.stitch.sslguard.SslGuardProvider" }; private static final Platform PLATFORM = findPlatform(); @@ -185,7 +186,8 @@ public class Platform { if (GrpcUtil.IS_RESTRICTED_APPENGINE) { tlsExtensionType = TlsExtensionType.ALPN_AND_NPN; } else if (androidOrAppEngineProvider.getName().equals("GmsCore_OpenSSL") - || androidOrAppEngineProvider.getName().equals("Conscrypt")) { + || androidOrAppEngineProvider.getName().equals("Conscrypt") + || androidOrAppEngineProvider.getName().equals("Ssl_Guard")) { tlsExtensionType = TlsExtensionType.ALPN_AND_NPN; } else if (isAtLeastAndroid5()) { tlsExtensionType = TlsExtensionType.ALPN_AND_NPN; |