This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch patch-queue/master
in repository libokhttp-java.
commit 27ed5fa9aba6b59bbc2262894c041df3b59f7157
Author: Markus Koschany <a...@debian.org>
Date: Sat Mar 3 18:20:00 2018 +0100
no Conscrypt
---
.../internal/platform/ConscryptPlatform.java | 112 ---------------------
.../java/okhttp3/internal/platform/Platform.java | 2 +-
2 files changed, 1 insertion(+), 113 deletions(-)
diff --git
a/okhttp/src/main/java/okhttp3/internal/platform/ConscryptPlatform.java
b/okhttp/src/main/java/okhttp3/internal/platform/ConscryptPlatform.java
deleted file mode 100644
index a1d77a1..0000000
--- a/okhttp/src/main/java/okhttp3/internal/platform/ConscryptPlatform.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2014 Square, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package okhttp3.internal.platform;
-
-import java.security.NoSuchAlgorithmException;
-import java.security.Provider;
-import java.util.List;
-import javax.annotation.Nullable;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.X509TrustManager;
-import okhttp3.Protocol;
-import org.conscrypt.Conscrypt;
-import org.conscrypt.OpenSSLProvider;
-
-/**
- * Platform using Conscrypt (conscrypt.org) if installed as the first Security
Provider.
- *
- * Requires org.conscrypt:conscrypt-openjdk-uber on the classpath.
- */
-public class ConscryptPlatform extends Platform {
- private ConscryptPlatform() {
- }
-
- private Provider getProvider() {
- return new OpenSSLProvider();
- }
-
- @Override public X509TrustManager trustManager(SSLSocketFactory
sslSocketFactory) {
- if (!Conscrypt.isConscrypt(sslSocketFactory)) {
- return super.trustManager(sslSocketFactory);
- }
-
- try {
- // org.conscrypt.SSLParametersImpl
- Object sp =
- readFieldOrNull(sslSocketFactory, Object.class, "sslParameters");
-
- if (sp != null) {
- return readFieldOrNull(sp, X509TrustManager.class, "x509TrustManager");
- }
-
- return null;
- } catch (Exception e) {
- throw new UnsupportedOperationException(
- "clientBuilder.sslSocketFactory(SSLSocketFactory) not supported on
Conscrypt", e);
- }
- }
-
- @Override public void configureTlsExtensions(
- SSLSocket sslSocket, String hostname, List<Protocol> protocols) {
- if (Conscrypt.isConscrypt(sslSocket)) {
- // Enable SNI and session tickets.
- if (hostname != null) {
- Conscrypt.setUseSessionTickets(sslSocket, true);
- Conscrypt.setHostname(sslSocket, hostname);
- }
-
- // Enable ALPN.
- List<String> names = Platform.alpnProtocolNames(protocols);
- Conscrypt.setApplicationProtocols(sslSocket, names.toArray(new
String[0]));
- } else {
- super.configureTlsExtensions(sslSocket, hostname, protocols);
- }
- }
-
- @Override public @Nullable String getSelectedProtocol(SSLSocket sslSocket) {
- if (Conscrypt.isConscrypt(sslSocket)) {
- return Conscrypt.getApplicationProtocol(sslSocket);
- } else {
- return super.getSelectedProtocol(sslSocket);
- }
- }
-
- @Override public SSLContext getSSLContext() {
- try {
- return SSLContext.getInstance("TLS", getProvider());
- } catch (NoSuchAlgorithmException e) {
- throw new IllegalStateException("No TLS provider", e);
- }
- }
-
- public static Platform buildIfSupported() {
- try {
- // trigger early exception over a fatal error
- Class.forName("org.conscrypt.ConscryptEngineSocket");
-
- if (!Conscrypt.isAvailable()) {
- return null;
- }
-
- Conscrypt.setUseEngineSocketByDefault(true);
- return new ConscryptPlatform();
- } catch (ClassNotFoundException e) {
- return null;
- }
- }
-}
diff --git a/okhttp/src/main/java/okhttp3/internal/platform/Platform.java
b/okhttp/src/main/java/okhttp3/internal/platform/Platform.java
index 04072f4..0aa3ad3 100644
--- a/okhttp/src/main/java/okhttp3/internal/platform/Platform.java
+++ b/okhttp/src/main/java/okhttp3/internal/platform/Platform.java
@@ -203,7 +203,7 @@ public class Platform {
}
if (isConscryptPreferred()) {
- Platform conscrypt = ConscryptPlatform.buildIfSupported();
+ Platform conscrypt = null;
if (conscrypt != null) {
return conscrypt;
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/libokhttp-java.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
