[jsslutils commit] r84 - Added 3 test CAs with CRL distribution points.

1 view
Skip to first unread message

codesite...@google.com

unread,
Apr 18, 2009, 10:07:26 AM4/18/09
to jsslut...@googlegroups.com
Author: Bruno.H...@manchester.ac.uk
Date: Sat Apr 18 06:56:16 2009
New Revision: 84

Added:
trunk/certificates/src/main/resources/org/jsslutils/certificates/local/

trunk/certificates/src/main/resources/org/jsslutils/certificates/local/cacert.pem
- copied, changed from r83,
/trunk/certificates/src/main/resources/org/jsslutils/certificates/demoCA/cacert.pem

trunk/certificates/src/main/resources/org/jsslutils/certificates/local/testca-crl.pem
- copied, changed from r83,
/trunk/certificates/src/main/resources/org/jsslutils/certificates/newca.crl
trunk/certificates/src/main/resources/org/jsslutils/certificates/one/

trunk/certificates/src/main/resources/org/jsslutils/certificates/one/cacert.pem

trunk/certificates/src/main/resources/org/jsslutils/certificates/one/testca-crl.pem
trunk/certificates/src/main/resources/org/jsslutils/certificates/three/

trunk/certificates/src/main/resources/org/jsslutils/certificates/three/cacert.pem

trunk/certificates/src/main/resources/org/jsslutils/certificates/three/testca-crl.pem
trunk/certificates/src/main/resources/org/jsslutils/certificates/two/

trunk/certificates/src/main/resources/org/jsslutils/certificates/two/cacert.pem

trunk/certificates/src/main/resources/org/jsslutils/certificates/two/testca-crl.pem

trunk/jsslutils/src/test/java/org/jsslutils/sslcontext/test/PKIXExplicitCrlTest.java
- copied, changed from r83,
/trunk/jsslutils/src/test/java/org/jsslutils/sslcontext/test/PKIXTest.java

trunk/jsslutils/src/test/java/org/jsslutils/sslcontext/test/PKIXNoExplicitCrlTest.java
- copied, changed from r83,
/trunk/jsslutils/src/test/java/org/jsslutils/sslcontext/test/PKIXTestNoCrl.java
Removed:

trunk/certificates/src/main/resources/org/jsslutils/certificates/certs/testCA.crt

trunk/certificates/src/main/resources/org/jsslutils/certificates/demoCA/cacert.pem

trunk/certificates/src/main/resources/org/jsslutils/certificates/demoCA/crlnumber

trunk/certificates/src/main/resources/org/jsslutils/certificates/demoCA/index.txt

trunk/certificates/src/main/resources/org/jsslutils/certificates/demoCA/index.txt.attr

trunk/certificates/src/main/resources/org/jsslutils/certificates/demoCA/newcerts/01.pem

trunk/certificates/src/main/resources/org/jsslutils/certificates/demoCA/newcerts/02.pem

trunk/certificates/src/main/resources/org/jsslutils/certificates/demoCA/newcerts/03.pem

trunk/certificates/src/main/resources/org/jsslutils/certificates/demoCA/private/cakey.pem

trunk/certificates/src/main/resources/org/jsslutils/certificates/demoCA/serial

trunk/certificates/src/main/resources/org/jsslutils/certificates/localhost-crt.pem

trunk/certificates/src/main/resources/org/jsslutils/certificates/localhost-key-clear.pem

trunk/certificates/src/main/resources/org/jsslutils/certificates/localhost-key.pem

trunk/certificates/src/main/resources/org/jsslutils/certificates/newca.crl

trunk/certificates/src/main/resources/org/jsslutils/certificates/openssl.cnf

trunk/certificates/src/main/resources/org/jsslutils/certificates/revoke.pem

trunk/certificates/src/main/resources/org/jsslutils/certificates/testclient-crt.pem

trunk/certificates/src/main/resources/org/jsslutils/certificates/testclient-key.pem

trunk/certificates/src/main/resources/org/jsslutils/certificates/testclient-r-crt.pem

trunk/certificates/src/main/resources/org/jsslutils/certificates/testclient-r-key.pem
trunk/jsslutils/src/test/java/org/jsslutils/sslcontext/test/PKIXTest.java

