Merge remote-tracking branch 'origin/master' into feature/fluent-mapp…

…ing-of-sslfactory # Conflicts: # sslcontext-kickstart/src/main/java/nl/altindag/ssl/SSLFactory.java
Hakky54 · Dec 9, 2024 · 2f7d53f · 2f7d53f
2 parents e97dc55 + 804448b
commit 2f7d53f
Show file tree

Hide file tree

Showing 35 changed files with 232 additions and 876 deletions.
diff --git a/KEYS.txt b/KEYS.txt
@@ -0,0 +1,65 @@
+**********************************************************************************************
+**                                                                                          **
+**  Command used to export public key information: gpg --list-sigs && gpg --armor --export  **
+**                                                                                          **
+**********************************************************************************************
+
+pub   rsa4096 2019-06-20 [SC]
+      E5138A8E9F2E7E42D38B14D99AEE152CDCCEBFCB
+uid           [ unknown] Hakan Altindag <hakangoudberg@hotmail.com>
+sig 3        9AEE152CDCCEBFCB 2019-06-20  [self-signature]
+sub   rsa4096 2019-06-20 [E]
+sig          9AEE152CDCCEBFCB 2019-06-20  [self-signature]
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBF0LJ4UBEADDviIvloIaEtjAac3EHGGQtHtqKlp4uXXIgEWh1vNulzVSRpBE
+LDqDcrTowNU+CYQ3elTKa8cDrZviR7bMBju7esbVWxZu3ueMTG3IrvbDZUPYQ9Zt
+DQQr4/kDaSn/JpNiOyC815QHC5eQD9CjIRntZnxiigpIerb2PStd2v7DcziA9oK9
+8ByIVvEAWjxawI/E/Nkt1kuasoQCvdcZrhoGhPvLzI4OdCpgow8IB8kpRlO7vZGF
+ncQXuyluA2FXO0t1FHOGaPN5F+PZ0JuBH/84VWacepSO0lztopMpUtzS3eNzxUDq
+t01Q35RPgzp/DAh4lAB03XA6vo2BDzMG61CxieH8Qd+7lqXglO6y376gtuQ3H0Hk
+HoXLRn/0mExcYRxAR5li+Loib65da9nRGclIhYz5Ksy9waqzkSIU16UX/xmxo0S7
+T7OFhKexoRPsJkNPSFRgdj/Kro03WL7qqPMemJ5tjAcfbIDcI1HJH3uTmK6tlDfG
+L62Rz8LskiVjHXhLShq5KgGRB+Z6o2aW8tjy3RqBGJDRmh1pqOok3VgvfohiYukN
+VgK7oEJflq44v2ZW2T+/06iPX073TpcxGmpUKBkh4EybO6v1Crucb4+6L6c32xS0
++DDz0tw4xm320iPthut6xlaAjaUvP0BKxwrzwifImTeZUx2p/5ewydMElQARAQAB
+tCpIYWthbiBBbHRpbmRhZyA8aGFrYW5nb3VkYmVyZ0Bob3RtYWlsLmNvbT6JAk4E
+EwEIADgWIQTlE4qOny5+QtOLFNma7hUs3M6/ywUCXQsnhQIbAwULCQgHAgYVCgkI
+CwIEFgIDAQIeAQIXgAAKCRCa7hUs3M6/y/uMEACygnUhYQFBs/FU5Y4Bifbg36Wj
+Ht3OGG3lDPhldpxr3QMkIWug294qkwFCPqLy8FZm5qrSdQk9BRgZR5SkAzRIOaEf
+HwTmf42qk7w1ohNQkqrpFuw/kAAHodsI5O1K/TYojCn/E8mHiLcSG8nJ3+YUIMTQ
+ACKtTQW9/mo1BEnknRbrMqf/sM7TGV1kM7jUy5r3Izr0UediO4S4Ljoeg1GVn2Yn
+xcc7dozwBlQLWMqTbhb3mrrK8aPUU3hRCWllW2gDYuXvenK9UJ4GYzHhHtkSqPcS
+XoYaG+EX3PYKd/6eEzf9VWb+Rm3pAGIfaFufjSvCvcaQkqGR/a3szl/C5mwdEJqg
+01bRsORU3yoqoqZfVA5VJryPYQ4OKuOsjIOcaZvfN2rMjW/R4L+j81ru44gr6Q1h
+Q/dX5aau1Orkznaa5QqQ7m1xHQd9491XH5LnAgHJDW55LtGhxX8TGJ2azMMp77QH
+3ltVzIrprERPIYwVzUnqsPGFsMtSeDtVbraD5fht0FUzCspCrgxpXnpfd1Br3zEK
+k2AJ1809Idg42AkCdWU6g76wJU13rQRGSKEnXB7fnbfZZGgr6CvobyT+UdUbdw6+
+HIRkULEa01XvMevieFZIewINqDuVCckmiyM+2tRyGt7MtTomrF778+VkF15mwgvy
+a3JtGc7Q2s/k6acMNrkCDQRdCyeFARAAt8bXExmz5P03TOsLsieksKPY3ZoEgBGh
+JzIljA0+MulCeT6YawSxPSVvVDufIlGMd2suElwo152sFDRGjmjXcjOJvAPKLeO7
+RFOwFmx/sha0j+C/XZaOZTdjf8N4jLJNan0Zi6T+Dx9QUFQIRmaugqCh6md+aE6p
+BtDVFL4jdlrv7CTLmjKbEs8XaJ8i/Hs69hboYmvMLZeglJUts+c/XWAp2gP0sKiG
+Q7shYfCEL4Z3Eu35Lj+LDxd/7cGDzSApL9ymyr2Fnpa9UZUXCALTuKRbGQC+6DKH
+J9Q4EKMrOkJB83cH28bRS2PN4fgJfPYUO/SupLAZi0Y6Bs+1Bif2j29fxAyG8egl
+T7Y8nuWbU8IoG5oKQwxyvGo7VNeWUTRg/uuibcvGJeQGWHiPfidryQ+kTxmuOSfU
+i7tBVugROfGI3Y2SYT2drJglh5xTQGjR2RU2E0fGc/EEdVK5pBbk+xAeZRIicawo
+f1h5CJJFYlfwQyH0f1Ytera7MG5Ipc+d0asf/LrvHUFts31ursxIqFGupDVFfatM
+tXCXem5E3tyDGjU/7ROsXt2DKO/MeG5pSXW9mOb2o3rE5LADRx0cWGNZtxKNdY9Q
+WFtFsqVDfv/D2IpSI6cv9nmoBA2ngzwx5SNoPWOINRv2R63FRu3jeIcdWECu7iew
+qKUxgx/KnkEAEQEAAYkCNgQYAQgAIBYhBOUTio6fLn5C04sU2ZruFSzczr/LBQJd
+CyeFAhsMAAoJEJruFSzczr/L5wkQAJNrdqD7i9V3GShCVKZerGZsmEoUxxe8XGXT
+lVBiYG8i/Ka4mb2WCACvqWfbxFmDTFcdBK3VRXdtDJCMoRh0ZZbNih7P7mX9Wh73
+O92xrIBVMPCd6xtX1zwK1r127OfZS9U8hXqiQ0/4ZKmofX4dJJJwFlyZvXC4HZSA
+TfXSaYkQwtjQ2uC6LNy2+OG5B0GYWMf+aUeAHlsQRs+OQF/17cDeHLT5QaZvvrO1
+/7TRQ2YC60cl0bUOwtiUYRTri+gzk40uXGNcXBMFPnN1LxkHR5oY+r4/3svOCPw6
+rdV00E40UxRrNfUi0z3aFsm78XTRMHWidInpzkRdc/NFVsXaWZen8/+BxEGumLdX
+Ga3gZRPFCciaRTM+Z8nl7sxT0yJamipypoE36u7SAZ4DRsLWJ9sRAzy5ISWX9WmS
+niXhcBrigevhWhWtyfRMaMK1CgtmR33tR/sGxRFNdDDwWMbMHFGCNrsHwUG6Apqh
+ZlBPDJ84hLzjNvg0Js6TyFvC1m5GNJp0WwQ55HBdmdf7qI2OIkzOdFu+azzSYF64
+UPg3igy0xKsT10QKlEkgxUsoZ7BZ2mNe/yQWMNWSVqSarg7ZgI5n+6T3C+vapIAf
+TiGdFCjuQetpG9jepE/YiKKfpwDdylj97FPCW0tRh7C/l12XGy8Cs+TLEqm0vZME
+DoHgJ7xQ
+=KOH6
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/README.md b/README.md
@@ -143,7 +143,7 @@ See the [javadoc](https://sslcontext-kickstart.com/apidocs/index.html) for all t
 
 ### Acknowledgement
 I would like to thank [Cody A. Ray](https://github.com/codyaray) for his contribution to the community regarding loading multiple Keystores into the SSLContext. The limitation of the JDK is to only support one keystore for the KeyManagerFactory and only one keystore for the TrustManagerFactory.
-The code snippets which Cody has shared are now available within this library and can be found here: [CompositeX509KeyManager](sslcontext-kickstart/src/main/java/nl/altindag/ssl/keymanager/CompositeX509ExtendedKeyManager.java) and [CompositeX509TrustManager](sslcontext-kickstart/src/main/java/nl/altindag/ssl/trustmanager/CompositeX509ExtendedTrustManager.java) 
+The code snippets which Cody has shared are now available within this library and can be found here: [AggregatedX509ExtendedKeyManager](sslcontext-kickstart/src/main/java/nl/altindag/ssl/keymanager/AggregatedX509ExtendedKeyManager.java) and [AggregatedX509ExtendedTrustManager](sslcontext-kickstart/src/main/java/nl/altindag/ssl/trustmanager/AggregatedX509ExtendedTrustManager.java) 
 
 The original content can be found here:
 - [Codyaray - Java SSL with Multiple KeyStores](http://codyaray.com/2013/04/java-ssl-with-multiple-keystores)

diff --git a/pom.xml b/pom.xml
@@ -55,20 +55,20 @@
 
     <properties>
         <version.slf4j>2.0.16</version.slf4j>
-        <version.junit>5.11.2</version.junit>
+        <version.junit>5.11.3</version.junit>
         <version.assertj-core>3.26.3</version.assertj-core>
-        <version.logcaptor>2.9.3</version.logcaptor>
+        <version.logcaptor>2.10.0</version.logcaptor>
         <version.mockito>5.11.0</version.mockito>
         <version.ssl-server>1.0.6</version.ssl-server>
-        <version.byte-buddy>1.15.5</version.byte-buddy>
+        <version.byte-buddy>1.15.10</version.byte-buddy>
         <version.jacoco-maven-plugin>0.8.12</version.jacoco-maven-plugin>
-        <version.maven-surefire-plugin>3.5.1</version.maven-surefire-plugin>
-        <version.maven-fail-safe>3.5.1</version.maven-fail-safe>
+        <version.maven-surefire-plugin>3.5.2</version.maven-surefire-plugin>
+        <version.maven-fail-safe>3.5.2</version.maven-fail-safe>
         <version.maven-enforcer-plugin>3.5.0</version.maven-enforcer-plugin>
-        <version.maven-javadoc-plugin>3.10.1</version.maven-javadoc-plugin>
+        <version.maven-javadoc-plugin>3.11.1</version.maven-javadoc-plugin>
         <version.maven-source-plugin>3.3.1</version.maven-source-plugin>
         <version.license-maven-plugin>4.6</version.license-maven-plugin>
-        <version.maven-surefire-junit5-tree-reporter>1.3.0</version.maven-surefire-junit5-tree-reporter>
+        <version.maven-surefire-junit5-tree-reporter>1.4.0</version.maven-surefire-junit5-tree-reporter>
         <license.git.copyrightYears>2019</license.git.copyrightYears>
     </properties>
 

diff --git a/sslcontext-kickstart-for-apache5/pom.xml b/sslcontext-kickstart-for-apache5/pom.xml
@@ -36,7 +36,7 @@
     </developers>
 
     <properties>
-        <version.httpcomponents.httpclient5>5.4</version.httpcomponents.httpclient5>
+        <version.httpcomponents.httpclient5>5.4.1</version.httpcomponents.httpclient5>
     </properties>
 
     <dependencies>

diff --git a/...ext-kickstart-for-apache5/src/main/java/nl/altindag/ssl/apache5/util/Apache5SslUtils.java b/...ext-kickstart-for-apache5/src/main/java/nl/altindag/ssl/apache5/util/Apache5SslUtils.java
@@ -16,9 +16,7 @@
 package nl.altindag.ssl.apache5.util;
 
 import nl.altindag.ssl.SSLFactory;
-import org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory;
 import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
-import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
 import org.apache.hc.client5.http.ssl.TlsSocketStrategy;
 import org.apache.hc.core5.http.nio.ssl.TlsStrategy;
 import org.apache.hc.core5.reactor.ssl.SSLBufferMode;
@@ -30,16 +28,6 @@ public final class Apache5SslUtils {
 
     private Apache5SslUtils() {}
 
-    @Deprecated
-    public static LayeredConnectionSocketFactory toSocketFactory(SSLFactory sslFactory) {
-        return new SSLConnectionSocketFactory(
-                sslFactory.getSslContext(),
-                sslFactory.getSslParameters().getProtocols(),
-                sslFactory.getSslParameters().getCipherSuites(),
-                sslFactory.getHostnameVerifier()
-        );
-    }
-
     public static TlsStrategy toTlsStrategy(SSLFactory sslFactory) {
         return createClientTlsStrategy(sslFactory);
     }

diff --git a/sslcontext-kickstart-for-apache5/src/test/java/nl/altindag/ssl/apache5/SSLFactoryIT.java b/sslcontext-kickstart-for-apache5/src/test/java/nl/altindag/ssl/apache5/SSLFactoryIT.java
@@ -29,7 +29,7 @@
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
 import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManager;
 import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder;
-import org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory;
+import org.apache.hc.client5.http.ssl.TlsSocketStrategy;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.Method;
 import org.apache.hc.core5.http.nio.support.BasicRequestProducer;
@@ -76,9 +76,9 @@ void executeHttpsRequestWithMutualAuthentication() throws IOException {
                 .withTrustMaterial("keystore/client-server/client-one/truststore.jks", "secret".toCharArray())
                 .build();
 
-        LayeredConnectionSocketFactory socketFactory = Apache5SslUtils.toSocketFactory(sslFactoryForClient);
+        TlsSocketStrategy tlsSocketStrategy = Apache5SslUtils.toTlsSocketStrategy(sslFactoryForClient);
         PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder.create()
-                .setSSLSocketFactory(socketFactory)
+                .setTlsSocketStrategy(tlsSocketStrategy)
                 .build();
 
         HttpClient httpClient = HttpClients.custom()

diff --git a/...ckstart-for-apache5/src/test/java/nl/altindag/ssl/apache5/util/Apache5SslUtilsShould.java b/...ckstart-for-apache5/src/test/java/nl/altindag/ssl/apache5/util/Apache5SslUtilsShould.java
@@ -17,7 +17,6 @@
 
 import nl.altindag.ssl.SSLFactory;
 import nl.altindag.ssl.util.KeyStoreUtils;
-import org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory;
 import org.apache.hc.client5.http.ssl.TlsSocketStrategy;
 import org.apache.hc.core5.http.nio.ssl.TlsStrategy;
 import org.junit.jupiter.api.Test;
@@ -38,49 +37,6 @@ class Apache5SslUtilsShould {
     private static final char[] TRUSTSTORE_PASSWORD = "secret".toCharArray();
     private static final String KEYSTORE_LOCATION = "keystore/";
 
-    @Test
-    void createLayeredConnectionSocketFactoryWithTrustMaterial() {
-        KeyStore trustStore = KeyStoreUtils.loadKeyStore(KEYSTORE_LOCATION + TRUSTSTORE_FILE_NAME, TRUSTSTORE_PASSWORD);
-
-        SSLFactory sslFactory = SSLFactory.builder()
-                .withTrustMaterial(trustStore)
-                .build();
-
-        assertThat(sslFactory.getSslContext()).isNotNull();
-
-        assertThat(sslFactory.getKeyManager()).isNotPresent();
-
-        assertThat(sslFactory.getTrustManager()).isNotNull();
-        assertThat(sslFactory.getTrustedCertificates()).isNotEmpty();
-        assertThat(sslFactory.getTrustManager()).isNotNull();
-        assertThat(sslFactory.getHostnameVerifier()).isNotNull();
-
-        LayeredConnectionSocketFactory socketFactory = Apache5SslUtils.toSocketFactory(sslFactory);
-        assertThat(socketFactory).isNotNull();
-    }
-
-    @Test
-    void createLayeredConnectionSocketFactoryWithIdentityMaterialAndTrustMaterial() {
-        KeyStore identity = KeyStoreUtils.loadKeyStore(KEYSTORE_LOCATION + IDENTITY_FILE_NAME, IDENTITY_PASSWORD);
-        KeyStore trustStore = KeyStoreUtils.loadKeyStore(KEYSTORE_LOCATION + TRUSTSTORE_FILE_NAME, TRUSTSTORE_PASSWORD);
-
-        SSLFactory sslFactory = SSLFactory.builder()
-                .withIdentityMaterial(identity, IDENTITY_PASSWORD)
-                .withTrustMaterial(trustStore)
-                .build();
-
-        assertThat(sslFactory.getSslContext()).isNotNull();
-        assertThat(sslFactory.getKeyManager()).isPresent();
-
-        assertThat(sslFactory.getTrustManager()).isNotNull();
-        assertThat(sslFactory.getTrustedCertificates()).isNotEmpty();
-        assertThat(sslFactory.getTrustManager()).isNotNull();
-        assertThat(sslFactory.getHostnameVerifier()).isNotNull();
-
-        LayeredConnectionSocketFactory socketFactory = Apache5SslUtils.toSocketFactory(sslFactory);
-        assertThat(socketFactory).isNotNull();
-    }
-
     @Test
     void createTlsStrategy() {
         KeyStore identity = KeyStoreUtils.loadKeyStore(KEYSTORE_LOCATION + IDENTITY_FILE_NAME, IDENTITY_PASSWORD);

diff --git a/sslcontext-kickstart-for-netty/pom.xml b/sslcontext-kickstart-for-netty/pom.xml
@@ -36,8 +36,8 @@
     </developers>
 
     <properties>
-        <version.netty-handler>4.1.114.Final</version.netty-handler>
-        <version.reactor-netty>1.1.23</version.reactor-netty>
+        <version.netty-handler>4.1.115.Final</version.netty-handler>
+        <version.reactor-netty>1.2.0</version.reactor-netty>
     </properties>
 
     <dependencies>

diff --git a/sslcontext-kickstart-for-pem/pom.xml b/sslcontext-kickstart-for-pem/pom.xml
@@ -36,7 +36,7 @@
     </developers>
 
     <properties>
-        <version.bouncy-castle>1.78.1</version.bouncy-castle>
+        <version.bouncy-castle>1.79</version.bouncy-castle>
     </properties>
 
     <dependencies>

diff --git a/sslcontext-kickstart-for-pem/src/main/java/nl/altindag/ssl/pem/util/PemFormatter.java b/sslcontext-kickstart-for-pem/src/main/java/nl/altindag/ssl/pem/util/PemFormatter.java
@@ -30,13 +30,15 @@ final class PemFormatter {
 
     private static final Pattern PEM_PATTERN = Pattern.compile("(-----BEGIN.*?-----)(.*?)(-----END.*?-----)");
     private static final String INNER_ENCRYPTED_HEADER = "Proc-Type: 4,ENCRYPTED";
-    private static final Map<String, Integer> ENCRYPTION_ALGORITHMS_AND_SALT_TO_FIELD_LENGTH = new HashMap<>();
+    private static final Map<String, Integer> ENCRYPTION_ALGORITHMS_AND_SALT_TO_FIELD_LENGTH;
     private static final String MAX_64_CHARACTER_LINE_SPLITTER = "(?<=\\G.{64})";
     private static final String EMPTY = "";
 
     static {
-        ENCRYPTION_ALGORITHMS_AND_SALT_TO_FIELD_LENGTH.put("AES-256-CBC", 54);
-        ENCRYPTION_ALGORITHMS_AND_SALT_TO_FIELD_LENGTH.put("DES-EDE3-CBC", 39);
+        Map<String, Integer> encryptionAlgorithmsAndSaltToFieldLength = new HashMap<>();
+        encryptionAlgorithmsAndSaltToFieldLength.put("AES-256-CBC", 54);
+        encryptionAlgorithmsAndSaltToFieldLength.put("DES-EDE3-CBC", 39);
+        ENCRYPTION_ALGORITHMS_AND_SALT_TO_FIELD_LENGTH = Collections.unmodifiableMap(encryptionAlgorithmsAndSaltToFieldLength);
     }
 
     private PemFormatter() {}

diff --git a/sslcontext-kickstart-for-pem/src/main/java/nl/altindag/ssl/pem/util/PemType.java b/sslcontext-kickstart-for-pem/src/main/java/nl/altindag/ssl/pem/util/PemType.java
@@ -23,9 +23,10 @@
 import org.bouncycastle.openssl.X509TrustedCertificateBlock;
 import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo;
 
-import java.util.Arrays;
 import java.util.List;
 
+import static nl.altindag.ssl.util.internal.CollectionUtils.toUnmodifiableList;
+
 enum PemType {
 
     CERTIFICATE(X509CertificateHolder.class, X509TrustedCertificateBlock.class),
@@ -34,7 +35,7 @@ enum PemType {
     private final List<Class<?>> supportedTypes;
 
     PemType(Class<?>... classes) {
-        this.supportedTypes = Arrays.asList(classes);
+        this.supportedTypes = toUnmodifiableList(classes);
     }
 
     static PemType from(Object object) {

diff --git a/sslcontext-kickstart/pom.xml b/sslcontext-kickstart/pom.xml
@@ -36,10 +36,10 @@
     </developers>
 
     <properties>
-        <version.maven-site-plugin>3.20.0</version.maven-site-plugin>
-        <version.maven-project-info-reports-plugin>3.7.0</version.maven-project-info-reports-plugin>
-        <version.maven-surefire-report-plugin>3.5.1</version.maven-surefire-report-plugin>
-        <version.maven-jxr-plugin>3.5.0</version.maven-jxr-plugin>
+        <version.maven-site-plugin>3.21.0</version.maven-site-plugin>
+        <version.maven-project-info-reports-plugin>3.8.0</version.maven-project-info-reports-plugin>
+        <version.maven-surefire-report-plugin>3.5.2</version.maven-surefire-report-plugin>
+        <version.maven-jxr-plugin>3.6.0</version.maven-jxr-plugin>
     </properties>
 
     <dependencies>

diff --git a/sslcontext-kickstart/src/main/java/module-info.java b/sslcontext-kickstart/src/main/java/module-info.java
@@ -20,7 +20,6 @@
     exports nl.altindag.ssl;
     exports nl.altindag.ssl.exception;
     exports nl.altindag.ssl.model;
-    exports nl.altindag.ssl.trustmanager.validator;
     exports nl.altindag.ssl.trustmanager.trustoptions;
     exports nl.altindag.ssl.util;
     exports nl.altindag.ssl.sslcontext to java.base;

diff --git a/sslcontext-kickstart/src/main/java/nl/altindag/ssl/SSLFactory.java b/sslcontext-kickstart/src/main/java/nl/altindag/ssl/SSLFactory.java
@@ -24,11 +24,8 @@
 import nl.altindag.ssl.sslcontext.FenixSSLContext;
 import nl.altindag.ssl.trustmanager.trustoptions.TrustAnchorTrustOptions;
 import nl.altindag.ssl.trustmanager.trustoptions.TrustStoreTrustOptions;
-import nl.altindag.ssl.trustmanager.validator.ChainAndAuthTypeValidator;
-import nl.altindag.ssl.trustmanager.validator.ChainAndAuthTypeWithSSLEngineValidator;
-import nl.altindag.ssl.trustmanager.validator.ChainAndAuthTypeWithSocketValidator;
-import nl.altindag.ssl.util.Function;
 import nl.altindag.ssl.util.HostnameVerifierUtils;
+import nl.altindag.ssl.util.Function;
 import nl.altindag.ssl.util.KeyManagerUtils;
 import nl.altindag.ssl.util.KeyStoreUtils;
 import nl.altindag.ssl.util.Box;
@@ -74,7 +71,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.function.BiPredicate;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -210,9 +206,6 @@ public static class Builder {
         private int sessionTimeoutInSeconds = -1;
         private int sessionCacheSizeInBytes = -1;
 
-        private ChainAndAuthTypeValidator chainAndAuthTypeValidator = null;
-        private ChainAndAuthTypeWithSocketValidator chainAndAuthTypeWithSocketValidator = null;
-        private ChainAndAuthTypeWithSSLEngineValidator chainAndAuthTypeWithSSLEngineValidator = null;
         private Predicate<TrustManagerParameters> trustManagerParametersValidator = null;
         private boolean shouldTrustedCertificatesBeConcealed = false;
 
@@ -581,15 +574,6 @@ public Builder withInflatableTrustMaterial() {
             return this;
         }
 
-        @Deprecated
-        public Builder withInflatableTrustMaterial(Path trustStorePath,
-                                                   char[] trustStorePassword,
-                                                   String trustStoreType,
-                                                   BiPredicate<X509Certificate[], String> certificateAndAuthTypeTrustPredicate) {
-            trustManagers.add(TrustManagerUtils.createInflatableTrustManager(trustStorePath, trustStorePassword, trustStoreType, certificateAndAuthTypeTrustPredicate));
-            return this;
-        }
-
         public Builder withInflatableTrustMaterial(Path trustStorePath,
                                                    char[] trustStorePassword,
                                                    String trustStoreType,
@@ -758,24 +742,6 @@ public Builder withTrustingAllCertificatesWithoutValidation() {
             return this;
         }
 
-        @Deprecated
-        public Builder withTrustEnhancer(ChainAndAuthTypeValidator validator) {
-            this.chainAndAuthTypeValidator = validator;
-            return this;
-        }
-
-        @Deprecated
-        public Builder withTrustEnhancer(ChainAndAuthTypeWithSocketValidator validator) {
-            this.chainAndAuthTypeWithSocketValidator = validator;
-            return this;
-        }
-
-        @Deprecated
-        public Builder withTrustEnhancer(ChainAndAuthTypeWithSSLEngineValidator validator) {
-            this.chainAndAuthTypeWithSSLEngineValidator = validator;
-            return this;
-        }
-
         public Builder withTrustEnhancer(Predicate<TrustManagerParameters> validator) {
             this.trustManagerParametersValidator = validator;
             return this;
@@ -856,9 +822,6 @@ private X509ExtendedTrustManager createTrustManager() {
                     .withLoggingTrustManager(loggingTrustManagerEnabled)
                     .withTrustEnhancer(trustManagerParametersValidator)
                     .withTrustEnhancer(shouldTrustedCertificatesBeConcealed)
-                    .withTrustEnhancer(chainAndAuthTypeValidator)
-                    .withTrustEnhancer(chainAndAuthTypeWithSocketValidator)
-                    .withTrustEnhancer(chainAndAuthTypeWithSSLEngineValidator)
                     .build();
         }