grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

okhttp: Add SslGuard to list of allowed security providers. See internal issue b/116007005 for more details.

This commit is contained in:
Grant Oakley 2018-10-09 11:33:41 -07:00 committed by Eric Anderson
parent c0a3c4ab75
commit 4ce9c0492d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/Platform.java vendored
View File

@ -89,7 +89,8 @@ public class Platform {
"com.google.android.gms.org.conscrypt.OpenSSLProvider", "com.google.android.gms.org.conscrypt.OpenSSLProvider",
"org.conscrypt.OpenSSLProvider", "org.conscrypt.OpenSSLProvider",
"com.android.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(); private static final Platform PLATFORM = findPlatform();
@ -185,7 +186,8 @@ public class Platform {
if (GrpcUtil.IS_RESTRICTED_APPENGINE) { if (GrpcUtil.IS_RESTRICTED_APPENGINE) {
tlsExtensionType = TlsExtensionType.ALPN_AND_NPN; tlsExtensionType = TlsExtensionType.ALPN_AND_NPN;
} else if (androidOrAppEngineProvider.getName().equals("GmsCore_OpenSSL") } 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; tlsExtensionType = TlsExtensionType.ALPN_AND_NPN;
} else if (isAtLeastAndroid5()) { } else if (isAtLeastAndroid5()) {
tlsExtensionType = TlsExtensionType.ALPN_AND_NPN; tlsExtensionType = TlsExtensionType.ALPN_AND_NPN;