trunk/jsslutils/src/test/java/org/jsslutils/sslcontext/test/PKIXTestNoCrl.java
Modified:
trunk/certificates/pom.xml
trunk/jsslutils/pom.xml
trunk/testhelpers/pom.xml

trunk/testhelpers/src/main/java/org/jsslutils/sslcontext/test/MiniSslClientServer.java

Log:
Added 3 test CAs with CRL distribution points.

Modified: trunk/certificates/pom.xml
==============================================================================
--- trunk/certificates/pom.xml (original)
+++ trunk/certificates/pom.xml Sat Apr 18 06:56:16 2009
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jsslutils</groupId>
<artifactId>jsslutils-test-certificates</artifactId>
- <version>1.0.2</version>
+ <version>2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>jSSLutils :: Test certificates</name>
<url>http://www.jsslutils.org/</url>

Copied:
trunk/certificates/src/main/resources/org/jsslutils/certificates/local/cacert.pem
(from r83,
/trunk/certificates/src/main/resources/org/jsslutils/certificates/demoCA/cacert.pem)
==============================================================================

Copied:
trunk/certificates/src/main/resources/org/jsslutils/certificates/local/testca-crl.pem
(from r83,
/trunk/certificates/src/main/resources/org/jsslutils/certificates/newca.crl)
==============================================================================

Added:
trunk/certificates/src/main/resources/org/jsslutils/certificates/one/cacert.pem
==============================================================================
--- (empty file)
+++
trunk/certificates/src/main/resources/org/jsslutils/certificates/one/cacert.pem
Sat Apr 18 06:56:16 2009
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIERzCCAy+gAwIBAgIJAKWBnzVqkjWSMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNV
+BAYTAlVLMRMwEQYDVQQHEwpNYW5jaGVzdGVyMRYwFAYDVQQKEw1qc3NsdXRpbHMu
+b3JnMRAwDgYDVQQLEwdUZXN0Q0ExMRAwDgYDVQQDEwdUZXN0IENBMB4XDTA5MDQx
+NjE3Mzk1N1oXDTI5MDQxMTE3Mzk1N1owXjELMAkGA1UEBhMCVUsxEzARBgNVBAcT
+Ck1hbmNoZXN0ZXIxFjAUBgNVBAoTDWpzc2x1dGlscy5vcmcxEDAOBgNVBAsTB1Rl
+c3RDQTExEDAOBgNVBAMTB1Rlc3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDlu19dGiMjwnY0K34Rm26k3hr8QOtZWbbL+g9X7p33S7JSOaNVKukG
+qIvWrNDuN7kUuKwZnJs3YBTr/jl88DDJr3HbcOnoJMlJalZeH/ZBWMqLCdgwmGIi
+o1UC9IdGduxVscq6TlP3dpdAkz52j7kuiA8t8H2mpqvwnV9ek4GgnlQW1NN5U8aT
+fMnELmf5ucjItlDv5JNaZTI+JskWZc32ozVazRs+vjqOcW1snOlpgX8P+rGLNSVH
+eFEIzOCn4dfVE1cIXzLsTATiiZme7Ghz1bYkfBzJy3XGgVbI+Y7ydwxIxS2Hs5Wm
+6EC7UVB8o01dKQ+qxSUDjAWWuMN0CAWHAgMBAAGjggEGMIIBAjAdBgNVHQ4EFgQU
+bQFIgTMe0DPFdVDqqJk+3OKHp+cwgZAGA1UdIwSBiDCBhYAUbQFIgTMe0DPFdVDq
+qJk+3OKHp+ehYqRgMF4xCzAJBgNVBAYTAlVLMRMwEQYDVQQHEwpNYW5jaGVzdGVy
+MRYwFAYDVQQKEw1qc3NsdXRpbHMub3JnMRAwDgYDVQQLEwdUZXN0Q0ExMRAwDgYD
+VQQDEwdUZXN0IENBggkApYGfNWqSNZIwDAYDVR0TBAUwAwEB/zBABgNVHR8EOTA3
+MDWgM6Axhi9odHRwOi8vanNzbHV0aWxzLmdvb2dsZWNvZGUuY29tL3N2bi9jcmwv
+Y2ExLmNybDANBgkqhkiG9w0BAQUFAAOCAQEAmvGlBT+ra64fdyh4odTuqm32eZJT
++N9998v6C+takeoI96K2nJlphLcIZCkD+OUcJfbEn8LDNTJ8Egg2ssUdUlIiUMfQ
+UEvNGruDtOUOtG4XoSqA7h5prGDCyO232DRp4M7ld1jeB9HU/ffbt6aP+FFlkpRe
+xYpmcuTotQBx+3cCGXJs2JpM1p2UH9wHyFToCTe9Pp2bgmzMMWRR3romPeHalUyg
+jnDuJTAxlF+oc68rNMGdHABHMKB/7mcl+QDxTeIbqrkm7W0SrLri2v8Pc1qoNVb7
+oWPmdrTVjytLMDczk0QNQjFrAbtRUhFz67EsGiYFTvarnPCeUnDZaGd5Cw==
+-----END CERTIFICATE-----

