hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1631693 - in /httpcomponents/httpcore/trunk/httpcore/src: main/java/org/apache/http/ssl/ test/java/org/apache/http/ssl/ test/resources/ test/resources/CA/
Date Tue, 14 Oct 2014 09:25:14 GMT
Author: olegk
Date: Tue Oct 14 09:25:13 2014
New Revision: 1631693

URL: http://svn.apache.org/r1631693
Log:
Improved SSL context setup tests

Added:
    httpcomponents/httpcore/trunk/httpcore/src/test/resources/CA/
    httpcomponents/httpcore/trunk/httpcore/src/test/resources/CA/ca-cert.pem
    httpcomponents/httpcore/trunk/httpcore/src/test/resources/CA/ca-key.pem
    httpcomponents/httpcore/trunk/httpcore/src/test/resources/CA/openssl.cnf
    httpcomponents/httpcore/trunk/httpcore/src/test/resources/test-client.keystore
    httpcomponents/httpcore/trunk/httpcore/src/test/resources/test-server.keystore
Removed:
    httpcomponents/httpcore/trunk/httpcore/src/test/resources/hc-test-1.truststore
    httpcomponents/httpcore/trunk/httpcore/src/test/resources/hc-test-2.truststore
Modified:
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/ssl/SSLContextBuilder.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/ssl/TestSSLContextBuilder.java

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/ssl/SSLContextBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/ssl/SSLContextBuilder.java?rev=1631693&r1=1631692&r2=1631693&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/ssl/SSLContextBuilder.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/ssl/SSLContextBuilder.java
Tue Oct 14 09:25:13 2014
@@ -57,6 +57,7 @@ import javax.net.ssl.X509KeyManager;
 import javax.net.ssl.X509TrustManager;
 
 import org.apache.http.annotation.NotThreadSafe;
