Fixed trust engine test w/updated CRL.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1996 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/data/metadata8.xml b/data/metadata8.xml
index 8c6d03f..722016c 100644 (file)
--- a/data/metadata8.xml
+++ b/data/metadata8.xml
@@ -8,31 +8,31 @@
                        <KeyAuthority xmlns="urn:mace:shibboleth:metadata:1.0">
                                <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
            <ds:X509Data>
-                <ds:X509Certificate>MIIC4zCCAkygAwIBAgIBADANBgkqhkiG9w0BAQQFADBbMQswCQYDVQQGEwJVUzEL
-MAkGA1UECBMCVE4xEDAOBgNVBAcTB01lbXBoaXMxEjAQBgNVBAoTCVdhc3NhLk9y
-RzEZMBcGA1UEAxMQV2FsdGVyJ3MgVGVzdCBDQTAeFw0wNTA0MDgwMzU1MzdaFw0w
-NjA0MDgwMzU1MzdaMFsxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJUTjEQMA4GA1UE
-BxMHTWVtcGhpczESMBAGA1UEChMJV2Fzc2EuT3JHMRkwFwYDVQQDExBXYWx0ZXIn
-cyBUZXN0IENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDi0Lwb7bURmrS1
-cpMuBAfYhAqd5jbnIOzJ9U8TfM0e6eTnPZMrWw3fhtbTu//RY2yMwGi4bEJqtkWo
-IsOPK3Zu8iawHXdmJx6jYigWOHljQKQDDo2YQGwHiEmsfyeZLLcDLmb9mAZV1MEP
-Qo+gv13T3DPJI/lt2xNhbUulHr+XGwIDAQABo4G2MIGzMB0GA1UdDgQWBBRwbYDU
-/IGFzPTOpQlqjhTQHPnQITCBgwYDVR0jBHwweoAUcG2A1PyBhcz0zqUJao4U0Bz5
-0CGhX6RdMFsxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJUTjEQMA4GA1UEBxMHTWVt
-cGhpczESMBAGA1UEChMJV2Fzc2EuT3JHMRkwFwYDVQQDExBXYWx0ZXIncyBUZXN0
-IENBggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAG3yK1mpA8gq+
-RTSBS7HfW7Y7x7D0kSbQHBW6WXXrSEcTJ3lbph3MjMjJZw0+p4xiIG/k4ErAKjIY
-6w4NWRNEFsSdoxnBhest6RZFEA+VN9/YafqucvG0DAnOD6yGFbXOcMPG3LYK+vOe
-HOaSn5DIb/jt04vkJnXrZ6GrHiMGxxM=
-</ds:X509Certificate>
-                       <ds:X509CRL>MIIBIDCBijANBgkqhkiG9w0BAQQFADBbMQswCQYDVQQGEwJVUzELMAkGA1UECBMC
-VE4xEDAOBgNVBAcTB01lbXBoaXMxEjAQBgNVBAoTCVdhc3NhLk9yRzEZMBcGA1UE
-AxMQV2FsdGVyJ3MgVGVzdCBDQRcNMDUwNDA4MDM1OTQyWhcNMDUwNTA4MDM1OTQy
-WjANBgkqhkiG9w0BAQQFAAOBgQA3L1aOQcPxgio9N7IUdPTu3jyAOV0HfMfWiifc
-3lF/WVq4n655AV61Av5NE41LiSdDqET9wnovmP8Pdbd2DnqvH0wOr3/faALrkZb9
-dE8xlTPidelZLTyhBXauu3ufTgxRYG2rPQ7wkkpos+g8qk9eL9FTfw7amLc5j0mO
-OVVK8w==
-</ds:X509CRL>
+                <ds:X509Certificate>MIIDIjCCAougAwIBAgIJANGYKZx68KK4MA0GCSqGSIb3DQEBBAUAMGoxCzAJBgNV
+BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEDAOBgNVBAcTB01lbXBoaXMxGjAY
+BgNVBAoTEVdhbHRlcidzIFRlc3QgT3JnMRkwFwYDVQQDExBXYWx0ZXIncyBUZXN0
+IENBMB4XDTA2MDgyOTE1MjUzN1oXDTIzMDIwMTE1MjUzN1owajELMAkGA1UEBhMC
+VVMxEjAQBgNVBAgTCVRlbm5lc3NlZTEQMA4GA1UEBxMHTWVtcGhpczEaMBgGA1UE
+ChMRV2FsdGVyJ3MgVGVzdCBPcmcxGTAXBgNVBAMTEFdhbHRlcidzIFRlc3QgQ0Ew
+gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMxPvkI6if+93uapRz75tI9B+GOh
+gNvpTRxZd1CGAvrL07Orbr35zMMGL67hVVO1ZNQAxSebxqXIilVUbk6wREXTr3S+
++V+FcTKwPC0K6vYefLDV/zmlCjVkkrrAqx2yynpjBURSqds5S5PUuY5eifo7GDu7
+WnCQW5TD1fr6wScNAgMBAAGjgc8wgcwwHQYDVR0OBBYEFGTf/TWXNaWPfkqI3tJZ
+3TIiW+07MIGcBgNVHSMEgZQwgZGAFGTf/TWXNaWPfkqI3tJZ3TIiW+07oW6kbDBq
+MQswCQYDVQQGEwJVUzESMBAGA1UECBMJVGVubmVzc2VlMRAwDgYDVQQHEwdNZW1w
+aGlzMRowGAYDVQQKExFXYWx0ZXIncyBUZXN0IE9yZzEZMBcGA1UEAxMQV2FsdGVy
+J3MgVGVzdCBDQYIJANGYKZx68KK4MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEE
+BQADgYEAdTx/yuk5Dp2gxO4gCmdCqkKa0S+lsqAeBPir6X/Q9Agn1VRBnd8fdptt
+NMNjRascUiBo+0RfqRFVr3zzxrhaADbvr2ug0NG1Rim2nZ12Qogyffpn9sWdIvtK
+q+AFzeKmqZVhQrcOo5oThC8XXVq0Un3lnKP9ysk5YlBdrIk1IBA=</ds:X509Certificate>
+                       <ds:X509CRL>MIIBTTCBtzANBgkqhkiG9w0BAQQFADBqMQswCQYDVQQGEwJVUzESMBAGA1UECBMJ
+VGVubmVzc2VlMRAwDgYDVQQHEwdNZW1waGlzMRowGAYDVQQKExFXYWx0ZXIncyBU
+ZXN0IE9yZzEZMBcGA1UEAxMQV2FsdGVyJ3MgVGVzdCBDQRcNMDYwODI5MTYxMzEy
+WhcNMjMwMjAxMTYxMzEyWjAcMBoCCQDRmCmcevCiuhcNMDYwODI5MTYxMjEyWjAN
+BgkqhkiG9w0BAQQFAAOBgQCie5olXEW9FZPYVJOlawl6A3pfnvdguOtYfpP+OzHZ
+9BmDszZyZ/qMxjk4vvdCdmncMhjaVS8DqddPosF5oMriiWJguXa/qLXCwjIIvYmy
+sZw7y1qtM0enaO2j4LPxDXbelufyt+AxX5a4jMnMouTgJXSd9/5wsmjaH/UnL0F/
+1g==</ds:X509CRL>
             </ds:X509Data>
                                </ds:KeyInfo>
                        </KeyAuthority>

