Skip to content

Commit 4ce9c04

Browse files
groakleyejona86
authored andcommitted
okhttp: Add SslGuard to list of allowed security providers. See internal issue b/116007005 for more details.
1 parent c0a3c4a commit 4ce9c04

File tree

1 file changed

+4
-2
lines changed
  • okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal

1 file changed

+4
-2
lines changed

okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/Platform.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ public enum TlsExtensionType {
8989
"com.google.android.gms.org.conscrypt.OpenSSLProvider",
9090
"org.conscrypt.OpenSSLProvider",
9191
"com.android.org.conscrypt.OpenSSLProvider",
92-
"org.apache.harmony.xnet.provider.jsse.OpenSSLProvider"
92+
"org.apache.harmony.xnet.provider.jsse.OpenSSLProvider",
93+
"com.google.android.libraries.stitch.sslguard.SslGuardProvider"
9394
};
9495

9596
private static final Platform PLATFORM = findPlatform();
@@ -185,7 +186,8 @@ private static Platform findPlatform() {
185186
if (GrpcUtil.IS_RESTRICTED_APPENGINE) {
186187
tlsExtensionType = TlsExtensionType.ALPN_AND_NPN;
187188
} else if (androidOrAppEngineProvider.getName().equals("GmsCore_OpenSSL")
188-
|| androidOrAppEngineProvider.getName().equals("Conscrypt")) {
189+
|| androidOrAppEngineProvider.getName().equals("Conscrypt")
190+
|| androidOrAppEngineProvider.getName().equals("Ssl_Guard")) {
189191
tlsExtensionType = TlsExtensionType.ALPN_AND_NPN;
190192
} else if (isAtLeastAndroid5()) {
191193
tlsExtensionType = TlsExtensionType.ALPN_AND_NPN;

0 commit comments

Comments
 (0)