1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
From: Markus Koschany <apo@debian.org>
Date: Sat, 12 Nov 2022 17:59:56 +0100
Subject: no Conscrypt support
Forwarded: not-needed
---
.../org/apache/hc/core5/http2/ssl/ConscryptSupport.java | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/ConscryptSupport.java b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/ConscryptSupport.java
index 6e4010e..abbb0f8 100644
--- a/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/ConscryptSupport.java
+++ b/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/ssl/ConscryptSupport.java
@@ -34,7 +34,6 @@ import org.apache.hc.core5.http.ssl.TlsCiphers;
import org.apache.hc.core5.reactor.ssl.SSLSessionInitializer;
import org.apache.hc.core5.reactor.ssl.SSLSessionVerifier;
import org.apache.hc.core5.reactor.ssl.TlsDetails;
-import org.conscrypt.Conscrypt;
/**
* Conscrypt TLS support methods
@@ -52,13 +51,8 @@ public final class ConscryptSupport {
sslParameters.setCipherSuites(TlsCiphers.excludeH2Blacklisted(sslParameters.getCipherSuites()));
H2TlsSupport.setEnableRetransmissions(sslParameters, false);
final String[] appProtocols = H2TlsSupport.selectApplicationProtocols(attachment);
- if (Conscrypt.isConscrypt(sslEngine)) {
- sslEngine.setSSLParameters(sslParameters);
- Conscrypt.setApplicationProtocols(sslEngine, appProtocols);
- } else {
- sslParameters.setApplicationProtocols(appProtocols);
- sslEngine.setSSLParameters(sslParameters);
- }
+ sslParameters.setApplicationProtocols(appProtocols);
+ sslEngine.setSSLParameters(sslParameters);
if (initializer != null) {
initializer.initialize(endpoint, sslEngine);
}
@@ -68,9 +62,6 @@ public final class ConscryptSupport {
public static SSLSessionVerifier verify(final SSLSessionVerifier verifier) {
return (endpoint, sslEngine) -> {
TlsDetails tlsDetails = verifier != null ? verifier.verify(endpoint, sslEngine) : null;
- if (tlsDetails == null && Conscrypt.isConscrypt(sslEngine)) {
- tlsDetails = new TlsDetails(sslEngine.getSession(), Conscrypt.getApplicationProtocol(sslEngine));
- }
return tlsDetails;
};
}
|