diff --git a/data/trusttest.jks b/data/trusttest.jks
index b141e92..1901564 100644 (file)
Binary files a/data/trusttest.jks and b/data/trusttest.jks differ

diff --git a/tests/edu/internet2/middleware/shibboleth/common/TrustTests.java b/tests/edu/internet2/middleware/shibboleth/common/TrustTests.java
index e26cefc..fc206bc 100644 (file)
--- a/tests/edu/internet2/middleware/shibboleth/common/TrustTests.java
+++ b/tests/edu/internet2/middleware/shibboleth/common/TrustTests.java
@@ -48,7 +48,7 @@ public class TrustTests extends TestCase {
                super(name);
                BasicConfigurator.resetConfiguration();
                BasicConfigurator.configure();
-               Logger.getRootLogger().setLevel(Level.DEBUG);
+               Logger.getRootLogger().setLevel(Level.OFF);
                
                Configuration.init();
        }
@@ -474,7 +474,7 @@ public class TrustTests extends TestCase {
        }
 
        public void testCRLDoesntBreakValid() {
-
+                
                try {
                        // Pull the role descriptor from example metadata
                        MetadataProvider metadata = new FilesystemMetadataProvider(new File("data/metadata8.xml"));
@@ -485,7 +485,7 @@ public class TrustTests extends TestCase {
                        KeyStore keyStore = KeyStore.getInstance("JKS");
                        keyStore.load(new ShibResource(new File("data/trusttest.jks").toURL().toString()).getInputStream(),
                                        new char[]{'t', 'e', 's', 't', '1', '2', '3'});
-                       X509Certificate cert = (X509Certificate) keyStore.getCertificate("inline4");
+                       X509Certificate cert = (X509Certificate) keyStore.getCertificate("pkix5");
 
                        // Try to validate against the metadata
                        TrustEngine<X509EntityCredential> validator = new ShibbolethTrustEngine();