+import org.apache.http.util.Args;
 
 /**
  * Builder for {@link javax.net.ssl.SSLContext} instances.
@@ -135,7 +136,9 @@ public class SSLContextBuilder {
 
     public SSLContextBuilder loadTrustMaterial(
             final File file,
-            final char[] storePassword) throws NoSuchAlgorithmException, KeyStoreException,
CertificateException, IOException {
+            final char[] storePassword,
+            final TrustStrategy trustStrategy) throws NoSuchAlgorithmException, KeyStoreException,
CertificateException, IOException {
+        Args.notNull(file, "Truststore file");
         final KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
         final FileInputStream instream = new FileInputStream(file);
         try {
@@ -143,7 +146,13 @@ public class SSLContextBuilder {
         } finally {
             instream.close();
         }
-        return loadTrustMaterial(trustStore, null);
+        return loadTrustMaterial(trustStore, trustStrategy);
+    }
+
+    public SSLContextBuilder loadTrustMaterial(
+            final File file,
+            final char[] storePassword) throws NoSuchAlgorithmException, KeyStoreException,
CertificateException, IOException {
+        return loadTrustMaterial(file, storePassword, null);
     }
 
     public SSLContextBuilder loadTrustMaterial(
@@ -153,7 +162,9 @@ public class SSLContextBuilder {
 
     public SSLContextBuilder loadTrustMaterial(
             final URL url,
-            final char[] storePassword) throws NoSuchAlgorithmException, KeyStoreException,
CertificateException, IOException {
+            final char[] storePassword,
+            final TrustStrategy trustStrategy) throws NoSuchAlgorithmException, KeyStoreException,
CertificateException, IOException {
+        Args.notNull(url, "Truststore URL");
         final KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
         final InputStream instream = url.openStream();
         try {
@@ -161,20 +172,53 @@ public class SSLContextBuilder {
         } finally {
             instream.close();
         }
-        return loadTrustMaterial(trustStore, null);
+        return loadTrustMaterial(trustStore, trustStrategy);
+    }
+
+    public SSLContextBuilder loadTrustMaterial(
+            final URL url,
+            final char[] storePassword) throws NoSuchAlgorithmException, KeyStoreException,
CertificateException, IOException {
+        return loadTrustMaterial(url, storePassword, null);
     }
 
     public SSLContextBuilder loadKeyMaterial(
             final KeyStore keystore,
-            final char[] keyPassword) throws NoSuchAlgorithmException, KeyStoreException,
UnrecoverableKeyException {
-        loadKeyMaterial(keystore, keyPassword, null);
+            final char[] keyPassword,
+            final PrivateKeyStrategy aliasStrategy)
+            throws NoSuchAlgorithmException, KeyStoreException, UnrecoverableKeyException
{
+        final KeyManagerFactory kmfactory = KeyManagerFactory.getInstance(
+                KeyManagerFactory.getDefaultAlgorithm());
+        kmfactory.init(keystore, keyPassword);
+        final KeyManager[] kms =  kmfactory.getKeyManagers();
+        if (kms != null) {
+            if (aliasStrategy != null) {
+                for (int i = 0; i < kms.length; i++) {
+                    final KeyManager km = kms[i];
+                    if (km instanceof X509KeyManager) {
+                        kms[i] = new KeyManagerDelegate(
+                                (X509KeyManager) km, aliasStrategy);
+                    }
+                }
+            }
+            for (final KeyManager km : kms) {
+                keymanagers.add(km);
+            }
+        }
         return this;
     }
 
     public SSLContextBuilder loadKeyMaterial(
+            final KeyStore keystore,
+            final char[] keyPassword) throws NoSuchAlgorithmException, KeyStoreException,
UnrecoverableKeyException {
+        return loadKeyMaterial(keystore, keyPassword, null);
+    }
+
+    public SSLContextBuilder loadKeyMaterial(
             final File file,
             final char[] storePassword,
-            final char[] keyPassword) throws NoSuchAlgorithmException, KeyStoreException,
UnrecoverableKeyException, CertificateException, IOException {
+            final char[] keyPassword,
+            final PrivateKeyStrategy aliasStrategy) throws NoSuchAlgorithmException, KeyStoreException,
UnrecoverableKeyException, CertificateException, IOException {
+        Args.notNull(file, "Keystore file");
         final KeyStore identityStore = KeyStore.getInstance(KeyStore.getDefaultType());
         final FileInputStream instream = new FileInputStream(file);
         try {
@@ -182,14 +226,22 @@ public class SSLContextBuilder {
         } finally {
             instream.close();
         }
-        loadKeyMaterial(identityStore, keyPassword, null);
-        return this;
+        return loadKeyMaterial(identityStore, keyPassword, aliasStrategy);
     }
 
     public SSLContextBuilder loadKeyMaterial(
-            final URL url,
+            final File file,
             final char[] storePassword,
             final char[] keyPassword) throws NoSuchAlgorithmException, KeyStoreException,
UnrecoverableKeyException, CertificateException, IOException {
+        return loadKeyMaterial(file, storePassword, keyPassword, null);
+    }
+
+    public SSLContextBuilder loadKeyMaterial(
+            final URL url,
+            final char[] storePassword,
+            final char[] keyPassword,
+            final PrivateKeyStrategy aliasStrategy) throws NoSuchAlgorithmException, KeyStoreException,
UnrecoverableKeyException, CertificateException, IOException {
+        Args.notNull(url, "Keystore URL");
         final KeyStore identityStore = KeyStore.getInstance(KeyStore.getDefaultType());
         final InputStream instream = url.openStream();
         try {
@@ -197,34 +249,14 @@ public class SSLContextBuilder {
         } finally {
             instream.close();
         }
-        loadKeyMaterial(identityStore, keyPassword, null);
-        return this;
+        return loadKeyMaterial(identityStore, keyPassword, aliasStrategy);
     }
 
     public SSLContextBuilder loadKeyMaterial(
-            final KeyStore keystore,
-            final char[] keyPassword,
-            final PrivateKeyStrategy aliasStrategy)
-            throws NoSuchAlgorithmException, KeyStoreException, UnrecoverableKeyException
{
-        final KeyManagerFactory kmfactory = KeyManagerFactory.getInstance(
-                KeyManagerFactory.getDefaultAlgorithm());
-        kmfactory.init(keystore, keyPassword);
-        final KeyManager[] kms =  kmfactory.getKeyManagers();
-        if (kms != null) {
-            if (aliasStrategy != null) {
-                for (int i = 0; i < kms.length; i++) {
-                    final KeyManager km = kms[i];
-                    if (km instanceof X509KeyManager) {
-                        kms[i] = new KeyManagerDelegate(
-                                (X509KeyManager) km, aliasStrategy);
-                    }
-                }
-            }
-            for (final KeyManager km : kms) {
-                keymanagers.add(km);
-            }
-        }
-        return this;
+            final URL url,
+            final char[] storePassword,
+            final char[] keyPassword) throws NoSuchAlgorithmException, KeyStoreException,
UnrecoverableKeyException, CertificateException, IOException {
+        return loadKeyMaterial(url, storePassword, keyPassword, null);
     }
 
     public SSLContext build() throws NoSuchAlgorithmException, KeyManagementException {

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/ssl/TestSSLContextBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/ssl/TestSSLContextBuilder.java?rev=1631693&r1=1631692&r2=1631693&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/ssl/TestSSLContextBuilder.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/ssl/TestSSLContextBuilder.java
Tue Oct 14 09:25:13 2014
@@ -27,13 +27,34 @@
 
 package org.apache.http.ssl;
 
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
 import java.net.URL;
 import java.security.KeyStore;
+import java.security.Principal;
 import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 
 import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.net.ssl.SSLServerSocket;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
 
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -42,6 +63,17 @@ import org.junit.Test;
  */
 public class TestSSLContextBuilder {
 
+    private ExecutorService executorService;
+
+    @After
+    public void cleanup() throws Exception {
+        if (this.executorService != null) {
+            this.executorService.shutdown();
+            this.executorService.awaitTermination(5, TimeUnit.SECONDS);
+        }
+    }
+
+
     @Test
     public void testBuildDefault() throws Exception {
         new SSLContextBuilder().build();
@@ -71,20 +103,6 @@ public class TestSSLContextBuilder {
     }
 
     @Test
-    public void testLoadTrustMultipleMaterial() throws Exception {
-        final URL resource1 = getClass().getResource("/hc-test-1.truststore");
-        final URL resource2 = getClass().getResource("/hc-test-2.truststore");
-        final String storePassword = "nopassword";
-        final SSLContext sslContext = SSLContextBuilder.create()
-                .loadTrustMaterial(resource1, storePassword.toCharArray())
-                .loadTrustMaterial(resource2, storePassword.toCharArray())
-                .build();
-        Assert.assertNotNull(sslContext);
-        final SSLSocketFactory socketFactory = sslContext.getSocketFactory();
-        Assert.assertNotNull(socketFactory);
-    }
-
-    @Test
     public void testKeyWithAlternatePassword() throws Exception {
         final URL resource1 = getClass().getResource("/test-keypasswd.keystore");
         final String storePassword = "nopassword";
@@ -109,4 +127,395 @@ public class TestSSLContextBuilder {
                 .build();
     }
 
+    @Test
+    public void testSSLHanskshakeServerTrusted() throws Exception {
+        final URL resource1 = getClass().getResource("/test.keystore");
+        final String storePassword = "nopassword";
+        final String keyPassword = "nopassword";
+        final SSLContext serverSslContext = SSLContextBuilder.create()
+                .loadKeyMaterial(resource1, storePassword.toCharArray(), keyPassword.toCharArray())
+                .build();
+        Assert.assertNotNull(serverSslContext);
+        final SSLContext clientSslContext = SSLContextBuilder.create()
+                .loadTrustMaterial(resource1, storePassword.toCharArray())
+                .build();
+        Assert.assertNotNull(clientSslContext);
+        final ServerSocket serverSocket = serverSslContext.getServerSocketFactory().createServerSocket();
+        serverSocket.bind(new InetSocketAddress(0));
+
+        this.executorService = Executors.newSingleThreadExecutor();
+        final Future<Boolean> future = this.executorService.submit(new Callable<Boolean>()
{
+            @Override
+            public Boolean call() throws Exception {
+                final Socket socket = serverSocket.accept();
+                try {
+                    final OutputStream outputStream = socket.getOutputStream();
+                    outputStream.write(new byte[]{'H', 'i'});
+                    outputStream.flush();
+                } finally {
+                    socket.close();
+                }
+                return Boolean.TRUE;
+            }
+        });
+
+        final int localPort = serverSocket.getLocalPort();
+        final Socket clientSocket = clientSslContext.getSocketFactory().createSocket();
+        try {
+            clientSocket.connect(new InetSocketAddress("localhost", localPort), 5000);
+            final InputStream inputStream = clientSocket.getInputStream();
+            Assert.assertEquals('H', inputStream.read());
+            Assert.assertEquals('i', inputStream.read());
+            Assert.assertEquals(-1, inputStream.read());
+        } finally {
+            clientSocket.close();
+        }
+
+        final Boolean result = future.get(5, TimeUnit.SECONDS);
+        Assert.assertNotNull(result);
+    }
+
+    @Test(expected = SSLHandshakeException.class)
+    public void testSSLHanskshakeServerNotTrusted() throws Exception {
+        final URL resource1 = getClass().getResource("/test-server.keystore");
+        final String storePassword = "nopassword";
+        final String keyPassword = "nopassword";
+        final SSLContext serverSslContext = SSLContextBuilder.create()
+                .loadKeyMaterial(resource1, storePassword.toCharArray(), keyPassword.toCharArray())
+                .build();
+        Assert.assertNotNull(serverSslContext);
+        final URL resource2 = getClass().getResource("/test.keystore");
+        final SSLContext clientSslContext = SSLContextBuilder.create()
+                .loadTrustMaterial(resource2, storePassword.toCharArray())
+                .build();
+        Assert.assertNotNull(clientSslContext);
+        final ServerSocket serverSocket = serverSslContext.getServerSocketFactory().createServerSocket();
+        serverSocket.bind(new InetSocketAddress(0));
+
+        this.executorService = Executors.newSingleThreadExecutor();
+        this.executorService.submit(new Callable<Boolean>() {
+            @Override
+            public Boolean call() throws Exception {
+                final SSLSocket socket = (SSLSocket) serverSocket.accept();
+                try {
+                    socket.getSession();
+                } finally {
+                    socket.close();
+                }
+                return Boolean.FALSE;
+            }
+        });
+        final int localPort = serverSocket.getLocalPort();
+        final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket();
+        try {
+            clientSocket.connect(new InetSocketAddress("localhost", localPort), 5000);
+            clientSocket.startHandshake();
+        } finally {
+            clientSocket.close();
+        }
+    }
+
+    @Test
+    public void testSSLHanskshakeServerCustomTrustStrategy() throws Exception {
+        final URL resource1 = getClass().getResource("/test-server.keystore");
+        final String storePassword = "nopassword";
+        final String keyPassword = "nopassword";
+        final SSLContext serverSslContext = SSLContextBuilder.create()
+                .loadKeyMaterial(resource1, storePassword.toCharArray(), keyPassword.toCharArray())
+                .build();
+        Assert.assertNotNull(serverSslContext);
+
+        final AtomicReference<X509Certificate[]> certChainRef = new AtomicReference<X509Certificate[]>();
+
+        final TrustStrategy trustStrategy = new TrustStrategy() {
+
+            @Override
+            public boolean isTrusted(
+                    final X509Certificate[] chain, final String authType) throws CertificateException
{
+                certChainRef.set(chain);
+                return true;
+            }
+
+        };
+
+        final SSLContext clientSslContext = SSLContextBuilder.create()
+                .loadTrustMaterial(trustStrategy)
+                .build();
+
+        Assert.assertNotNull(clientSslContext);
+        final ServerSocket serverSocket = serverSslContext.getServerSocketFactory().createServerSocket();
+        serverSocket.bind(new InetSocketAddress(0));
+
+        this.executorService = Executors.newSingleThreadExecutor();
+        final Future<Boolean> future = this.executorService.submit(new Callable<Boolean>()
{
+            @Override
+            public Boolean call() throws Exception {
+                final Socket socket = serverSocket.accept();
+                try {
+                    final OutputStream outputStream = socket.getOutputStream();
+                    outputStream.write(new byte[]{'H', 'i'});
+                    outputStream.flush();
+                } finally {
+                    socket.close();
+                }
+                return Boolean.TRUE;
+            }
+        });
+
+        final int localPort = serverSocket.getLocalPort();
+        final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket();
+        try {
+            clientSocket.connect(new InetSocketAddress("localhost", localPort), 5000);
+            final InputStream inputStream = clientSocket.getInputStream();
+            Assert.assertEquals('H', inputStream.read());
+            Assert.assertEquals('i', inputStream.read());
+            Assert.assertEquals(-1, inputStream.read());
+        } finally {
+            clientSocket.close();
+        }
+
+        final Boolean result = future.get(5, TimeUnit.SECONDS);
+        Assert.assertNotNull(result);
+
+        final X509Certificate[] certs = certChainRef.get();
+        Assert.assertNotNull(certs);
+        Assert.assertEquals(2, certs.length);
+        final X509Certificate cert1 = certs[0];
+        final Principal subjectDN1 = cert1.getSubjectDN();
+        Assert.assertNotNull(subjectDN1);
+        Assert.assertEquals("CN=Test Server, OU=HttpComponents Project, O=Apache Software
Foundation, " +
+                "L=Unknown, ST=Unknown, C=Unknown", subjectDN1.getName());
+        final X509Certificate cert2 = certs[1];
+        final Principal subjectDN2 = cert2.getSubjectDN();
+        Assert.assertNotNull(subjectDN2);
+        Assert.assertEquals("EMAILADDRESS=dev@hc.apache.org, " +
+                "CN=Test CA, OU=HttpComponents Project, O=Apache Software Foundation", subjectDN2.getName());
+        final Principal issuerDN = cert2.getIssuerDN();
+        Assert.assertNotNull(issuerDN);
+        Assert.assertEquals("EMAILADDRESS=dev@hc.apache.org, " +
+                "CN=Test CA, OU=HttpComponents Project, O=Apache Software Foundation", issuerDN.getName());
+
+    }
+
+    @Test
+    public void testSSLHanskshakeClientUnauthenticated() throws Exception {
+        final URL resource1 = getClass().getResource("/test-server.keystore");
+        final String storePassword = "nopassword";
+        final String keyPassword = "nopassword";
+        final SSLContext serverSslContext = SSLContextBuilder.create()
+                .loadKeyMaterial(resource1, storePassword.toCharArray(), keyPassword.toCharArray())
+                .build();
+        Assert.assertNotNull(serverSslContext);
+        final URL resource2 = getClass().getResource("/test-client.keystore");
+        final SSLContext clientSslContext = SSLContextBuilder.create()
+                .loadTrustMaterial(resource2, storePassword.toCharArray())
+                .build();
+        Assert.assertNotNull(clientSslContext);
+        final SSLServerSocket serverSocket = (SSLServerSocket) serverSslContext.getServerSocketFactory().createServerSocket();
+        serverSocket.setWantClientAuth(true);
+        serverSocket.bind(new InetSocketAddress(0));
+
+        this.executorService = Executors.newSingleThreadExecutor();
+        final Future<Principal> future = this.executorService.submit(new Callable<Principal>()
{
+            @Override
+            public Principal call() throws Exception {
+                final SSLSocket socket = (SSLSocket) serverSocket.accept();
+                Principal clientPrincipal = null;
+                try {
+                    final SSLSession session = socket.getSession();
+                    try {
+                        clientPrincipal = session.getPeerPrincipal();
+                    } catch (SSLPeerUnverifiedException ignore) {
+                    }
+                    final OutputStream outputStream = socket.getOutputStream();
+                    outputStream.write(new byte [] {'H', 'i'});
+                    outputStream.flush();
+                } finally {
+                    socket.close();
+                }
+                return clientPrincipal;
+            }
+        });
+
+        final int localPort = serverSocket.getLocalPort();
+        final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket();
+        try {
+            clientSocket.connect(new InetSocketAddress("localhost", localPort), 5000);
+            clientSocket.startHandshake();
+            final InputStream inputStream = clientSocket.getInputStream();
+            Assert.assertEquals('H', inputStream.read());
+            Assert.assertEquals('i', inputStream.read());
+            Assert.assertEquals(-1, inputStream.read());
+        } finally {
+            clientSocket.close();
+        }
+
+        final Principal clientPrincipal = future.get(5, TimeUnit.SECONDS);
+        Assert.assertNull(clientPrincipal);
+    }
+
+    @Test(expected = SSLHandshakeException.class)
+    public void testSSLHanskshakeClientUnauthenticatedError() throws Exception {
+        final URL resource1 = getClass().getResource("/test-server.keystore");
+        final String storePassword = "nopassword";
+        final String keyPassword = "nopassword";
+        final SSLContext serverSslContext = SSLContextBuilder.create()
+                .loadKeyMaterial(resource1, storePassword.toCharArray(), keyPassword.toCharArray())
+                .build();
+        Assert.assertNotNull(serverSslContext);
+        final URL resource2 = getClass().getResource("/test-client.keystore");
+        final SSLContext clientSslContext = SSLContextBuilder.create()
+                .loadTrustMaterial(resource2, storePassword.toCharArray())
+                .build();
+        Assert.assertNotNull(clientSslContext);
+        final SSLServerSocket serverSocket = (SSLServerSocket) serverSslContext.getServerSocketFactory().createServerSocket();
+        serverSocket.setNeedClientAuth(true);
+        serverSocket.bind(new InetSocketAddress(0));
+
+        this.executorService = Executors.newSingleThreadExecutor();
+        this.executorService.submit(new Callable<Boolean>() {
+            @Override
+            public Boolean call() throws Exception {
+                final SSLSocket socket = (SSLSocket) serverSocket.accept();
+                try {
+                    socket.getSession();
+                } finally {
+                    socket.close();
+                }
+                return Boolean.FALSE;
+            }
+        });
+
+        final int localPort = serverSocket.getLocalPort();
+        final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket();
+        try {
+            clientSocket.connect(new InetSocketAddress("localhost", localPort), 5000);
+            clientSocket.startHandshake();
+        } finally {
+            clientSocket.close();
+        }
+    }
+
+    @Test
+    public void testSSLHanskshakeClientAuthenticated() throws Exception {
+        final URL resource1 = getClass().getResource("/test-server.keystore");
+        final String storePassword = "nopassword";
+        final String keyPassword = "nopassword";
+        final SSLContext serverSslContext = SSLContextBuilder.create()
+                .loadTrustMaterial(resource1, storePassword.toCharArray())
+                .loadKeyMaterial(resource1, storePassword.toCharArray(), keyPassword.toCharArray())
+                .build();
+        Assert.assertNotNull(serverSslContext);
+        final URL resource2 = getClass().getResource("/test-client.keystore");
+        final SSLContext clientSslContext = SSLContextBuilder.create()
+                .loadTrustMaterial(resource2, storePassword.toCharArray())
+                .loadKeyMaterial(resource2, storePassword.toCharArray(), storePassword.toCharArray())
+                .build();
+        Assert.assertNotNull(clientSslContext);
+        final SSLServerSocket serverSocket = (SSLServerSocket) serverSslContext.getServerSocketFactory().createServerSocket();
+        serverSocket.setNeedClientAuth(true);
+        serverSocket.bind(new InetSocketAddress(0));
+
+        this.executorService = Executors.newSingleThreadExecutor();
+        final Future<Principal> future = this.executorService.submit(new Callable<Principal>()
{
+            @Override
+            public Principal call() throws Exception {
+                final SSLSocket socket = (SSLSocket) serverSocket.accept();
+                try {
+                    final SSLSession session = socket.getSession();
+                    final Principal clientPrincipal = session.getPeerPrincipal();
+                    final OutputStream outputStream = socket.getOutputStream();
+                    outputStream.write(new byte[]{'H', 'i'});
+                    outputStream.flush();
+                    return clientPrincipal;
+                } finally {
+                    socket.close();
+                }
+            }
+        });
+        final int localPort = serverSocket.getLocalPort();
+        final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket();
+        try {
+            clientSocket.connect(new InetSocketAddress("localhost", localPort), 5000);
+            clientSocket.startHandshake();
+            final InputStream inputStream = clientSocket.getInputStream();
+            Assert.assertEquals('H', inputStream.read());
+            Assert.assertEquals('i', inputStream.read());
+            Assert.assertEquals(-1, inputStream.read());
+        } finally {
+            clientSocket.close();
+        }
+
+        final Principal clientPrincipal = future.get(5, TimeUnit.SECONDS);
+        Assert.assertNotNull(clientPrincipal);
+    }
+
+    @Test
+    public void testSSLHanskshakeClientAuthenticatedPrivateKeyStrategy() throws Exception
{
+        final URL resource1 = getClass().getResource("/test-server.keystore");
+        final String storePassword = "nopassword";
+        final String keyPassword = "nopassword";
+        final SSLContext serverSslContext = SSLContextBuilder.create()
+                .loadTrustMaterial(resource1, storePassword.toCharArray())
+                .loadKeyMaterial(resource1, storePassword.toCharArray(), keyPassword.toCharArray())
+                .build();
+        Assert.assertNotNull(serverSslContext);
+
+        final PrivateKeyStrategy privateKeyStrategy = new PrivateKeyStrategy() {
+            @Override
+            public String chooseAlias(final Map<String, PrivateKeyDetails> aliases,
final Socket socket) {
+                if (aliases.keySet().contains("client2")) {
+                    return "client2";
+                } else {
+                    return null;
+                }
+            }
+        };
+
+        final URL resource2 = getClass().getResource("/test-client.keystore");
+        final SSLContext clientSslContext = SSLContextBuilder.create()
+                .loadTrustMaterial(resource2, storePassword.toCharArray())
+                .loadKeyMaterial(resource2, storePassword.toCharArray(), storePassword.toCharArray(),
privateKeyStrategy)
+                .build();
+        Assert.assertNotNull(clientSslContext);
+        final SSLServerSocket serverSocket = (SSLServerSocket) serverSslContext.getServerSocketFactory().createServerSocket();
+        serverSocket.setNeedClientAuth(true);
+        serverSocket.bind(new InetSocketAddress(0));
+
+        this.executorService = Executors.newSingleThreadExecutor();
+        final Future<Principal> future = this.executorService.submit(new Callable<Principal>()
{
+            @Override
+            public Principal call() throws Exception {
+                final SSLSocket socket = (SSLSocket) serverSocket.accept();
+                try {
+                    final SSLSession session = socket.getSession();
+                    final Principal clientPrincipal = session.getPeerPrincipal();
+                    final OutputStream outputStream = socket.getOutputStream();
+                    outputStream.write(new byte[]{'H', 'i'});
+                    outputStream.flush();
+                    return clientPrincipal;
+                } finally {
+                    socket.close();
+                }
+            }
+        });
+        final int localPort = serverSocket.getLocalPort();
+        final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket();
+        try {
+            clientSocket.connect(new InetSocketAddress("localhost", localPort), 5000);
+            clientSocket.startHandshake();
+            final InputStream inputStream = clientSocket.getInputStream();
+            Assert.assertEquals('H', inputStream.read());
+            Assert.assertEquals('i', inputStream.read());
+            Assert.assertEquals(-1, inputStream.read());
+        } finally {
+            clientSocket.close();
+        }
+
+        final Principal clientPrincipal = future.get(5, TimeUnit.SECONDS);
+        Assert.assertNotNull(clientPrincipal);
+        Assert.assertEquals("CN=Test Client 2,OU=HttpComponents Project,O=Apache Software
Foundation," +
+                "L=Unknown,ST=Unknown,C=Unknown", clientPrincipal.getName());
+    }
+
 }

Added: httpcomponents/httpcore/trunk/httpcore/src/test/resources/CA/ca-cert.pem
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/resources/CA/ca-cert.pem?rev=1631693&view=auto
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/resources/CA/ca-cert.pem (added)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/resources/CA/ca-cert.pem Tue Oct 14 09:25:13
2014
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIDyTCCArGgAwIBAgIJAO3mCIu9mboMMA0GCSqGSIb3DQEBCwUAMHoxIzAhBgNV
+BAoMGkFwYWNoZSBTb2Z0d2FyZSBGb3VuZGF0aW9uMR8wHQYDVQQLDBZIdHRwQ29t
+cG9uZW50cyBQcm9qZWN0MRAwDgYDVQQDDAdUZXN0IENBMSAwHgYJKoZIhvcNAQkB
+FhFkZXZAaGMuYXBhY2hlLm9yZzAgFw0xNDEwMTMxNTAxMjBaGA8yMjg4MDcyODE1
+MDEyMFowejEjMCEGA1UECgwaQXBhY2hlIFNvZnR3YXJlIEZvdW5kYXRpb24xHzAd
+BgNVBAsMFkh0dHBDb21wb25lbnRzIFByb2plY3QxEDAOBgNVBAMMB1Rlc3QgQ0Ex
+IDAeBgkqhkiG9w0BCQEWEWRldkBoYy5hcGFjaGUub3JnMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEApXhHtKRvAxbLI+f21zNe68dkVXAhSMIfHQJGb2en
+S1H8yE4HPIb4vPQ0U7fQCb7RXplm6cHExpof4cO3DmyqD5KeQk0TdM8XrhviDgwj
+Y0KQ/lgwGHR5CpYoZ6LYWaLSE/wt9dVu80UcK8a3hW9G0X/4b79fMO6HYDix+CI4
+b17sqZ4K0tWKA10Xe+2RJU8Y01pPBaPR/UsAn+a1pZ6f8BhL879oWHfLWKcgZOYP
+U4sYED0S8gs4/ED1zRj2/uHb313sHTl+OU4X5v+OvwBvbNBrl5qfMTZnRNxlOfRq
+UTJdcopsp2aNeqHiorSDOrHwMIJpxQ2XqHT2l9s8msXf4wIDAQABo1AwTjAdBgNV
+HQ4EFgQUA+Tn2g9k2xMevYWrdrwpyi+nx0swHwYDVR0jBBgwFoAUA+Tn2g9k2xMe
+vYWrdrwpyi+nx0swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAFVEp
+8Nv6JoFY7oGgu6068fH/kq7A3SllqMpbv7dddI9fgwy352cBtg6PkYkGtEE037xs
+FQSYV1NiAkNWTJER+Q+kVbQrhuPNKZqh1g0sUKwv3X20BmgJ9hbU9klWZjdjujyd
+h9Ybjuntkn5XPp1zN6zHD0sQReEJnRlD6FT1axrQWpICzE4qoo8k64G+6/rqFywc
+oMc/Of3KCAHjtbWklEu97hjBvGC/nEP4/VhRrjWWSeGHv88LCyO/Yg6v3zrZHFLW
++KhsDCPyLxSSISFskLQfukiqf2lr87kQq/oF27sAr3sR3Jqh4qzflM2XLgjmZuRE
+OrHT6lvUemRyksA5qg==
+-----END CERTIFICATE-----

Added: httpcomponents/httpcore/trunk/httpcore/src/test/resources/CA/ca-key.pem
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/resources/CA/ca-key.pem?rev=1631693&view=auto
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/resources/CA/ca-key.pem (added)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/resources/CA/ca-key.pem Tue Oct 14 09:25:13
2014
@@ -0,0 +1,30 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIq0bLh96mWv4CAggA
+MBQGCCqGSIb3DQMHBAimZqUiELx13QSCBMgaLWrGFqveIzwQUsebS6FBdVq0lodz
+Vlekje8ycFDYSd21V9jPMwrSupZceeBQjCrpyLZ3oPkR+MvObmznev8XYcJzVCkF
+E9ApAaHZe248wWcu1/D7auHNG3GyZfvYS0c//Rs2OzMZfsUvX93RVullCRREvCYS
+qXhaO3ywFocndKRpSnkOBs2SRa0yc9POl4n4dwyKhsJUaMSmhPbJr9UBvCbXHZIA
+gLcSWzVon3EtZCSubMp9eo90G5MzIXEyPBTcIHwpyqRWTkaTUTq4R0c4/RTX+l7K
+OZuRIEeBEW6z009fSagymN/KEH3gUkg5pG6i1YWF63OVKTMGn+yQGWwYXwTyEGi5
+HZpD98wh3ycucmL93XLk+yYXQcTp1i+u4GaXNWGREQvNW6onCGeg6WWj1PrIsqoi
+TZ2pgQUJWPR1K3037hY0o9sakAkyYSyTPVvHOUcbf3+GhqGS1FsSNOxKRNpYm/3v
+Gf0SUN8BavPliK9NSU5JAbprr/hoL5o72dCX9DiOgwfW3HyD/gLh7sVyVBdAzTnE
+XFaYFnrb5QnqHbgWvaLbJUT5K7MW3OFLVConydYtYdaUl5z49OflhgnvYOPgTSUr
+k9c7exQjedAduPd8dXODh9l2g+QEXJoT+YYFEYHkQlsZgH1hCLXD1TmAeI4LMklb
+vPaGE8Ouj1pfbejdTNsqLfW0IiR/jZzEjRgqrueMf2VUjtqTZyPayc2rU4kOoKhv
+JzQ0wOFhgRztWJy2voRe+iYss3ToqZ7qLpjBfCTsxCJqbuaGeJWWSnOlDpSysgr+
+q4BvCzDcvf/0mKD2cQuJx/kynQMCcWB/VegRsQ24Y+3T7IU1w8ccmRfSZ93AwkAh
+MKJzKaVhD/gn9vUG/we18p7RMIc9pk1o2Z2Ru3mKjkO3QYRP6Y7yk0ah2JKrHIPf
+LWfPuHmtzHQXkY3RbVvxvwD/+qHm8ogXq52w8cpGhY5UwAEHrLLwypdBHccrAJjo
+bE13M/MrtTry/k8OMRqhhRzHUXBq6mLaWffCaP2SAVfJEez2iASvGJFvgy3bSkWY
+rwWMSfZKDkauwDMW5gpFrpeuqgD64LO72sN01riVDpaEyNODRCEEBGce+O+91R9K
+TLVgRYFsxClyZy1nynD66gkTepEm1yOgcdqV3651Os+TGm39jGYHy1k9mPz8ypqf
+8n8uw4nV3SbIwfpy4Z8onHixfc/Fugm7yQHW4dSuCpahyIJHom6Cq7SZfPuo9e3t
+8tqaxvK4U/dAXoimvN1eakH2FoVFIj3mk7OAKBgmDINH9GlzXPwRsTfiJSP4Xaod
+ouWIQLLeXQuuOc5VJd1Xex75o8ciSOomAS0uR4Fvk/2NkAm0EMddjZnuWLQaXPry
+JiUIgSx3w3yRq9RSQOxDRQpp2nP2roX7cyeGPzTmeujikExGTa3YBxuAShDLx5pt
+fpi0ol8H8ohDU4eV9pv96KRBG9e8sQf1zpGjeYLTFiN35IQxYJx3HTXp9/oFWkmA
+OdCEwggIKJ/RtgkWOWogTilQVA41p4XZr661fxoSE86sHXkZKn8IGnAKLFT46nWM
+IYVDalYUiSNZr+KbzmLIV3LmYE3mlqGI4vDvQtd9zQk/uatYBc2DetuTWPZHCEKS
+3Nk=
+-----END ENCRYPTED PRIVATE KEY-----

Added: httpcomponents/httpcore/trunk/httpcore/src/test/resources/CA/openssl.cnf
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/resources/CA/openssl.cnf?rev=1631693&view=auto
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/resources/CA/openssl.cnf (added)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/resources/CA/openssl.cnf Tue Oct 14 09:25:13
2014
@@ -0,0 +1,357 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+#
+
+# This definition stops the following lines choking if HOME isn't
+# defined.
+HOME			= .
+RANDFILE		= $ENV::HOME/.rnd
+
+# Extra OBJECT IDENTIFIER info:
+#oid_file		= $ENV::HOME/.oid
+oid_section		= new_oids
+
+# To use this configuration file with the "-extfile" option of the
+# "openssl x509" utility, name here the section containing the
+# X.509v3 extensions to use:
+# extensions		= 
+# (Alternatively, use a configuration file that has only
+# X.509v3 extensions in its main [= default] section.)
+
+[ new_oids ]
+
+# We can add new OIDs in here for use by 'ca', 'req' and 'ts'.
+# Add a simple OID like this:
+# testoid1=1.2.3.4
+# Or use config file substitution like this:
+# testoid2=${testoid1}.5.6
+
+# Policies used by the TSA examples.
+tsa_policy1 = 1.2.3.4.1
+tsa_policy2 = 1.2.3.4.5.6
+tsa_policy3 = 1.2.3.4.5.7
+
+####################################################################
+[ ca ]
+default_ca	= CA_default		# The default ca section
+
+####################################################################
+[ CA_default ]
+
+dir		= ./demoCA		# Where everything is kept
+certs		= $dir/certs		# Where the issued certs are kept
+crl_dir		= $dir/crl		# Where the issued crl are kept
+database	= $dir/index.txt	# database index file.
+#unique_subject	= no			# Set to 'no' to allow creation of
+					# several ctificates with same subject.
+new_certs_dir	= $dir/newcerts		# default place for new certs.
+
+certificate	= $dir/cacert.pem 	# The CA certificate
+serial		= $dir/serial 		# The current serial number
+crlnumber	= $dir/crlnumber	# the current crl number
+					# must be commented out to leave a V1 CRL
+crl		= $dir/crl.pem 		# The current CRL
+private_key	= $dir/private/cakey.pem# The private key
+RANDFILE	= $dir/private/.rand	# private random number file
+
+x509_extensions	= usr_cert		# The extentions to add to the cert
+
+# Comment out the following two lines for the "traditional"
+# (and highly broken) format.
+name_opt 	= ca_default		# Subject Name options
+cert_opt 	= ca_default		# Certificate field options
+
+# Extension copying option: use with caution.
+# copy_extensions = copy
+
+# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs
+# so this is commented out by default to leave a V1 CRL.
+# crlnumber must also be commented out to leave a V1 CRL.
+# crl_extensions	= crl_ext
+
+default_days	= 365			# how long to certify for
+default_crl_days= 30			# how long before next CRL
+default_md	= default		# use public key default MD
+preserve	= no			# keep passed DN ordering
+
+# A few difference way of specifying how similar the request should look
+# For type CA, the listed attributes must be the same, and the optional
+# and supplied fields are just that :-)
+policy		= policy_match
+
+# For the CA policy
+[ policy_match ]
+countryName		= match
+stateOrProvinceName	= match
+organizationName	= match
+organizationalUnitName	= optional
+commonName		= supplied
+emailAddress		= optional
+
+# For the 'anything' policy
+# At this point in time, you must list all acceptable 'object'
+# types.
+[ policy_anything ]
+countryName		= optional
+stateOrProvinceName	= optional
+localityName		= optional
+organizationName	= optional
+organizationalUnitName	= optional
+commonName		= supplied
+emailAddress		= optional
+
+####################################################################
+[ req ]
+default_bits		= 2048
+default_keyfile 	= privkey.pem
+distinguished_name	= req_distinguished_name
+attributes		= req_attributes
+x509_extensions	= v3_ca	# The extentions to add to the self signed cert
+
+# Passwords for private keys if not present they will be prompted for
+# input_password = secret
+# output_password = secret
+
+# This sets a mask for permitted string types. There are several options. 
+# default: PrintableString, T61String, BMPString.
+# pkix	 : PrintableString, BMPString (PKIX recommendation before 2004)
+# utf8only: only UTF8Strings (PKIX recommendation after 2004).
+# nombstr : PrintableString, T61String (no BMPStrings or UTF8Strings).
+# MASK:XXXX a literal mask value.
+# WARNING: ancient versions of Netscape crash on BMPStrings or UTF8Strings.
+string_mask = utf8only
+
+# req_extensions = v3_req # The extensions to add to a certificate request
+
+[ req_distinguished_name ]
+countryName			= Country Name (2 letter code)
+countryName_default		=
+
+stateOrProvinceName		= State or Province Name (full name)
+stateOrProvinceName_default	= Some-State
+
+localityName			= Locality Name (eg, city)
+
+0.organizationName		= Organization Name (eg, company)
+0.organizationName_default	= Apache Software Foundation
+
+organizationalUnitName		= Organizational Unit Name (eg, section)
+organizationalUnitName_default	= HttpComponents Project
+
+commonName			= Common Name (e.g. server FQDN or YOUR name)
+commonName_max			= 64
+
+emailAddress			= Email Address
+emailAddress_max		= 64
+
+# SET-ex3			= SET extension number 3
+
+[ req_attributes ]
+challengePassword		= A challenge password
+challengePassword_min		= 4
+challengePassword_max		= 20
+
+unstructuredName		= An optional company name
+
+[ usr_cert ]
+
+# These extensions are added when 'ca' signs a request.
+
+# This goes against PKIX guidelines but some CAs do it and some software
+# requires this to avoid interpreting an end user certificate as a CA.
+
+basicConstraints=CA:FALSE
+
+# Here are some examples of the usage of nsCertType. If it is omitted
+# the certificate can be used for anything *except* object signing.
+
+# This is OK for an SSL server.
+# nsCertType			= server
+
+# For an object signing certificate this would be used.
+# nsCertType = objsign
+
+# For normal client use this is typical
+# nsCertType = client, email
+
+# and for everything including object signing:
+# nsCertType = client, email, objsign
+
+# This is typical in keyUsage for a client certificate.
+# keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+# This will be displayed in Netscape's comment listbox.
+nsComment			= "OpenSSL Generated Certificate"
+
+# PKIX recommendations harmless if included in all certificates.
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid,issuer
+
+# This stuff is for subjectAltName and issuerAltname.
+# Import the email address.
+# subjectAltName=email:copy
+# An alternative to produce certificates that aren't
+# deprecated according to PKIX.
+# subjectAltName=email:move
+
+# Copy subject details
+# issuerAltName=issuer:copy
+
+#nsCaRevocationUrl		= http://www.domain.dom/ca-crl.pem
+#nsBaseUrl
+#nsRevocationUrl
+#nsRenewalUrl
+#nsCaPolicyUrl
+#nsSslServerName
+
+# This is required for TSA certificates.
+# extendedKeyUsage = critical,timeStamping
+
+[ v3_req ]
+
+# Extensions to add to a certificate request
+
+basicConstraints = CA:FALSE
+keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+[ v3_ca ]
+
+
+# Extensions for a typical CA
+
+
+# PKIX recommendation.
+
+subjectKeyIdentifier=hash
+
+authorityKeyIdentifier=keyid:always,issuer
+
+# This is what PKIX recommends but some broken software chokes on critical
+# extensions.
+#basicConstraints = critical,CA:true
+# So we do this instead.
+basicConstraints = CA:true
+
+# Key usage: this is typical for a CA certificate. However since it will
+# prevent it being used as an test self-signed certificate it is best
+# left out by default.
+# keyUsage = cRLSign, keyCertSign
+
+# Some might want this also
+# nsCertType = sslCA, emailCA
+
+# Include email address in subject alt name: another PKIX recommendation
+# subjectAltName=email:copy
+# Copy issuer details
+# issuerAltName=issuer:copy
+
+# DER hex encoding of an extension: beware experts only!
+# obj=DER:02:03
+# Where 'obj' is a standard or added object
+# You can even override a supported extension:
+# basicConstraints= critical, DER:30:03:01:01:FF
+
+[ crl_ext ]
+
+# CRL extensions.
+# Only issuerAltName and authorityKeyIdentifier make any sense in a CRL.
+
+# issuerAltName=issuer:copy
+authorityKeyIdentifier=keyid:always
+
+[ proxy_cert_ext ]
+# These extensions should be added when creating a proxy certificate
+
+# This goes against PKIX guidelines but some CAs do it and some software
+# requires this to avoid interpreting an end user certificate as a CA.
+
+basicConstraints=CA:FALSE
+
+# Here are some examples of the usage of nsCertType. If it is omitted
+# the certificate can be used for anything *except* object signing.
+
+# This is OK for an SSL server.
+# nsCertType			= server
+
+# For an object signing certificate this would be used.
+# nsCertType = objsign
+
+# For normal client use this is typical
+# nsCertType = client, email
+
+# and for everything including object signing:
+# nsCertType = client, email, objsign
+
+# This is typical in keyUsage for a client certificate.
+# keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+# This will be displayed in Netscape's comment listbox.
+nsComment			= "OpenSSL Generated Certificate"
+
+# PKIX recommendations harmless if included in all certificates.
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid,issuer
+
+# This stuff is for subjectAltName and issuerAltname.
+# Import the email address.
+# subjectAltName=email:copy
+# An alternative to produce certificates that aren't
+# deprecated according to PKIX.
+# subjectAltName=email:move
+
+# Copy subject details
+# issuerAltName=issuer:copy
+
+#nsCaRevocationUrl		= http://www.domain.dom/ca-crl.pem
+#nsBaseUrl
+#nsRevocationUrl
+#nsRenewalUrl
+#nsCaPolicyUrl
+#nsSslServerName
+
+# This really needs to be in place for it to be a proxy certificate.
+proxyCertInfo=critical,language:id-ppl-anyLanguage,pathlen:3,policy:foo
+
+####################################################################
+[ tsa ]
+
+default_tsa = tsa_config1	# the default TSA section
+
+[ tsa_config1 ]
+
+# These are used by the TSA reply generation only.
+dir		= ./demoCA		# TSA root directory
+serial		= $dir/tsaserial	# The current serial number (mandatory)
+crypto_device	= builtin		# OpenSSL engine to use for signing
+signer_cert	= $dir/tsacert.pem 	# The TSA signing certificate
+					# (optional)
+certs		= $dir/cacert.pem	# Certificate chain to include in reply
+					# (optional)
+signer_key	= $dir/private/tsakey.pem # The TSA private key (optional)
+
+default_policy	= tsa_policy1		# Policy if request did not specify it
+					# (optional)
+other_policies	= tsa_policy2, tsa_policy3	# acceptable policies (optional)
+digests		= md5, sha1		# Acceptable message digests (mandatory)
+accuracy	= secs:1, millisecs:500, microsecs:100	# (optional)
+clock_precision_digits  = 0	# number of digits after dot. (optional)
+ordering		= yes	# Is ordering defined for timestamps?
+				# (optional, default: no)
+tsa_name		= yes	# Must the TSA name be included in the reply?
+				# (optional, default: no)
+ess_cert_id_chain	= no	# Must the ESS cert id chain be included?
+				# (optional, default: no)

Added: httpcomponents/httpcore/trunk/httpcore/src/test/resources/test-client.keystore
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/resources/test-client.keystore?rev=1631693&view=auto
==============================================================================
Files httpcomponents/httpcore/trunk/httpcore/src/test/resources/test-client.keystore (added)
and httpcomponents/httpcore/trunk/httpcore/src/test/resources/test-client.keystore Tue Oct
14 09:25:13 2014 differ

Added: httpcomponents/httpcore/trunk/httpcore/src/test/resources/test-server.keystore
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/resources/test-server.keystore?rev=1631693&view=auto
==============================================================================
Files httpcomponents/httpcore/trunk/httpcore/src/test/resources/test-server.keystore (added)
and httpcomponents/httpcore/trunk/httpcore/src/test/resources/test-server.keystore Tue Oct
14 09:25:13 2014 differ



Mime
View raw message