Added:
trunk/certificates/src/main/resources/org/jsslutils/certificates/one/testca-crl.pem
==============================================================================
--- (empty file)
+++
trunk/certificates/src/main/resources/org/jsslutils/certificates/one/testca-crl.pem
Sat Apr 18 06:56:16 2009
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBujCBozANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVSzETMBEGA1UEBxMK
+TWFuY2hlc3RlcjEWMBQGA1UEChMNanNzbHV0aWxzLm9yZzEQMA4GA1UECxMHVGVz
+dENBMTEQMA4GA1UEAxMHVGVzdCBDQRcNMDkwNDE2MTc0MDA1WhcNMjkwNDExMTc0
+MDA1WjAUMBICAQMXDTA5MDQxNjE3NDAwNVowDQYJKoZIhvcNAQEFBQADggEBAJzC
+MCxPXNp5RYiE04Ce3pkPPrAY8MMXyvFMcc24nhy6bvpqnMRKTy4oRr2/I+ECa7JM
+BcTq6SxFg5hZf0DOoRgjdnXGc+Pk2eUV4P/BwfaObMtEEzKq4i7fmBzStIvoVAga
+r/+rwIlfbPkEw1epV3buc9zQQFWe0TrD3lin8YRg4v/5dkzousNd/TShZ2XDYNlt
+SXCEb2h+7HSXIKN1wr/2ej99En1+lYi0tMV6wQgzJz5xrhH0bIu/AUROHZdi38YQ
+rmbYf5NtoE1afUiUw1nrmYjOQqYNwEaqvtcblXVZ2tHEFnMlHydJxBwhLMrZYQjj
+EmJGtlXLIL1kBjmTi+w=
+-----END X509 CRL-----

Added:
trunk/certificates/src/main/resources/org/jsslutils/certificates/three/cacert.pem
==============================================================================
--- (empty file)
+++
trunk/certificates/src/main/resources/org/jsslutils/certificates/three/cacert.pem
Sat Apr 18 06:56:16 2009
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEAzCCAuugAwIBAgIJAMva2NZGwVejMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNV
+BAYTAlVLMRMwEQYDVQQHEwpNYW5jaGVzdGVyMRYwFAYDVQQKEw1qc3NsdXRpbHMu
+b3JnMRAwDgYDVQQLEwdUZXN0Q0EzMRAwDgYDVQQDEwdUZXN0IENBMB4XDTA5MDQx
+NjE3NDExNFoXDTI5MDQxMTE3NDExNFowXjELMAkGA1UEBhMCVUsxEzARBgNVBAcT
+Ck1hbmNoZXN0ZXIxFjAUBgNVBAoTDWpzc2x1dGlscy5vcmcxEDAOBgNVBAsTB1Rl
+c3RDQTMxEDAOBgNVBAMTB1Rlc3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCqzG2cvhRY4831CYZsH2DwfP11syXq2uLCzdXB/d87OzoHyyB78TMs
+msD7SciCdDQCPyOw9vGKE5Z6gC0+3NeDix9sFxJGarqFEh41lmUJu3y5XdD0vI96
+VXpA2qUmr6dSI2F9XpdmCXMkqKATDvfxC9V/GElojfam+FvRMItsKwgpmneMyZHc
+jvxHFYFvJGPC4YjibiJeuJ59TmQ0bTm87tG0VamOsI0KC7Z2BDuetmiHX+nilvZ/
+CjhssoMlp74obSx9peWSEv3846at/7ALfRbZxRf9o0dMcChYrwlV5hY/FGmbiglF
+Epy8fGH1FvfZhxNfOdH3GVLz6coVfJOXAgMBAAGjgcMwgcAwHQYDVR0OBBYEFDVF
+GdO/PvurGKW6AoasMUf8QXEfMIGQBgNVHSMEgYgwgYWAFDVFGdO/PvurGKW6Aoas
+MUf8QXEfoWKkYDBeMQswCQYDVQQGEwJVSzETMBEGA1UEBxMKTWFuY2hlc3RlcjEW
+MBQGA1UEChMNanNzbHV0aWxzLm9yZzEQMA4GA1UECxMHVGVzdENBMzEQMA4GA1UE
+AxMHVGVzdCBDQYIJAMva2NZGwVejMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
+BQADggEBAD9Xrd9rzjO4/i0o9a2z4NS90vnm/0g8LXDL0eYgsUr3M6ILAbcyNGun
+6tP11G6B4NF+h3dtiVfzv7ZlwzTVpjT47l5tZOLGuhSc0fU8J2EUKt7oSsTgZWZ8
+CwJW59EONBw8aLeYxnDal0f5eP7lplz3VY+EhtZrSAXZzWyk5l6vDOj1QVyP7OL0
+3T7zQFfbX2xlIk0tYtlp07BPuIXQ8VWXk+wRUYM072NXKOSWPFDL0CKIlZDAX+c3
+XzBZ8xX8B4wA16kAhQ7hcM8AKljlCaTWoYM5fvDG7U9vhdZ8ab21xp/MpUb9/Zp1
+iV1JuASqKEDgitua3YpQczRQaPzillU=
+-----END CERTIFICATE-----

Added:
trunk/certificates/src/main/resources/org/jsslutils/certificates/three/testca-crl.pem
==============================================================================
--- (empty file)
+++
trunk/certificates/src/main/resources/org/jsslutils/certificates/three/testca-crl.pem
Sat Apr 18 06:56:16 2009
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBujCBozANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVSzETMBEGA1UEBxMK
+TWFuY2hlc3RlcjEWMBQGA1UEChMNanNzbHV0aWxzLm9yZzEQMA4GA1UECxMHVGVz
+dENBMzEQMA4GA1UEAxMHVGVzdCBDQRcNMDkwNDE2MTc0MTIyWhcNMjkwNDExMTc0
+MTIyWjAUMBICAQMXDTA5MDQxNjE3NDEyMlowDQYJKoZIhvcNAQEFBQADggEBABsX
+z0JsObHi+v7jqRlJu5CRKqy7OdhDCmk3VpZpitkO19+gTggbZZtZJ/7mRFCP34PZ
+UER8hgC2TwNMCWc539EJObHzbH5Oyvu0y7M/mnlTypZLpsi/IBzY/HApgsZ+LvGK
+MXbrPo5W6sQF7dR8O+xD5ZlX+2XYAWDSnqJzH6hE+JXQmgbYkkT9hL9bmanqtcZS
+8QdEhxxyyccxyXBXT7FDbJ00lzpmOyUYqpL26mrMtYaqT5C9dZZL6OhxuWHlyqq9
+pt10nCAR7/m+uv4saEGxtbAeu9le5af2X95erjxd3CBji2vWPcycyYtE1OqfBEzk
+64vdQO5fo5n3JffnpZM=
+-----END X509 CRL-----

Added:
trunk/certificates/src/main/resources/org/jsslutils/certificates/two/cacert.pem
==============================================================================
--- (empty file)
+++
trunk/certificates/src/main/resources/org/jsslutils/certificates/two/cacert.pem
Sat Apr 18 06:56:16 2009
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIERzCCAy+gAwIBAgIJALm/nWYqcsrHMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNV
+BAYTAlVLMRMwEQYDVQQHEwpNYW5jaGVzdGVyMRYwFAYDVQQKEw1qc3NsdXRpbHMu
+b3JnMRAwDgYDVQQLEwdUZXN0Q0EyMRAwDgYDVQQDEwdUZXN0IENBMB4XDTA5MDQx
+NjE3NDA0N1oXDTI5MDQxMTE3NDA0N1owXjELMAkGA1UEBhMCVUsxEzARBgNVBAcT
+Ck1hbmNoZXN0ZXIxFjAUBgNVBAoTDWpzc2x1dGlscy5vcmcxEDAOBgNVBAsTB1Rl
+c3RDQTIxEDAOBgNVBAMTB1Rlc3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDOP9wQAdz4EkrovYg5GSeDfWJzJwsXSN01iEeCskviVRjWfHU4PTiW
+84JXr7+QjuTxvnlBgCwBzGfolN5YjHbk8J4JDlR20kIVfBpKWLsdoib/mR+DlS1J
+fSDjrdRLtW4rJDI0PfDK8Ot2xye4q2kKqD+Jk3+5qV0BxAQwM0ZRRX3e4AxNPzTG
+8DyRCeC60yBiALQw4V0NeZOfBGLse38ZnCAoaju+GtJ6rAGnodTlDz0oSu1CKld2
+Ke6PySFhtwE1aGI/d+7XQkKrrHzii2BEkrbdYvlCmXfZ35VTZSKxZ2c6jV/OI0lB
+oYFG+besdaznJvKJk/D6tnIt7HU4RvFLAgMBAAGjggEGMIIBAjAdBgNVHQ4EFgQU
+vx1cNBiy0jsUl2McW87c2wVYTWEwgZAGA1UdIwSBiDCBhYAUvx1cNBiy0jsUl2Mc
+W87c2wVYTWGhYqRgMF4xCzAJBgNVBAYTAlVLMRMwEQYDVQQHEwpNYW5jaGVzdGVy
+MRYwFAYDVQQKEw1qc3NsdXRpbHMub3JnMRAwDgYDVQQLEwdUZXN0Q0EyMRAwDgYD
+VQQDEwdUZXN0IENBggkAub+dZipyyscwDAYDVR0TBAUwAwEB/zBABgNVHR8EOTA3
+MDWgM6Axhi9odHRwOi8vanNzbHV0aWxzLmdvb2dsZWNvZGUuY29tL3N2bi9jcmwv
+Y2EyLmNybDANBgkqhkiG9w0BAQUFAAOCAQEAFtqzPgCrdyhY3vCftw6iOw/bUiX1
+Ww3ZnN9HlInQEJmU739W4zlgL9cUH0MvGRNCtq5cPOSGSRI1fVK/pY669ZPynqG1
+uZxWxioIZv6ZMpxP2N9n6pHbULoizXM8WiAoMNwczXBb2z3IgpNjr7Ks4Yc1x/z/
+zeGaAKIzfhJYGYWwt07IlMiJUf1P7S9+5ouVy5Bzbz18GOCZo4849VnwuhawHY0c
+P+ZJ66wk2CC4bIYR6olgsy1p6FwO8ZT6ZSNYmLMjniSdes3mRqsbIi5F0/DWMcft
+AhTc7jEG73i/nlVL5xXzuQciN2pz8hytNWzwZmUjdWHDNXzFLmBnfBMj4w==
+-----END CERTIFICATE-----

Added:
trunk/certificates/src/main/resources/org/jsslutils/certificates/two/testca-crl.pem
==============================================================================
--- (empty file)
+++
trunk/certificates/src/main/resources/org/jsslutils/certificates/two/testca-crl.pem
Sat Apr 18 06:56:16 2009
@@ -0,0 +1,12 @@
+-----BEGIN X509 CRL-----
+MIIBujCBozANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVSzETMBEGA1UEBxMK
+TWFuY2hlc3RlcjEWMBQGA1UEChMNanNzbHV0aWxzLm9yZzEQMA4GA1UECxMHVGVz
+dENBMjEQMA4GA1UEAxMHVGVzdCBDQRcNMDkwNDE2MTc0MTAxWhcNMjkwNDExMTc0
+MTAxWjAUMBICAQMXDTA5MDQxNjE3NDEwMVowDQYJKoZIhvcNAQEFBQADggEBAC4K
+5tI1DbOwTgd1TCshc+P5JkPXhzztjGGqNgewvbx30BXsJvq6Vr+apXXzeUNDFVkt
+SgiAm/YC0oXJpOzvgLH+F+YD2Pgf8NFXpAhMx5M8KFzlmg/Jtd/tCLiW5Xrs9zuB
+JYPiHSGCYG+LMSn7AaGo1UfOe7xLuoLHY70B5o2sxGCtlV6ePhKu4xiHOmto3/dc
+AO9YFK+dpknna1x2qhNZXm4LL8bsCP3pTFbPizekngDMZ1K6GWsQIqV1UKGnG7/M
+DYvFFKZPFDEsQzyayTZc3b7W1A5GUwh/c76oArvFeTvEg54Cx+GAbdEqTiOofEFb
+aWFmTLgUJMXGz4mAwu0=
+-----END X509 CRL-----

Modified: trunk/jsslutils/pom.xml
==============================================================================
--- trunk/jsslutils/pom.xml (original)
+++ trunk/jsslutils/pom.xml Sat Apr 18 06:56:16 2009
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jsslutils</groupId>
@@ -34,9 +33,12 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <excludes>
- <exclude>**/TrustAllClientsServerTest.java</exclude>
- </excludes>
+ <systemProperties>
+ <property>
+ <name>java.security.debug</name>
+ <value>certpath</value>
+ </property>
+ </systemProperties>
</configuration>
</plugin>
</plugins>

Copied:
trunk/jsslutils/src/test/java/org/jsslutils/sslcontext/test/PKIXExplicitCrlTest.java
(from r83,
/trunk/jsslutils/src/test/java/org/jsslutils/sslcontext/test/PKIXTest.java)
==============================================================================
---
/trunk/jsslutils/src/test/java/org/jsslutils/sslcontext/test/PKIXTest.java
(original)
+++
trunk/jsslutils/src/test/java/org/jsslutils/sslcontext/test/PKIXExplicitCrlTest.java
Sat Apr 18 06:56:16 2009
@@ -2,7 +2,7 @@

This file is part of the jSSLutils library.

-Copyright (c) 2008-2009, The University of Manchester, United Kingdom.
+Copyright (c) 2008, The University of Manchester, United Kingdom.
All rights reserved.

Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@
* @author Bruno Harbulot.
*
*/
-public class PKIXTest extends SimpleX509Test {
+public class PKIXExplicitCrlTest extends SimpleX509Test {
@Override
public boolean prepareSSLContextFactories() throws Exception {
PKIXSSLContextFactory clientSSLContextFactory = new
PKIXSSLContextFactory(

Copied:
trunk/jsslutils/src/test/java/org/jsslutils/sslcontext/test/PKIXNoExplicitCrlTest.java
(from r83,
/trunk/jsslutils/src/test/java/org/jsslutils/sslcontext/test/PKIXTestNoCrl.java)
==============================================================================
---
/trunk/jsslutils/src/test/java/org/jsslutils/sslcontext/test/PKIXTestNoCrl.java
(original)
+++
trunk/jsslutils/src/test/java/org/jsslutils/sslcontext/test/PKIXNoExplicitCrlTest.java
Sat Apr 18 06:56:16 2009
@@ -49,18 +49,19 @@
* @author Bruno Harbulot.
*
*/
-public class PKIXTestNoCrl extends SimpleX509Test {
+public class PKIXNoExplicitCrlTest extends SimpleX509Test {
@Override
public boolean prepareSSLContextFactories() throws Exception {
PKIXSSLContextFactory clientSSLContextFactory = new
PKIXSSLContextFactory(
this.clientStore, MiniSslClientServer.KEYSTORE_PASSWORD,
getCaKeyStore());
this.clientSSLContextFactory = clientSSLContextFactory;
+
PKIXSSLContextFactory serverSSLContextFactory = new
PKIXSSLContextFactory(
getServerCertKeyStore(), MiniSslClientServer.KEYSTORE_PASSWORD,
getCaKeyStore());
-
this.serverSSLContextFactory = serverSSLContextFactory;
+
return true;
}


Modified: trunk/testhelpers/pom.xml
==============================================================================
--- trunk/testhelpers/pom.xml (original)
+++ trunk/testhelpers/pom.xml Sat Apr 18 06:56:16 2009
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.jsslutils</groupId>
<artifactId>jsslutils-test-certificates</artifactId>
- <version>1.0.2</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>

Modified:
trunk/testhelpers/src/main/java/org/jsslutils/sslcontext/test/MiniSslClientServer.java
==============================================================================
---
trunk/testhelpers/src/main/java/org/jsslutils/sslcontext/test/MiniSslClientServer.java
(original)
+++
trunk/testhelpers/src/main/java/org/jsslutils/sslcontext/test/MiniSslClientServer.java
Sat Apr 18 06:56:16 2009
@@ -2,7 +2,7 @@

This file is part of the jSSLutils library.

-Copyright (c) 2008, The University of Manchester, United Kingdom.
+Copyright (c) 2008-2009, The University of Manchester, United Kingdom.
All rights reserved.

Redistribution and use in source and binary forms, with or without
@@ -90,6 +90,10 @@
public final static String CERTIFICATES_DIRECTORY
= "org/jsslutils/certificates/";
public final static char[] KEYSTORE_PASSWORD = "testtest".toCharArray();

+ protected String getCertificatesDirectory() {
+ return CERTIFICATES_DIRECTORY + "local/";
+ }
+
/**
* Returns the store of CA certificates, to be used as a trust store. The
* default value is to load 'dummy.jks', part of this test suite.
@@ -104,8 +108,8 @@
NoSuchAlgorithmException, KeyStoreException, CertificateException {
KeyStore ks = KeyStore.getInstance("JKS");
InputStream ksis = ClassLoader
- .getSystemResourceAsStream(CERTIFICATES_DIRECTORY
- + "jks/dummy.jks");
+ .getSystemResourceAsStream(getCertificatesDirectory()
+ + "cacert.jks");
ks.load(ksis, KEYSTORE_PASSWORD);
ksis.close();
return ks;
@@ -125,7 +129,7 @@
NoSuchAlgorithmException, KeyStoreException, CertificateException {
KeyStore ks = KeyStore.getInstance("PKCS12");
InputStream ksis = ClassLoader
- .getSystemResourceAsStream(CERTIFICATES_DIRECTORY
+ .getSystemResourceAsStream(getCertificatesDirectory()
+ "localhost.p12");
ks.load(ksis, KEYSTORE_PASSWORD);
ksis.close();
@@ -148,7 +152,7 @@
NoSuchAlgorithmException, KeyStoreException, CertificateException {
KeyStore ks = KeyStore.getInstance("PKCS12");
InputStream ksis = ClassLoader
- .getSystemResourceAsStream(CERTIFICATES_DIRECTORY
+ .getSystemResourceAsStream(getCertificatesDirectory()
+ "testclient.p12");
ks.load(ksis, KEYSTORE_PASSWORD);
ksis.close();
@@ -172,8 +176,8 @@
NoSuchAlgorithmException, KeyStoreException, CertificateException {
KeyStore ks = KeyStore.getInstance("PKCS12");
InputStream ksis = ClassLoader
- .getSystemResourceAsStream(CERTIFICATES_DIRECTORY
- + "testclient-r.p12");
+ .getSystemResourceAsStream(getCertificatesDirectory()
+ + "testclient_r.p12");
ks.load(ksis, KEYSTORE_PASSWORD);
ksis.close();
return ks;
@@ -194,7 +198,8 @@
NoSuchAlgorithmException, KeyStoreException, CertificateException,
CRLException {
InputStream inStream = ClassLoader
- .getSystemResourceAsStream(CERTIFICATES_DIRECTORY + "newca.crl");
+ .getSystemResourceAsStream(getCertificatesDirectory()
+ + "testca-crl.pem");
CertificateFactory cf = CertificateFactory.getInstance("X.509");
X509CRL crl = (X509CRL) cf.generateCRL(inStream);
inStream.close();

Reply all
Reply to author
Forward
0 new messages