[java-identity-provider] branch main updated: Remove unused test data.

Scott Cantor cantor.2 at osu.edu
Thu Oct 27 13:01:11 UTC 2022


This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=e39ceed2848f25095b38856527fe07820b34e525

The following commit(s) were added to refs/heads/main by this push:
     new e39ceed28 Remove unused test data.
e39ceed28 is described below

commit e39ceed2848f25095b38856527fe07820b34e525
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Oct 27 09:01:07 2022 -0400

    Remove unused test data.
---
 .../impl/CryptoTransientNameIDDecoderTest.java     |    4 +-
 .../CryptoTransientNameIdentifierDecoderTest.java  |    4 +-
 ...oTransientSAML1NameIdentifierGeneratorTest.java |    4 +-
 .../CryptoTransientSAML2NameIDGeneratorTest.java   |    4 +-
 .../saml/impl/attribute/resolver/StoredIdStore.sql |    9 -
 .../idp/saml/impl/metadata/InCommon-metadata.xml   | 1207 --------------------
 .../saml/impl/metadata/NodeProcessor-metadata.xml  |   65 --
 .../resolver => nameid}/SealerKeyStore.jks         |  Bin
 .../resolver => nameid}/SealerKeyStore.kver        |    0
 .../KeyAuthority-NodeProcessor-metadata.xml        |  214 ----
 .../idp/saml/impl/security/empty-metadata-pkix.xml |   60 -
 .../impl/security/names-entities-metadata-pkix.xml |  142 ---
 .../security/nodepth-entities-metadata-pkix.xml    |  144 ---
 .../security/oneset-3keyinfo-metadata-pkix.xml     |  258 -----
 .../security/oneset-entities-metadata-pkix.xml     |  143 ---
 .../impl/security/oneset-entity-metadata-pkix.xml  |  144 ---
 ...eset-entity-entities-entities-metadata-pkix.xml |  297 -----
 .../twoset-2authorities-entities-metadata-pkix.xml |  189 ---
 .../twoset-entity-entities-metadata-pkix.xml       |  263 -----
 .../idp/saml/impl/xmlobject/ShibMDKeyAuthority.xml |    2 -
 .../xmlobject/ShibMDKeyAuthorityChildElements.xml  |    7 -
 .../ShibMDKeyAuthorityOptionalAttributes.xml       |    2 -
 .../idp/saml/impl/xmlobject/ShibMDScope.xml        |    2 -
 .../xmlobject/ShibMDScopeOptionalAttributes.xml    |    2 -
 .../idp/saml/impl/xmlobject/ShibScopedValue.xml    |    2 -
 .../ShibScopedValueOptionalAttributes.xml          |    2 -
 26 files changed, 8 insertions(+), 3162 deletions(-)

diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java
index 32e8aa20e..38a728134 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java
@@ -75,11 +75,11 @@ public class CryptoTransientNameIDDecoderTest extends OpenSAMLInitBaseTestCase {
     @BeforeClass public void setupDataSealer() throws IOException, DataSealerException, ComponentInitializationException {
 
         final Resource keyStore =
-                new ClassPathResource("/net/shibboleth/idp/saml/impl/attribute/resolver/SealerKeyStore.jks");
+                new ClassPathResource("/net/shibboleth/idp/saml/impl/nameid/SealerKeyStore.jks");
         Assert.assertTrue(keyStore.exists());
         
         final Resource version =
-                new ClassPathResource("/net/shibboleth/idp/saml/impl/attribute/resolver/SealerKeyStore.kver");
+                new ClassPathResource("/net/shibboleth/idp/saml/impl/nameid/SealerKeyStore.kver");
         Assert.assertTrue(version.exists());
 
         final BasicKeystoreKeyStrategy kstrategy = new BasicKeystoreKeyStrategy();
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIdentifierDecoderTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIdentifierDecoderTest.java
index 542e63e42..5dd5751d5 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIdentifierDecoderTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIdentifierDecoderTest.java
@@ -61,11 +61,11 @@ public class CryptoTransientNameIdentifierDecoderTest extends OpenSAMLInitBaseTe
     @BeforeClass public void setupDataSealer() throws Exception {
 
         final Resource keyStore =
-                new ClassPathResource("/net/shibboleth/idp/saml/impl/attribute/resolver/SealerKeyStore.jks");
+                new ClassPathResource("/net/shibboleth/idp/saml/impl/nameid/SealerKeyStore.jks");
         Assert.assertTrue(keyStore.exists());
         
         final Resource version =
-                new ClassPathResource("/net/shibboleth/idp/saml/impl/attribute/resolver/SealerKeyStore.kver");
+                new ClassPathResource("/net/shibboleth/idp/saml/impl/nameid/SealerKeyStore.kver");
         Assert.assertTrue(version.exists());
 
         final BasicKeystoreKeyStrategy kstrategy = new BasicKeystoreKeyStrategy();
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML1NameIdentifierGeneratorTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML1NameIdentifierGeneratorTest.java
index cda09f499..cfe9e3c6a 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML1NameIdentifierGeneratorTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML1NameIdentifierGeneratorTest.java
@@ -51,11 +51,11 @@ public class CryptoTransientSAML1NameIdentifierGeneratorTest extends OpenSAMLIni
     
     @BeforeMethod public void setUp() throws ComponentInitializationException, IOException {
         final Resource keyStore =
-                new ClassPathResource("/net/shibboleth/idp/saml/impl/attribute/resolver/SealerKeyStore.jks");
+                new ClassPathResource("/net/shibboleth/idp/saml/impl/nameid/SealerKeyStore.jks");
         Assert.assertTrue(keyStore.exists());
         
         final Resource version =
-                new ClassPathResource("/net/shibboleth/idp/saml/impl/attribute/resolver/SealerKeyStore.kver");
+                new ClassPathResource("/net/shibboleth/idp/saml/impl/nameid/SealerKeyStore.kver");
         Assert.assertTrue(version.exists());
 
         final BasicKeystoreKeyStrategy kstrategy = new BasicKeystoreKeyStrategy();
diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML2NameIDGeneratorTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML2NameIDGeneratorTest.java
index a5886679f..4fd1bd295 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML2NameIDGeneratorTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML2NameIDGeneratorTest.java
@@ -52,11 +52,11 @@ public class CryptoTransientSAML2NameIDGeneratorTest extends OpenSAMLInitBaseTes
     
     @BeforeMethod public void setUp() throws ComponentInitializationException, IOException {
         final Resource keyStore =
-                new ClassPathResource("/net/shibboleth/idp/saml/impl/attribute/resolver/SealerKeyStore.jks");
+                new ClassPathResource("/net/shibboleth/idp/saml/impl/nameid/SealerKeyStore.jks");
         Assert.assertTrue(keyStore.exists());
         
         final Resource version =
-                new ClassPathResource("/net/shibboleth/idp/saml/impl/attribute/resolver/SealerKeyStore.kver");
+                new ClassPathResource("/net/shibboleth/idp/saml/impl/nameid/SealerKeyStore.kver");
         Assert.assertTrue(version.exists());
 
         final BasicKeystoreKeyStrategy kstrategy = new BasicKeystoreKeyStrategy();
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIdStore.sql b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIdStore.sql
deleted file mode 100644
index ba342c92d..000000000
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/resolver/StoredIdStore.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE TABLE shibpid (
-	localEntity VARCHAR(50) NOT NULL, 
-	peerEntity VARCHAR(50) NOT NULL,
-	principalName VARCHAR(50) NOT NULL, 
-	localId VARCHAR(50) NOT NULL, 
-	persistentId VARCHAR(50) NOT NULL, 
-	peerProvidedId VARCHAR(50), 
-	creationDate TIMESTAMP NOT NULL, 
-	deactivationDate TIMESTAMP);
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/metadata/InCommon-metadata.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/metadata/InCommon-metadata.xml
deleted file mode 100644
index df4a71b6d..000000000
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/metadata/InCommon-metadata.xml
+++ /dev/null
@@ -1,1207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="urn:mace:incommon" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata sstc-saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-<ds:SignedInfo>
-<ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/>
-<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-<ds:Reference URI="">
-<ds:Transforms>
-<ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
-<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/>
-</ds:Transforms>
-<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-<ds:DigestValue>91oiRc8Bwf+DJq/kO/4vQh723F8=</ds:DigestValue>
-</ds:Reference>
-</ds:SignedInfo>
-<ds:SignatureValue>
-txodSjGrZlegJY9lHLlxfhOpK0v8SGNmFFHPXM9j54gZdbK+N8+4rPEjVCOg33Bk8RZ+OcBQNQQH
-otCvlXEpput84qTDVbe8xIGXzTbRH+45oLV6PQCEvZ4Pd3W/D2BZmI77DLHOlsQFJW2B6Ct98sO6
-qvWi7hStX8qaPnZe3hpDOgdhNpfZh/WiY5VTPsYT/+KHFv1wM3AqIPUKJ/9q6ahD80NlpJzpliE9
-PbEnEiuUKWq255jNBnbl/xR4jN+MhX1pOzxD1x+tDqJLVL+rgoHQZJHoxHzYykRKW4FITRL0ASXZ
-lgKxBy5k/W0hPzm4ntrX3OvpW49S0ys3BlAEWQ==
-</ds:SignatureValue>
-<ds:KeyInfo>
-<ds:X509Data>
-<ds:X509Certificate>
-MIIF2zCCBMOgAwIBAgIBQjANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-SW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5Db21tb24gQ2VydGlmaWNhdGlvbiBBdXRo
-b3JpdHkwHhcNMDYwNDEwMTY1NjM3WhcNMDcwNDEwMTY1NjM3WjBSMQswCQYDVQQGEwJVUzEcMBoG
-A1UEChMTSW5Db21tb24gRmVkZXJhdGlvbjElMCMGA1UEAxMcZmVkb3AuaW5jb21tb25mZWRlcmF0
-aW9uLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAoXZK5/nRuWY+S91CMPsXl
-oDc5vGo8O/xcqkUNUow+C34NlgnZX4zq2BjZ1WTAk3yLaF00qYOK18R0LMpHjYmEbtvtNrjEvtaZ
-walo83TyRNKHfqvBG3bxOkoYpo8jZ9MkHxskCgjXWLnPu+TCB7GiDgBLQ2VEk/UneKHlNc0Y1drB
-r1HfiRR73lAIUXNG/iRGXyBLqvyyFPasZv/oBWmsJZqI2T8jlmdSZbMG66yWGMp9dKoJyb44fYGV
-lyo5j8arxyiXAEz4QIdoFhmm1k1wSQnJDHtYaxwpf72wywps9P6GLqGkg8z+sxPWEgP8QqZWhwNJ
-qAtVbNh+TDkBpXsCAwEAAaOCArYwggKyMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0G
-A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQU5ij9YLU5zQ6K75kPgVpyQ2N/
-lPswfgYDVR0jBHcwdYAUky3IYRitY+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVTMRww
-GgYDVQQKExNJbkNvbW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNvbW1vbiBDZXJ0aWZpY2F0
-aW9uIEF1dGhvcml0eYIBADCBugYIKwYBBQUHAQEEga0wgaowgacGCCsGAQUFBzAChoGaaHR0cDov
-L2luY29tbW9uY2ExLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdlL2NlcnRzL2NhLWNlcnRz
-LnA3YgoJCUNBIElzc3VlcnMgLSBVUkk6aHR0cDovL2luY29tbW9uY2EyLmluY29tbW9uZmVkZXJh
-dGlvbi5vcmcvYnJpZGdlL2NlcnRzL2NhLWNlcnRzLnA3YjCBjQYDVR0fBIGFMIGCMD+gPaA7hjlo
-dHRwOi8vaW5jb21tb25jcmwxLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvY3JsL2VlY3Jscy5jcmww
-P6A9oDuGOWh0dHA6Ly9pbmNvbW1vbmNybDIuaW5jb21tb25mZWRlcmF0aW9uLm9yZy9jcmwvZWVj
-cmxzLmNybDBeBgNVHSAEVzBVMFMGCysGAQQBriMBBAEBMEQwQgYIKwYBBQUHAgEWNmh0dHA6Ly9p
-bmNvbW1vbmNhLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvcHJhY3RpY2VzLnBkZjAnBgNVHREEIDAe
-ghxmZWRvcC5pbmNvbW1vbmZlZGVyYXRpb24ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQDNwpH5FdVi
-qXKwN51xRQhSabH04DIFo9tnGWA/U2MOH1Gwh2Vt0JzlxZ5gZrsUM9gQBMLmifjxB29rY2xnhhjW
-FJhoTsI2F2KPav6W5Eqykq3yDV06oqNq0N0yMtB+og2yCIIZFvEG0wTKyv2n3bZqNaXz9r808b7p
-v/OVPW4HnmUtfFDg8q7C4Y2wbWqBYINkOi4lVbKzi2Sk5nVohuRGBja7eTYlpBP3nF+E/xb49JxQ
-AErc8wFZhJJdKNBnGWKOxelxC4nwda+g3mcc2T6REM0OUU7ArAlOdXW1eYNtflZe1G4qJ+6lTbpx
-8unyNnbIxDshbno8FbG0gIXOQ/4s
-</ds:X509Certificate>
-<ds:X509Certificate>
-MIIFmjCCBIKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJVUzEcMBoGA1UEChMT
-SW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5Db21tb24gQ2VydGlmaWNhdGlvbiBBdXRo
-b3JpdHkwHhcNMDQwMzMwMjAzNDAwWhcNMTQwMzI5MjAzNDAwWjBWMQswCQYDVQQGEwJVUzEcMBoG
-A1UEChMTSW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5Db21tb24gQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRGjKsUM2QAupLAaWx
-82/CWPalKjKFY8UPmz0T3gf7tJPztTy1Zq8pD0WFRLcQeSBKZGCu8upe8X966b6TZ5yuoUDA754I
-f0DWismuHNoMgRR/l0UvZmPWDGRWd3NBTB8/soLA4EbqFf5Xq8MOJKhPtzcDR33gtaAb3oilZ+ZT
-pnhTFFrn/qXrAKcSDBpuW2JRpi3xaF/hTPI097oUShOzD1Zj21UYLA6iSFVN+1wlfwilf2KFNK/+
-zbkCge6wgipZyXxaOAam6ncqmkxy+hy/OiJMmdB+6xkO0xXSBUUcqxJrOcUQhA1vntgb3q5zOJIS
-XhC4RAReA0HyBp/wd0iDAgMBAAGjggJxMIICbTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUky3IYRitY+ObZbOd3Y2TuufKY0UwfgYDVR0jBHcwdYAUky3IYRitY+Ob
-ZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNJbkNvbW1vbiBGZWRlcmF0
-aW9uMSkwJwYDVQQDEyBJbkNvbW1vbiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eYIBADCBugYIKwYB
-BQUHAQEEga0wgaowgacGCCsGAQUFBzAChoGaaHR0cDovL2luY29tbW9uY2ExLmluY29tbW9uZmVk
-ZXJhdGlvbi5vcmcvYnJpZGdlL2NlcnRzL2NhLWNlcnRzLnA3YgoJCUNBIElzc3VlcnMgLSBVUkk6
-aHR0cDovL2luY29tbW9uY2EyLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdlL2NlcnRzL2Nh
-LWNlcnRzLnA3YjCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vaW5jb21tb25jcmwxLmluY29t
-bW9uZmVkZXJhdGlvbi5vcmcvY3JsL2VlY3Jscy5jcmwwP6A9oDuGOWh0dHA6Ly9pbmNvbW1vbmNy
-bDIuaW5jb21tb25mZWRlcmF0aW9uLm9yZy9jcmwvZWVjcmxzLmNybDBeBgNVHSAEVzBVMFMGCysG
-AQQBriMBBAEBMEQwQgYIKwYBBQUHAgEWNmh0dHA6Ly9pbmNvbW1vbmNhLmluY29tbW9uZmVkZXJh
-dGlvbi5vcmcvcHJhY3RpY2VzLnBkZjANBgkqhkiG9w0BAQUFAAOCAQEAZfgKUPA+Ky+Ou/vclMlF
-TMlUGspfbNSdG/fmIq+E/Lv1d2c73Am1zGhOpxgdkM8SE+BPnXW2rl71/N8gaqwgBBxkpwn410si
-umxlDTwV3HoVFvCGWylNy9o8OE1LyTCqfo8PRwrMzhwcagDgD813BIyjuJg/JQz1LnHMocIW/Jli
-gloSIzF1O435/+ckfWXQsmBIhvV5TmA3ZrcycrI1cHGEZqrCXL0FMZLSr+Vady/tFbVojqI8pSub
-SMxNkZectePTBjVj1Qeb4hmG8jRv/fwy1Iw6OFH8RKny8nQaO5mOe/fF/swEsMVU9TDpvLIgbhTw
-nP7Nhfotgaxf5wG8WA==
-</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo></ds:Signature>
-  <Extensions>
-    <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
-      <!-- InCommon CA -->
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFmjCCBIKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJVUzEc
-MBoGA1UEChMTSW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5Db21tb24g
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwMzMwMjAzNDAwWhcNMTQwMzI5
-MjAzNDAwWjBWMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTSW5Db21tb24gRmVkZXJh
-dGlvbjEpMCcGA1UEAxMgSW5Db21tb24gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRGjKsUM2QAupLAaWx82/C
-WPalKjKFY8UPmz0T3gf7tJPztTy1Zq8pD0WFRLcQeSBKZGCu8upe8X966b6TZ5yu
-oUDA754If0DWismuHNoMgRR/l0UvZmPWDGRWd3NBTB8/soLA4EbqFf5Xq8MOJKhP
-tzcDR33gtaAb3oilZ+ZTpnhTFFrn/qXrAKcSDBpuW2JRpi3xaF/hTPI097oUShOz
-D1Zj21UYLA6iSFVN+1wlfwilf2KFNK/+zbkCge6wgipZyXxaOAam6ncqmkxy+hy/
-OiJMmdB+6xkO0xXSBUUcqxJrOcUQhA1vntgb3q5zOJISXhC4RAReA0HyBp/wd0iD
-AgMBAAGjggJxMIICbTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
-BgNVHQ4EFgQUky3IYRitY+ObZbOd3Y2TuufKY0UwfgYDVR0jBHcwdYAUky3IYRit
-Y+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVTMRwwGgYDVQQKExNJbkNv
-bW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNvbW1vbiBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eYIBADCBugYIKwYBBQUHAQEEga0wgaowgacGCCsGAQUFBzAChoGa
-aHR0cDovL2luY29tbW9uY2ExLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdl
-L2NlcnRzL2NhLWNlcnRzLnA3YgoJCUNBIElzc3VlcnMgLSBVUkk6aHR0cDovL2lu
-Y29tbW9uY2EyLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdlL2NlcnRzL2Nh
-LWNlcnRzLnA3YjCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vaW5jb21tb25j
-cmwxLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvY3JsL2VlY3Jscy5jcmwwP6A9oDuG
-OWh0dHA6Ly9pbmNvbW1vbmNybDIuaW5jb21tb25mZWRlcmF0aW9uLm9yZy9jcmwv
-ZWVjcmxzLmNybDBeBgNVHSAEVzBVMFMGCysGAQQBriMBBAEBMEQwQgYIKwYBBQUH
-AgEWNmh0dHA6Ly9pbmNvbW1vbmNhLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvcHJh
-Y3RpY2VzLnBkZjANBgkqhkiG9w0BAQUFAAOCAQEAZfgKUPA+Ky+Ou/vclMlFTMlU
-GspfbNSdG/fmIq+E/Lv1d2c73Am1zGhOpxgdkM8SE+BPnXW2rl71/N8gaqwgBBxk
-pwn410siumxlDTwV3HoVFvCGWylNy9o8OE1LyTCqfo8PRwrMzhwcagDgD813BIyj
-uJg/JQz1LnHMocIW/JligloSIzF1O435/+ckfWXQsmBIhvV5TmA3ZrcycrI1cHGE
-ZqrCXL0FMZLSr+Vady/tFbVojqI8pSubSMxNkZectePTBjVj1Qeb4hmG8jRv/fwy
-1Iw6OFH8RKny8nQaO5mOe/fF/swEsMVU9TDpvLIgbhTwnP7Nhfotgaxf5wG8WA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </shibmd:KeyAuthority>
-  </Extensions>
-
-<EntityDescriptor entityID="urn:mace:incommon:internet2.edu">
-   <IDPSSODescriptor errorURL="https://origin.internet2.edu/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">internet2.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>origin.internet2.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://origin.internet2.edu/shibboleth/HS"/>
-   </IDPSSODescriptor>
-   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">internet2.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>origin.internet2.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://origin.internet2.edu:8443/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-   </AttributeAuthorityDescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">Internet2</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Internet2</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en"/>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>IJ Kim</GivenName>
-      <EmailAddress>ij at internet2.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-
-  <EntityDescriptor entityID="urn:mace:incommon:dartmouth.edu">
-    <IDPSSODescriptor errorURL="http://giza.dartmouth.edu/shibboleth/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dartmouth.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>giza.dartmouth.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://giza.dartmouth.edu/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor errorURL="http://giza.dartmouth.edu/shibboleth/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dartmouth.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>giza.dartmouth.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://giza.dartmouth.edu:8443/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">Dartmouth College</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Dartmouth College</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.dartmouth.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="administrative">
-      <GivenName>Robert Brentrup</GivenName>
-      <EmailAddress>Robert.J.Brentrup at dartmouth.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Robert Brentrup</GivenName>
-      <EmailAddress>Robert.J.Brentrup at dartmouth.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-  <EntityDescriptor entityID="urn:mace:incommon:rochester.edu">
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rochester.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shib.its.rochester.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.its.rochester.edu/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rochester.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shib.its.rochester.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.its.rochester.edu/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">University of Rochester</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">University of Rochester</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.rochester.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="administrative">
-      <GivenName>Sean Singh</GivenName>
-      <EmailAddress>sean.singh at rochester.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Sean Singh</GivenName>
-      <EmailAddress>sean.singh at rochester.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Charles Yanaitis</GivenName>
-      <EmailAddress>charles.yanaitis at rochester.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-<EntityDescriptor entityID="urn:mace:incommon:osu.edu">
-   <IDPSSODescriptor errorURL="https://webauth.service.ohio-state.edu/support.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osu.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>webauth.service.ohio-state.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.service.ohio-state.edu:8443/shibboleth/Artifact" index="1"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.service.ohio-state.edu/shibboleth/SSO"/>
-   </IDPSSODescriptor>
-   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osu.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>webauth.service.ohio-state.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.service.ohio-state.edu:8443/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-   </AttributeAuthorityDescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">The Ohio State University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The Ohio State University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.osu.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Scott Cantor</GivenName>
-      <EmailAddress>cantor.2 at osu.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Scott Cantor</GivenName>
-      <EmailAddress>cantor.2 at osu.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="urn:mace:incommon:uci.edu">
-   <IDPSSODescriptor errorURL="http://shib.nacs.uci.edu/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uci.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shib.nacs.uci.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.nacs.uci.edu/shibboleth-idp/Artifact" index="1"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.nacs.uci.edu/shibboleth-idp/SSO"/>
-   </IDPSSODescriptor>
-   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uci.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shib.nacs.uci.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.nacs.uci.edu:8443/shibboleth-idp/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-   </AttributeAuthorityDescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">University of California-Irvine</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">University of California-Irvine</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.uci.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="administrative">
-      <GivenName>Brian Roode</GivenName>
-      <EmailAddress>bgroode at uci.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>Paul Main</GivenName>
-      <EmailAddress>pmain at uci.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-
-  <EntityDescriptor entityID="urn:mace:incommon:buffalo.edu">
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">buffalo.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.buffalo.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.buffalo.edu/shibboleth-ext/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">buffalo.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.buffalo.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.buffalo.edu:7443/shibboleth-ext/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">The State University of New York at Buffalo</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The State University of New York at Buffalo</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.buffalo.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="administrative">
-      <GivenName>Charles Dunn</GivenName>
-      <EmailAddress>chuck at buffalo.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>John A Ball</GivenName>
-      <EmailAddress>auth-support at gory.acsu.buffalo.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Joel W. Murphy</GivenName>
-      <EmailAddress>jmurphy at buffalo.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-  <EntityDescriptor entityID="urn:mace:incommon:washington.edu">
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">washington.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>hs.so.cac.washington.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hs.so.cac.washington.edu/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">washington.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>hs.so.cac.washington.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aa.so.cac.washington.edu/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">University of Washington</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">University of Washington</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.washington.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="administrative">
-      <GivenName>Nathan Dors</GivenName>
-      <EmailAddress>dors at cac.washington.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Nathan Dors</GivenName>
-      <EmailAddress>pubcookie at cac.washington.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-  <EntityDescriptor entityID="urn:mace:incommon:cornell.edu">
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cornell.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shiborigin.cit.cornell.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shiborigin.cit.cornell.edu/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cornell.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shiborigin.cit.cornell.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shiborigin.cit.cornell.edu:8443/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">Cornell University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Cornell University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.cornell.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="administrative">
-      <GivenName>Andrea Beesing</GivenName>
-      <EmailAddress>amb3 at cornell.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Steve Edgar</GivenName>
-      <EmailAddress>se10 at cornell.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Ron DiNapoli</GivenName>
-      <EmailAddress>rd29 at cornell.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-<EntityDescriptor entityID="urn:mace:incommon:psu.edu">
-   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psu.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>as1.fim.psu.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://as1.fim.psu.edu/shibboleth-idp/SSO"/>
-   </IDPSSODescriptor>
-   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psu.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>as1.fim.psu.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://as1.fim.psu.edu:8443/shibboleth-idp/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-   </AttributeAuthorityDescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">The Pennsylvania State University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The Pennsylvania State University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.psu.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Technical Staff</GivenName>
-      <EmailAddress>root at aset.psu.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Kevin Morooney</GivenName>
-      <EmailAddress>kxm at psu.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>Mark Miller</GivenName>
-      <EmailAddress>max at psu.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-  <EntityDescriptor entityID="urn:mace:incommon:usc.edu">
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usc.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shib1.usc.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib1.usc.edu/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usc.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shib1.usc.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1.usc.edu/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">University of Southern California</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">University of Southern California</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.usc.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="administrative">
-      <GivenName>Cecelia E. Henderson</GivenName>
-      <EmailAddress>shelley at usc.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Phil Dibowitz</GivenName>
-      <EmailAddress>phil at usc.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-  <EntityDescriptor entityID="urn:mace:incommon:ucsd.edu">
-    <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsd.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>a4.ucsd.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://a4.ucsd.edu/tritON/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsd.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>a4.ucsd.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://a4.ucsd.edu:8443/tritON/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">University of California-San Diego</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">University of California-San Diego</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.ucsd.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-      <GivenName>Crystal Harris</GivenName>
-      <EmailAddress>crys at ucsd.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-      <GivenName>Anthony R. Wood</GivenName>
-      <EmailAddress>twood at ucsd.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Anthony R. Wood</GivenName>
-      <EmailAddress>twood at ucsd.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-  <EntityDescriptor entityID="urn:mace:incommon:ohio.edu">
-    <IDPSSODescriptor errorURL="https://shibboleth.ohio.edu" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ohio.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.ohio.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ohio.edu/shibboleth/HS"/>
-    </IDPSSODescriptor>
-    <AttributeAuthorityDescriptor errorURL="https://shibboleth.ohio.edu" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-        <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ohio.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibboleth.ohio.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ohio.edu:8443/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    </AttributeAuthorityDescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">Ohio University Main Campus</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Ohio University Main Campus</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.ohiou.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="administrative">
-      <GivenName>Todd Acheson</GivenName>
-      <EmailAddress>acheson at ohio.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Vitaliy Shipitsyn</GivenName>
-      <EmailAddress>vshipits at ohio.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>David Alexander</GivenName>
-      <EmailAddress>alexandd at ohio.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-
-<EntityDescriptor entityID="https://getz.internet2.edu/shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>getz.internet2.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://getz.internet2.edu/Shibboleth.sso/SAML/POST" index="0"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://getz.internet2.edu/Shibboleth.shire" index="0"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">Internet2</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Internet2</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en"/>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>IJ Kim</GivenName>
-      <EmailAddress>ij at internet2.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-  <EntityDescriptor entityID="https://www.internet2.edu/shibboleth">
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>www.internet2.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://www.internet2.edu/Shibboleth.shire" index="0"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.internet2.edu/Shibboleth.shire" index="1"/>
-    </SPSSODescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">Internet2 Web Site</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Internet2 Web Site</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.internet2.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-      <GivenName>IJ Kim</GivenName>
-      <EmailAddress>ij at internet2.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-  <EntityDescriptor entityID="https://sdauth.sciencedirect.com/">
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth.sciencedirect.com/SHIRE" index="0"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth-cert3.sciencedirect.com/SHIRE" index="1"/>
-    </SPSSODescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">ScienceDirect</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">ScienceDirect</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.sciencedirect.com/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-      <GivenName>Chris Shillum</GivenName>
-      <EmailAddress>c.shillum at elsevier.com</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-      <GivenName>Chris Shillum</GivenName>
-      <EmailAddress>c.shillum at elsevier.com</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Tony Gast</GivenName>
-      <EmailAddress>tony.gast at lexisnexis.com</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-
-
-<EntityDescriptor entityID="https://wiki.it.ohio-state.edu/shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>wiki.it.ohio-state.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authdev.it.ohio-state.edu/twiki/Shibboleth.sso/SAML/Artifact" index="1" isDefault="true"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.it.ohio-state.edu/twiki/Shibboleth.sso/SAML/POST" index="2"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.it.ohio-state.edu/twiki/Shibboleth.sso/SAML/Artifact" index="3"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authdev.it.ohio-state.edu/twiki/Shibboleth.sso/SAML/POST" index="4"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">The Ohio State University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The Ohio State University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.osu.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="administrative">
-      <GivenName>Webauth Technical Support Staff</GivenName>
-      <EmailAddress>webauth-admin at lists.acs.ohio-state.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>Webauth Technical Support Staff</GivenName>
-      <EmailAddress>webauth-admin at lists.acs.ohio-state.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-
-  <EntityDescriptor entityID="http://www.sciencedirect.com/">
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth.sciencedirect.com/SHIRE" index="0"/>
-    </SPSSODescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">ScienceDirect</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">ScienceDirect</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.sciencedirect.com/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-      <GivenName>Tony Gast</GivenName>
-      <EmailAddress>tony.gast at lexisnexis.com</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="technical">
-      <GivenName>Chris Shillum</GivenName>
-      <EmailAddress>c.shillum at elsevier.com</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-      <GivenName>Tony Gast</GivenName>
-      <EmailAddress>tony.gast at lexisnexis.com</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-<EntityDescriptor entityID="https://shib.dev.oclc.org/shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shib.dev.oclc.org</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://shib.dev.oclc.org:2080/Shibboleth.shire" index="1"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.dev.oclc.org:2443/Shibboleth.shire" index="2"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">Online Computer Library Center Inc.</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Online Computer Library Center Inc.</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.oclc.org</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="administrative">
-      <GivenName>Eva Marie Allen</GivenName>
-      <EmailAddress>allene at oclc.org</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>Eva Marie Allen</GivenName>
-      <EmailAddress>allene at oclc.org</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-
-<EntityDescriptor entityID="https://shib.oclc.org/shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shib.oclc.org</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.oclc.org:2443/Shibboleth.shire" index="1"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://shib.oclc.org:2080/Shibboleth.shire" index="2"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">Online Computer Library Center Inc.</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Online Computer Library Center Inc.</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.oclc.org</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="administrative">
-      <GivenName>Sharon Ramsay</GivenName>
-      <EmailAddress>shibboleth at oclc.org</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>Eva Marie Allen</GivenName>
-      <EmailAddress>shibboleth at oclc.org</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>Richard Scranton</GivenName>
-      <EmailAddress>shibboleth at oclc.org</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-
-  <EntityDescriptor entityID="https://shibtest.nac.uci.edu/cgi-bin/printenv">
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>shibtest.nac.uci.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibtest.nac.uci.edu/Shibboleth.shire" index="0"/>
-    </SPSSODescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">UCIs InCommon Demo Resource</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">UCIs InCommon Demo Resource</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.uci.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-      <GivenName>Paul Main</GivenName>
-      <EmailAddress>pmain at uci.edu</EmailAddress>
-    </ContactPerson>
-    <ContactPerson contactType="administrative">
-      <GivenName>Brian Roode</GivenName>
-      <EmailAddress>bgroode at uci.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-
-  <EntityDescriptor entityID="https://share.internet2.edu/shibboleth">
-    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-        <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-          <ds:KeyName>share.internet2.edu</ds:KeyName>
-        </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://share.internet2.edu/Shibboleth.shire" index="0"/>
-    </SPSSODescriptor>
-    <Organization>
-      <OrganizationName xml:lang="en">Internet2 Wiki</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Internet2 Wiki</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.internet2.edu/</OrganizationURL>
-    </Organization>
-    <ContactPerson contactType="technical">
-      <GivenName>IJ Kim</GivenName>
-      <EmailAddress>ij at internet2.edu</EmailAddress>
-    </ContactPerson>
-  </EntityDescriptor>
-<EntityDescriptor entityID="https://www.webassign.net/Shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>www.webassign.net</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.webassign.net/Shibboleth.sso" index="0"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">WebAssign</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">WebAssign</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.webassign.net/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Brian Marks</GivenName>
-      <EmailAddress>brian at webassign.net</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="urn:mace:incommon:cornell.edu">
-   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cornell.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shiborigin.cit.cornell.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shiborigin.cit.cornell.edu/shibboleth/HS"/>
-   </IDPSSODescriptor>
-   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cornell.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shiborigin.cit.cornell.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shiborigin.cit.cornell.edu:8443/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-   </AttributeAuthorityDescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">Cornell University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Cornell University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.cornell.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Todd Zino</GivenName>
-      <EmailAddress>tcz3 at cornell.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>Pete Bosanko</GivenName>
-      <EmailAddress>pb10 at cornell.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Andrea Beesing</GivenName>
-      <EmailAddress>amb3 at cornell.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="urn:mace:incommon:case.edu">
-   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">case.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shibb.case.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb.case.edu/shibboleth/HS"/>
-   </IDPSSODescriptor>
-   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">case.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shibb.case.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.case.edu:8443/shibboleth/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-   </AttributeAuthorityDescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">Case Western Reserve University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">Case Western Reserve University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.cwru.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Jeremy Smith</GivenName>
-      <EmailAddress>jeremy.smith at case.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="technical">
-      <GivenName>David Kovacic</GivenName>
-      <EmailAddress>david.kovacic at case.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="https://www.e-education.psu.edu/shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>www.e-education.psu.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.e-education.psu.edu/Shibboleth.sso/SAML/POST" index="1"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.e-education.psu.edu/Shibboleth.sso/SAML/Artifact" index="2"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">The Pennsylvania State University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The Pennsylvania State University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.psu.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Jeff Buechler</GivenName>
-      <EmailAddress>jdb11 at psu.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Jeff Wolfe</GivenName>
-      <EmailAddress>wolfe at ems.psu.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="https://angelshibaccept.ais.psu.edu/Shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>angelshibaccept.ais.psu.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://angelshibaccept.ais.psu.edu/Shibboleth/Shibboleth.shire" index="1"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">The Pennsylvania State University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The Pennsylvania State University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.psu.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Andy Fisher</GivenName>
-      <EmailAddress>anf107 at psu.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Terry O'Heron</GivenName>
-      <EmailAddress>tno1 at psu.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="https://shib.cms.psu.edu/Shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shib.cms.psu.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.cms.psu.edu/Shibboleth/Shibboleth.shire" index="1"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">The Pennsylvania State University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The Pennsylvania State University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.psu.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Andy Fisher</GivenName>
-      <EmailAddress>anf107 at psu.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Terry O'Heron</GivenName>
-      <EmailAddress>tno1 at psu.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="https://shib.nacs.uci.edu/cgi-bin/printenv">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shib.nacs.uci.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.nacs.uci.edu/Shibboleth.sso/SAML/POST" index="1"/>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.nacs.uci.edu/Shibboleth.sso/SAML/Artifact" index="2"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">University of California-Irvine</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">University of California-Irvine</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.uci.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Paul Main</GivenName>
-      <EmailAddress>pmain at uci.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Brian Roode</GivenName>
-      <EmailAddress>bgroode at uci.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="https://cms.psu.edu/Shibboleth">
-   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <KeyDescriptor>
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>cms.psu.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cms.psu.edu/Shibboleth/Shibboleth.shire" index="1"/>
-   </SPSSODescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">The Pennsylvania State University</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">The Pennsylvania State University</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.psu.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Andy Fisher</GivenName>
-      <EmailAddress>anf107 at psu.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Terry O'Heron</GivenName>
-      <EmailAddress>tno1 at psu.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-<EntityDescriptor entityID="urn:mace:incommon:ucla.edu">
-   <IDPSSODescriptor errorURL="https://shb.ais.ucla.edu/shibboleth-idp/WAYFerror" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucla.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shb.ais.ucla.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shb.ais.ucla.edu/shibboleth-idp/Artifact" index="1"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-      <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shb.ais.ucla.edu/shibboleth-idp/SSO"/>
-   </IDPSSODescriptor>
-   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-      <Extensions>
-         <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucla.edu</shibmd:Scope>
-      </Extensions>
-      <KeyDescriptor use="signing">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:KeyName>shb.ais.ucla.edu</ds:KeyName>
-         </ds:KeyInfo>
-      </KeyDescriptor>
-      <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shb.ais.ucla.edu/shibboleth-idp/AA"/>
-      <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-   </AttributeAuthorityDescriptor>
-   <Organization>
-      <OrganizationName xml:lang="en">University of California-Los Angeles</OrganizationName>
-      <OrganizationDisplayName xml:lang="en">University of California-Los Angeles</OrganizationDisplayName>
-      <OrganizationURL xml:lang="en">http://www.ucla.edu/</OrganizationURL>
-   </Organization>
-   <ContactPerson contactType="technical">
-      <GivenName>Datta Mahabalagiri</GivenName>
-      <EmailAddress>datta at ais.ucla.edu</EmailAddress>
-   </ContactPerson>
-   <ContactPerson contactType="administrative">
-      <GivenName>Albert Wu</GivenName>
-      <EmailAddress>albertwu at ucla.edu</EmailAddress>
-   </ContactPerson>
-</EntityDescriptor>
-
-<!-- A full SAML 2 SP example. Pulled and added 2015-08-19 -->
-<EntityDescriptor entityID="https://carmenwiki.osu.edu/shibboleth" xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-  <Extensions xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
-    <mdrpi:RegistrationInfo registrationAuthority="https://incommon.org"/>
-    <mdattr:EntityAttributes xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">
-      <saml:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://carmenwiki.osu.edu/Shibboleth.sso/Login" index="1"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://carmenwiki.it.ohio-state.edu/Shibboleth.sso/Login" index="2"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://carmenwiki.osu.edu/Shibboleth.sso/Clear" index="3"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://carmenwiki.it.ohio-state.edu/Shibboleth.sso/Clear" index="4"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CarmenWiki</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Enterprise Wiki Service at the Ohio State University.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://ocio.osu.edu/services/view/carmenwiki-wiki-services</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://carmenwiki.osu.edu/x/jyLeAQ</mdui:PrivacyStatementURL>
-        <mdui:Logo height="85" width="141" xml:lang="en">https://carmenwiki.osu.edu/download/attachments/9666561/global.logo</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-<!-- Serial No. 15149766524924023670, expires on Sat Jul  4 22:43:05 2020 GMT -->
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIJANI+yGM0M1N2MA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-BAMTHGx0Y2F3aWtpMDEuaXQub2hpby1zdGF0ZS5lZHUwHhcNMTAwNzA3MjI0MzA1
-WhcNMjAwNzA0MjI0MzA1WjAnMSUwIwYDVQQDExxsdGNhd2lraTAxLml0Lm9oaW8t
-c3RhdGUuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5fsEv25M
-r9wfa48qfjn8m40yB/lwimJ8dSnYw2erd/tfB+sPESw42Is5Lv2B3pI3mj9a0PT0
-Gf1VgUoQW0RCT6L4VOW50WsPFv/RKPfT/AIRl00dTCqb440PgotGbrK9ivZqlvkz
-lSGUKuFcg2gLj+CJlbMcwEneSwn0FE1xKEGpMDUk91lZH1XxmnIDDOQn1G5qul4q
-AbXITMpLi2MlsHAEXxnLrthFFas6zDrviTwHcqGXq9zJJkPHDcbu1qg6AUT7bRJr
-qszxxktSV6mFclkgLPpcVkigMR8RNVMQkWaaWSnfBkFy2iAe3xw3DNp7obtzgItY
-i9N8U6K5qorSkQIDAQABo0owSDAnBgNVHREEIDAeghxsdGNhd2lraTAxLml0Lm9o
-aW8tc3RhdGUuZWR1MB0GA1UdDgQWBBR32XnCliG78DdyTtZhyIQSHChtyjANBgkq
-hkiG9w0BAQUFAAOCAQEAVEweCxPElHGmam4Iv2QeJsGE7m4de7axp3epAJb7uVbN
-Z2P1S/s4GZQhmGsUoGoxwqca3wyQ+C1ZkpQJdyFl5s1tFc26D+Z0KTDo174GzO9i
-I9SeQ4YSp3FNhZqxn4xH3DULzzHwoVSwFr5irLPAVtrqK8H/rzBREhqOse2VSJ/1
-PkI+p7lUiElIzMiObLGjumF2fDOPkXOSMNyC4c5oCCJtcrip/BaLo6bqdqn3DKP8
-onMw/lHZQolyVsupuhGsSX13WVJ0uyGvuA7hiHnGEkpDmskUd3TsriyQAt47RZzY
-tTupO/NdWvz8SvXU1qIOk9CTQ0D2b2OOftfUW+FuAQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://carmenwiki.osu.edu/Shibboleth.sso/SAML/POST" index="1"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://carmenwiki.osu.edu/Shibboleth.sso/SAML/Artifact" index="2"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://carmenwiki.it.ohio-state.edu/Shibboleth.sso/SAML/POST" index="3"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://carmenwiki.it.ohio-state.edu/Shibboleth.sso/SAML/Artifact" index="4"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://carmenwiki.osu.edu/Shibboleth.sso/SAML2/POST" index="5"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://carmenwiki.osu.edu/Shibboleth.sso/SAML2/Artifact" index="6"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://carmenwiki.it.ohio-state.edu/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://carmenwiki.it.ohio-state.edu/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://carmenwiki.osu.edu/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://carmenwiki.it.ohio-state.edu/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AttributeConsumingService xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" index="1">
-      <ServiceName xml:lang="en">CarmenWiki</ServiceName>
-      <ServiceDescription xml:lang="en">Enterprise Wiki Service at the Ohio State University.</ServiceDescription>
-      <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Ohio State University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ohio State University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.osu.edu/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Travis Ritter</GivenName>
-    <EmailAddress>ritter.18 at osu.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>IT Service Desk</GivenName>
-    <EmailAddress>8help at osu.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Web Authentication Support</GivenName>
-    <EmailAddress>webauth-admin at lists.service.ohio-state.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
-
-
-</EntitiesDescriptor>
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/metadata/NodeProcessor-metadata.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/metadata/NodeProcessor-metadata.xml
deleted file mode 100644
index f250e2328..000000000
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/metadata/NodeProcessor-metadata.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-			xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-			xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
-            xsi:schemaLocation="urn:mace:shibboleth:2.0:metadata http://shibboleth.net/schema/idp/shibboleth-metadata.xsd
-urn:oasis:names:tc:SAML:metadata:ui http://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-metadata-ui/v1.0/cs01/xsd/sstc-saml-metadata-ui-v1.0.xsd                                urn:mace:shibboleth:metadata:1.0 classpath:\schema\shibboleth-metadata-1.0.xsd"
-             Name="GroupTop" validUntil="2100-01-01T00:00:00Z">
-
-    <EntityDescriptor entityID="https://noscopes.example.org">
-        <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-            <Extensions/>
-            <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.example.org/idp/Shibboleth/SSO"/>
-        </IDPSSODescriptor>
-        <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-            <Extensions>
-                <shibmd:KeyAuthority/>
-            </Extensions>
-        </AttributeAuthorityDescriptor>
-    </EntityDescriptor>
-
-    <EntityDescriptor entityID="https://scopes.example.org">
-        <Extensions>
-            <shibmd:Scope>entityScope</shibmd:Scope>
-            <shibmd:Scope>entityScope2</shibmd:Scope>
-        </Extensions>
-        <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-            <Extensions>
-                <shibmd:Scope regexp="true">^.*IDPSSO.*reg.*Scope</shibmd:Scope>
-                <shibmd:Scope regexp="false">IDPSSOScope2</shibmd:Scope>
-   			<mdui:UIInfo>
-				<mdui:DisplayName xml:lang="en">Display</mdui:DisplayName>
-				<mdui:Description xml:lang="en">Desc</mdui:Description>
-				<mdui:Logo height="80" width="80">LOGO1</mdui:Logo>
-				<mdui:Logo height="43" width="100">LOGO2</mdui:Logo>
-				<mdui:Logo height="104" width="240" xml:lang="en">Logo3</mdui:Logo>
-			</mdui:UIInfo>
-                
-            </Extensions>
-            <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.example.org/idp/Shibboleth/SSO"/>
-        </IDPSSODescriptor>
-        <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-            <Extensions>
-                <shibmd:Scope regexp="false">AAScope1</shibmd:Scope>
-                <shibmd:Scope regexp="true">^.*AASCOPE2.*</shibmd:Scope>
-            </Extensions>
-        </AttributeAuthorityDescriptor>
-    </EntityDescriptor> 
-    
-    <EntityDescriptor entityID="https:sp.example.org">
-    	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-	    	<AttributeConsumingService index="1">
-			    <ServiceName xml:lang="fr">Nom D'un Chien</ServiceName>
-			    <ServiceName xml:lang="en">ServiceName</ServiceName>
-			    <ServiceDescription xml:lang="de">ServiceDesc</ServiceDescription>
-			</AttributeConsumingService>
-    	</SPSSODescriptor>
-    	<Organization>
-			<OrganizationName xml:lang="en">org</OrganizationName>
-			<OrganizationName xml:lang="fr">gro</OrganizationName>
-			<OrganizationDisplayName xml:lang="en">odn</OrganizationDisplayName>
-			<OrganizationURL xml:lang="en">url</OrganizationURL>
-		</Organization>
-    </EntityDescriptor>  
-</EntitiesDescriptor>
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/resolver/SealerKeyStore.jks b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/nameid/SealerKeyStore.jks
similarity index 100%
rename from idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/resolver/SealerKeyStore.jks
rename to idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/nameid/SealerKeyStore.jks
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/resolver/SealerKeyStore.kver b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/nameid/SealerKeyStore.kver
similarity index 100%
rename from idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/resolver/SealerKeyStore.kver
rename to idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/nameid/SealerKeyStore.kver
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/KeyAuthority-NodeProcessor-metadata.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/KeyAuthority-NodeProcessor-metadata.xml
deleted file mode 100644
index 8e4dfe969..000000000
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/KeyAuthority-NodeProcessor-metadata.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" Name="GroupTop" validUntil="2100-01-01T00:00:00Z">
-
-    <Extensions>
-        <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>
-                        MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                        cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                        DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                        ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                        6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                        IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                        659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                        yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                        THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                        4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                        SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                        bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                        LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                        ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                        Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                        INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                        K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                        /r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                        V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </shibmd:KeyAuthority>
-        <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                <ds:X509Data>
-                    <ds:X509Certificate>
-                        MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                        cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                        DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                        ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                        6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                        IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                        659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                        yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                        THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                        4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                        SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                        bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                        LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                        ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                        Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                        INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                        K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                        /r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                        V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </shibmd:KeyAuthority>
-    </Extensions>
-    
-
-    <EntityDescriptor entityID="https://idp-top.example.org">
-        <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-            <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.example.org/idp/Shibboleth/SSO"/>
-        </IDPSSODescriptor>
-    </EntityDescriptor>
-
-    <EntitiesDescriptor Name="GroupSub1" validUntil="2100-01-01T00:00:00Z">
-
-        <Extensions>
-            <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">
-                <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                    <ds:X509Data>
-                        <ds:X509Certificate>
-                            MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                            cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                            DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                            ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                            6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                            IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                            659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                            yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                            THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                            4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                            SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                            bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                            LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                            ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                            Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                            INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                            K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                            /r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                            V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-                        </ds:X509Certificate>
-                    </ds:X509Data>
-                </ds:KeyInfo>
-            </shibmd:KeyAuthority>
-        </Extensions>
-    
-        <EntityDescriptor entityID="https://idp-sub1.example.org">
-            <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-                <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.example.org/idp/Shibboleth/SSO"/>
-            </IDPSSODescriptor>
-        </EntityDescriptor>
-    </EntitiesDescriptor>
-
-    <EntitiesDescriptor Name="GroupSub2" validUntil="2100-01-01T00:00:00Z">
-
-        <Extensions>
-            <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">
-                <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                    <ds:X509Data>
-                        <ds:X509Certificate>
-                            MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                            cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                            DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                            ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                            6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                            IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                            659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                            yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                            THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                            4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                            SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                            bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                            LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                            ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                            Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                            INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                            K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                            /r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                            V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-                        </ds:X509Certificate>
-                    </ds:X509Data>
-                </ds:KeyInfo>
-            </shibmd:KeyAuthority>
-            <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">
-                <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                    <ds:X509Data>
-                        <ds:X509Certificate>
-                            MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                            cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                            DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                            ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                            6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                            IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                            659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                            yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                            THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                            4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                            SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                            bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                            LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                            ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                            Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                            INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                            K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                            /r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                            V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-                        </ds:X509Certificate>
-                    </ds:X509Data>
-                </ds:KeyInfo>
-            </shibmd:KeyAuthority>
-        </Extensions>
-    
-    
-        <EntityDescriptor entityID="https://idp-sub2.example.org">
-            <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-                <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.example.org/idp/Shibboleth/SSO"/>
-            </IDPSSODescriptor>
-        </EntityDescriptor>
-
-        <EntitiesDescriptor Name="GroupSub2A" validUntil="2100-01-01T00:00:00Z">
-
-            <Extensions>
-                <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">
-                    <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                        <ds:X509Data>
-                            <ds:X509Certificate>
-                                MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                                cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                            	DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                            	ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                            	6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                            	IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                            	659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                            	yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                            	THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                            	4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                            	SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                            	bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                            	LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                            	ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                            	Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                            	INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                            	K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                            	/r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                            	V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-                        </ds:X509Certificate>
-                    </ds:X509Data>
-                </ds:KeyInfo>
-            </shibmd:KeyAuthority>
-        </Extensions>
-        
-            <EntityDescriptor entityID="https://idp-sub2a.example.org">
-                <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-                    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.example.org/idp/Shibboleth/SSO"/>
-                </IDPSSODescriptor>
-            </EntityDescriptor>
-        </EntitiesDescriptor>
-        
-    </EntitiesDescriptor>
-    
-</EntitiesDescriptor>
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/empty-metadata-pkix.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/empty-metadata-pkix.xml
deleted file mode 100644
index a17835748..000000000
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/empty-metadata-pkix.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" Name="example.org">
-   
-   <Extensions>
-      
-      <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-         </ds:KeyInfo>
-      </shibmd:KeyAuthority>
-      
-   </Extensions>
-
-   <EntityDescriptor entityID="http://foo.example.org/shibboleth">
-      <!-- Protocol BLUE -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_FOO"/>
-      </IDPSSODescriptor>
-      
-      <!-- Protocol GREEN -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_GREEN">
-         <!-- Note no 'use' specified. -->
-         <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>CN=foo.example.org,O=Internet2</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_BAR"/>
-      </IDPSSODescriptor>
-      
-      <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
-      </AttributeAuthorityDescriptor>
-      
-   </EntityDescriptor>
-   
-
-   <EntityDescriptor entityID="http://bar.example.org/shibboleth">
-      
-      <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE PROTOCOL_GREEN">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>bar.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bar.example.org/Shibboleth.sso/POST" index="0"/>
-      </SPSSODescriptor>
-      
-   </EntityDescriptor>
-
-</EntitiesDescriptor>
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/names-entities-metadata-pkix.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/names-entities-metadata-pkix.xml
deleted file mode 100644
index 21f9162b2..000000000
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/names-entities-metadata-pkix.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" Name="example.org">
-   
-   <Extensions>
-      
-      <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <!-- Root CA 1 issues Intermediate CA 1A -->
-            <!-- Intermediate CA 1A issues Intermediate CA 1A1 -->
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 1 --> 
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                  DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                  6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                  IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                  659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                  yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                  THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                  4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                  bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                  Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                  INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                  K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                  /r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                  V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDcxOFoX
-                  DTI4MDIxMTAyNDcxOFowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAxQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBALy5mrdKqaYlf+bAdeifTJ22FfyHbpLtL6rvg9Zlr3mQC+kmQ1A2H7nO
-                  pXuDGxiwdcFpLEmDHw7B2+p7ghfXvTeu7P7W4JIz4cBq/FhCSiG0hxuy7AQ21inc
-                  o4WJIz9250tWMC7HpELwpFPbfCdPG4jSYcq6fUH1Dp9t8gtL31LVwPgq1hoSEIK0
-                  3nKDQQe9l/wU9ZcS3HbwGOgP521bPUuOyHzYL49r4Te0ACo9Fcpn5JLQa9gzKgnQ
-                  i2O2lVUppsuCpinLJ4GW1q3Ivj1PniAXdLVfBf1CMyfl1WwbWnIBn2mskHKcV7z3
-                  8aaPdsH/7wUPVdPgQwj7ss1ZzKtQCYECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FL+8i4cdqPjsbNViSBisYTHNZgGxMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6
-                  nWgVhy3ioTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAxggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBvtwKsWfoObKJECvK99LCH
-                  pyisrcfFV69QlIW1eP77iNz47GXmnAqA6mO3+5SDJujiAa+jXnPTcz1kLJsh6xvP
-                  aozkCGECRwkzgQMew+0LBHcnD5geYdwJosrw9NWhPNJ0MA51y/LrOO2DCTXmYrIH
-                  c/59ew5ed6/8a+EWLF7798ifBZZrlxDHLHR6Sn53ugVh0cBHw6LE/5AGG5Xf1Ysr
-                  Cn4ZpHLwNn+I30+f2mweOYCkB607D4fkZGBpii6l4XRTV0oMg2aLYMZNwXct6Rhr
-                  NCvatfLuvDskkS9gIoRZNj/It+hKqf8aZ5DK+mloLYS0sem4HpE4d2VwpQfG93IK
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A1 -->
-               <ds:X509Certificate>
-                  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQQFADA2MRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxIDAeBgNVBAMTF1Rlc3QgSW50ZXJtZWRpYXRlIENBIDFBMB4XDTA4MDIx
-                  NjAyNTAyN1oXDTI4MDIxMTAyNTAyN1owNzESMBAGA1UEChMJSW50ZXJuZXQyMSEw
-                  HwYDVQQDExhUZXN0IEludGVybWVkaWF0ZSBDQSAxQTEwggEiMA0GCSqGSIb3DQEB
-                  AQUAA4IBDwAwggEKAoIBAQC4faOujGl1+5gC8SlsUn805CdmmncOvG8sGA5t2S9V
-                  DetiQAhQknNvjmghiWo/9UGXvQZIqdRlj3L8T6itrJPKBuDTVqCBHic1XYoXLIUD
-                  WqampQH0ehhbDCcghgshHunb3yaaaDeB0ZlgJJ/XqOqKvFcRbOSSWWZe+zDuiShK
-                  2WT0UZWIwC2+v01PEG8a5YUZYCVcQEmEAK/mg5og3B4PQ9Zy+iqMjDp3pcouan8L
-                  Svn59Lm65EEjafFnC/1bgl8xJUbrn4Ue/Y8yq8fI8S3SHwm05ojfhwyj/yAXEoZm
-                  pdDLZcWrl/mdpFo8Nud0w/tTG5SJ7qV09dfhgFx/VtW5AgMBAAGjga0wgaowDwYD
-                  VR0TAQH/BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAAcwDgYDVR0PAQH/BAQDAgGG
-                  MB0GA1UdDgQWBBSm0WQur7Gdx6YjizuqQDo7tkeBpjBVBgNVHSMETjBMgBS/vIuH
-                  Haj47GzVYkgYrGExzWYBsaExpC8wLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYD
-                  VQQDEw5UZXN0IFJvb3QgQ0EgMYIBATANBgkqhkiG9w0BAQQFAAOCAQEADZNut4n5
-                  IzLbXMLbyqO2HdXiCw6JkTY2Mj6kIwngbfLMeRHWuPJmM2JOuA8Wk//OIzDJfpte
-                  d+YOAGCJ8yyAXsB5Qr/68YS8sRbmjYgB9jLiz0wg3p5fnBTX2st7EY4aVR4+7pAZ
-                  12uoPMJvHfd2nsCT01A7fs7qnsOWFnJBRvfDgzRwmx/wkTp8aW3Hvqw28sVnY8q7
-                  9GEEV1DU9sJxrb12pBzWyNLU0v9EiiEWdr0hS4K8D5Q7JmKbFPv1RfocX1ocEPDN
-                  EJMA53C2Y6rq8mHV6IsvzgucLfFCo0tlR2aXTvTJHuu1ddSOKtyVkHwC4cUEmzu3
-                  L9VaYDF1sVm6pw==
-               </ds:X509Certificate>
-               <!-- CRL (version 1) issued by Intermedediate CA 1A1 -->
-               <ds:X509CRL>
-                  MIIBkjB8MA0GCSqGSIb3DQEBBAUAMDcxEjAQBgNVBAoTCUludGVybmV0MjEhMB8G
-                  A1UEAxMYVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMUExFw0wODAyMTYwNDU2MjNaFw0y
-                  NzA0MTcwNDU2MjNaMBQwEgIBAhcNMDgwMjE2MDQyNzQ5WjANBgkqhkiG9w0BAQQF
-                  AAOCAQEAfw8nWPVRK8hpt4ZU4AKiKXDc06Wf2L3IbdXHj/n4GiwQAZX9UJ34firo
-                  GKXKplwrffmVuiEwEwFBpm0M+UuCqcDgSeyruucBzRXPkr1DyPOUJ3fbI7lb9BAP
-                  C/cR7e+I+YTaXa1L15ocVN+reWq3hcWRLzejTOlrPhhTCVRnBwmWx83026PRcnjm
-                  +63YONnMFUpx8Cw3ktLVMGbxHjsDAhMTWB8YSQ3oFV7h6tpzmsr0QQxTUugP5wBX
-                  CmMJqrMIAiGfKBDzm3LfW6ZusjIsQ6HxgMC77/wU2y735POxFrnLMyOgqCTo6YHY
-                  62eLjgwVBEeOk9A4mX+NORA6EZ6BRg==
-               </ds:X509CRL>
-            </ds:X509Data>
-         </ds:KeyInfo>
-      </shibmd:KeyAuthority>
-      
-   </Extensions>
-
-   <EntityDescriptor entityID="http://foo.example.org/shibboleth">
-      <!-- Protocol BLUE -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_FOO"/>
-      </IDPSSODescriptor>
-      
-      <!-- Protocol GREEN -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_GREEN">
-         <!-- Note no 'use' specified. -->
-         <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>CN=foo.example.org,O=Internet2</ds:KeyName>
-               <ds:KeyName>idp.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_BAR"/>
-      </IDPSSODescriptor>
-      
-      <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
-      </AttributeAuthorityDescriptor>
-      
-   </EntityDescriptor>
-   
-
-   <EntityDescriptor entityID="http://bar.example.org/shibboleth">
-      
-      <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE PROTOCOL_GREEN">
-         
-         <!-- No Key Descriptor with trusted names -->
-         
-         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bar.example.org/Shibboleth.sso/POST" index="0"/>
-      </SPSSODescriptor>
-      
-   </EntityDescriptor>
-
-</EntitiesDescriptor>
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/nodepth-entities-metadata-pkix.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/nodepth-entities-metadata-pkix.xml
deleted file mode 100644
index c177e66cb..000000000
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/nodepth-entities-metadata-pkix.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" Name="example.org">
-   
-   <Extensions>
-      
-      <!-- No verify depth specified -->
-      <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <!-- Root CA 1 issues Intermediate CA 1A -->
-            <!-- Intermediate CA 1A issues Intermediate CA 1A1 -->
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 1 --> 
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                  DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                  6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                  IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                  659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                  yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                  THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                  4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                  bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                  Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                  INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                  K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                  /r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                  V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDcxOFoX
-                  DTI4MDIxMTAyNDcxOFowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAxQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBALy5mrdKqaYlf+bAdeifTJ22FfyHbpLtL6rvg9Zlr3mQC+kmQ1A2H7nO
-                  pXuDGxiwdcFpLEmDHw7B2+p7ghfXvTeu7P7W4JIz4cBq/FhCSiG0hxuy7AQ21inc
-                  o4WJIz9250tWMC7HpELwpFPbfCdPG4jSYcq6fUH1Dp9t8gtL31LVwPgq1hoSEIK0
-                  3nKDQQe9l/wU9ZcS3HbwGOgP521bPUuOyHzYL49r4Te0ACo9Fcpn5JLQa9gzKgnQ
-                  i2O2lVUppsuCpinLJ4GW1q3Ivj1PniAXdLVfBf1CMyfl1WwbWnIBn2mskHKcV7z3
-                  8aaPdsH/7wUPVdPgQwj7ss1ZzKtQCYECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FL+8i4cdqPjsbNViSBisYTHNZgGxMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6
-                  nWgVhy3ioTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAxggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBvtwKsWfoObKJECvK99LCH
-                  pyisrcfFV69QlIW1eP77iNz47GXmnAqA6mO3+5SDJujiAa+jXnPTcz1kLJsh6xvP
-                  aozkCGECRwkzgQMew+0LBHcnD5geYdwJosrw9NWhPNJ0MA51y/LrOO2DCTXmYrIH
-                  c/59ew5ed6/8a+EWLF7798ifBZZrlxDHLHR6Sn53ugVh0cBHw6LE/5AGG5Xf1Ysr
-                  Cn4ZpHLwNn+I30+f2mweOYCkB607D4fkZGBpii6l4XRTV0oMg2aLYMZNwXct6Rhr
-                  NCvatfLuvDskkS9gIoRZNj/It+hKqf8aZ5DK+mloLYS0sem4HpE4d2VwpQfG93IK
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A1 -->
-               <ds:X509Certificate>
-                  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQQFADA2MRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxIDAeBgNVBAMTF1Rlc3QgSW50ZXJtZWRpYXRlIENBIDFBMB4XDTA4MDIx
-                  NjAyNTAyN1oXDTI4MDIxMTAyNTAyN1owNzESMBAGA1UEChMJSW50ZXJuZXQyMSEw
-                  HwYDVQQDExhUZXN0IEludGVybWVkaWF0ZSBDQSAxQTEwggEiMA0GCSqGSIb3DQEB
-                  AQUAA4IBDwAwggEKAoIBAQC4faOujGl1+5gC8SlsUn805CdmmncOvG8sGA5t2S9V
-                  DetiQAhQknNvjmghiWo/9UGXvQZIqdRlj3L8T6itrJPKBuDTVqCBHic1XYoXLIUD
-                  WqampQH0ehhbDCcghgshHunb3yaaaDeB0ZlgJJ/XqOqKvFcRbOSSWWZe+zDuiShK
-                  2WT0UZWIwC2+v01PEG8a5YUZYCVcQEmEAK/mg5og3B4PQ9Zy+iqMjDp3pcouan8L
-                  Svn59Lm65EEjafFnC/1bgl8xJUbrn4Ue/Y8yq8fI8S3SHwm05ojfhwyj/yAXEoZm
-                  pdDLZcWrl/mdpFo8Nud0w/tTG5SJ7qV09dfhgFx/VtW5AgMBAAGjga0wgaowDwYD
-                  VR0TAQH/BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAAcwDgYDVR0PAQH/BAQDAgGG
-                  MB0GA1UdDgQWBBSm0WQur7Gdx6YjizuqQDo7tkeBpjBVBgNVHSMETjBMgBS/vIuH
-                  Haj47GzVYkgYrGExzWYBsaExpC8wLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYD
-                  VQQDEw5UZXN0IFJvb3QgQ0EgMYIBATANBgkqhkiG9w0BAQQFAAOCAQEADZNut4n5
-                  IzLbXMLbyqO2HdXiCw6JkTY2Mj6kIwngbfLMeRHWuPJmM2JOuA8Wk//OIzDJfpte
-                  d+YOAGCJ8yyAXsB5Qr/68YS8sRbmjYgB9jLiz0wg3p5fnBTX2st7EY4aVR4+7pAZ
-                  12uoPMJvHfd2nsCT01A7fs7qnsOWFnJBRvfDgzRwmx/wkTp8aW3Hvqw28sVnY8q7
-                  9GEEV1DU9sJxrb12pBzWyNLU0v9EiiEWdr0hS4K8D5Q7JmKbFPv1RfocX1ocEPDN
-                  EJMA53C2Y6rq8mHV6IsvzgucLfFCo0tlR2aXTvTJHuu1ddSOKtyVkHwC4cUEmzu3
-                  L9VaYDF1sVm6pw==
-               </ds:X509Certificate>
-               <!-- CRL (version 1) issued by Intermedediate CA 1A1 -->
-               <ds:X509CRL>
-                  MIIBkjB8MA0GCSqGSIb3DQEBBAUAMDcxEjAQBgNVBAoTCUludGVybmV0MjEhMB8G
-                  A1UEAxMYVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMUExFw0wODAyMTYwNDU2MjNaFw0y
-                  NzA0MTcwNDU2MjNaMBQwEgIBAhcNMDgwMjE2MDQyNzQ5WjANBgkqhkiG9w0BAQQF
-                  AAOCAQEAfw8nWPVRK8hpt4ZU4AKiKXDc06Wf2L3IbdXHj/n4GiwQAZX9UJ34firo
-                  GKXKplwrffmVuiEwEwFBpm0M+UuCqcDgSeyruucBzRXPkr1DyPOUJ3fbI7lb9BAP
-                  C/cR7e+I+YTaXa1L15ocVN+reWq3hcWRLzejTOlrPhhTCVRnBwmWx83026PRcnjm
-                  +63YONnMFUpx8Cw3ktLVMGbxHjsDAhMTWB8YSQ3oFV7h6tpzmsr0QQxTUugP5wBX
-                  CmMJqrMIAiGfKBDzm3LfW6ZusjIsQ6HxgMC77/wU2y735POxFrnLMyOgqCTo6YHY
-                  62eLjgwVBEeOk9A4mX+NORA6EZ6BRg==
-               </ds:X509CRL>
-            </ds:X509Data>
-         </ds:KeyInfo>
-      </shibmd:KeyAuthority>
-      
-   </Extensions>
-
-   <EntityDescriptor entityID="http://foo.example.org/shibboleth">
-      <!-- Protocol BLUE -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_FOO"/>
-      </IDPSSODescriptor>
-      
-      <!-- Protocol GREEN -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_GREEN">
-         <!-- Note no 'use' specified. -->
-         <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>CN=foo.example.org,O=Internet2</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_BAR"/>
-      </IDPSSODescriptor>
-      
-      <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
-      </AttributeAuthorityDescriptor>
-      
-   </EntityDescriptor>
-   
-
-   <EntityDescriptor entityID="http://bar.example.org/shibboleth">
-      
-      <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE PROTOCOL_GREEN">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>bar.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bar.example.org/Shibboleth.sso/POST" index="0"/>
-      </SPSSODescriptor>
-      
-   </EntityDescriptor>
-
-</EntitiesDescriptor>
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/oneset-3keyinfo-metadata-pkix.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/oneset-3keyinfo-metadata-pkix.xml
deleted file mode 100644
index 709f7dc9b..000000000
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/oneset-3keyinfo-metadata-pkix.xml
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" Name="example.org">
-   
-   <Extensions>
-      
-      <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
-         
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <!-- Root CA 1 issues Intermediate CA 1A -->
-            <!-- Intermediate CA 1A issues Intermediate CA 1A1 -->
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 1 --> 
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                  DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                  6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                  IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                  659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                  yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                  THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                  4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                  bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                  Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                  INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                  K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                  /r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                  V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDcxOFoX
-                  DTI4MDIxMTAyNDcxOFowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAxQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBALy5mrdKqaYlf+bAdeifTJ22FfyHbpLtL6rvg9Zlr3mQC+kmQ1A2H7nO
-                  pXuDGxiwdcFpLEmDHw7B2+p7ghfXvTeu7P7W4JIz4cBq/FhCSiG0hxuy7AQ21inc
-                  o4WJIz9250tWMC7HpELwpFPbfCdPG4jSYcq6fUH1Dp9t8gtL31LVwPgq1hoSEIK0
-                  3nKDQQe9l/wU9ZcS3HbwGOgP521bPUuOyHzYL49r4Te0ACo9Fcpn5JLQa9gzKgnQ
-                  i2O2lVUppsuCpinLJ4GW1q3Ivj1PniAXdLVfBf1CMyfl1WwbWnIBn2mskHKcV7z3
-                  8aaPdsH/7wUPVdPgQwj7ss1ZzKtQCYECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FL+8i4cdqPjsbNViSBisYTHNZgGxMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6
-                  nWgVhy3ioTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAxggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBvtwKsWfoObKJECvK99LCH
-                  pyisrcfFV69QlIW1eP77iNz47GXmnAqA6mO3+5SDJujiAa+jXnPTcz1kLJsh6xvP
-                  aozkCGECRwkzgQMew+0LBHcnD5geYdwJosrw9NWhPNJ0MA51y/LrOO2DCTXmYrIH
-                  c/59ew5ed6/8a+EWLF7798ifBZZrlxDHLHR6Sn53ugVh0cBHw6LE/5AGG5Xf1Ysr
-                  Cn4ZpHLwNn+I30+f2mweOYCkB607D4fkZGBpii6l4XRTV0oMg2aLYMZNwXct6Rhr
-                  NCvatfLuvDskkS9gIoRZNj/It+hKqf8aZ5DK+mloLYS0sem4HpE4d2VwpQfG93IK
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A1 -->
-               <ds:X509Certificate>
-                  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQQFADA2MRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxIDAeBgNVBAMTF1Rlc3QgSW50ZXJtZWRpYXRlIENBIDFBMB4XDTA4MDIx
-                  NjAyNTAyN1oXDTI4MDIxMTAyNTAyN1owNzESMBAGA1UEChMJSW50ZXJuZXQyMSEw
-                  HwYDVQQDExhUZXN0IEludGVybWVkaWF0ZSBDQSAxQTEwggEiMA0GCSqGSIb3DQEB
-                  AQUAA4IBDwAwggEKAoIBAQC4faOujGl1+5gC8SlsUn805CdmmncOvG8sGA5t2S9V
-                  DetiQAhQknNvjmghiWo/9UGXvQZIqdRlj3L8T6itrJPKBuDTVqCBHic1XYoXLIUD
-                  WqampQH0ehhbDCcghgshHunb3yaaaDeB0ZlgJJ/XqOqKvFcRbOSSWWZe+zDuiShK
-                  2WT0UZWIwC2+v01PEG8a5YUZYCVcQEmEAK/mg5og3B4PQ9Zy+iqMjDp3pcouan8L
-                  Svn59Lm65EEjafFnC/1bgl8xJUbrn4Ue/Y8yq8fI8S3SHwm05ojfhwyj/yAXEoZm
-                  pdDLZcWrl/mdpFo8Nud0w/tTG5SJ7qV09dfhgFx/VtW5AgMBAAGjga0wgaowDwYD
-                  VR0TAQH/BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAAcwDgYDVR0PAQH/BAQDAgGG
-                  MB0GA1UdDgQWBBSm0WQur7Gdx6YjizuqQDo7tkeBpjBVBgNVHSMETjBMgBS/vIuH
-                  Haj47GzVYkgYrGExzWYBsaExpC8wLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYD
-                  VQQDEw5UZXN0IFJvb3QgQ0EgMYIBATANBgkqhkiG9w0BAQQFAAOCAQEADZNut4n5
-                  IzLbXMLbyqO2HdXiCw6JkTY2Mj6kIwngbfLMeRHWuPJmM2JOuA8Wk//OIzDJfpte
-                  d+YOAGCJ8yyAXsB5Qr/68YS8sRbmjYgB9jLiz0wg3p5fnBTX2st7EY4aVR4+7pAZ
-                  12uoPMJvHfd2nsCT01A7fs7qnsOWFnJBRvfDgzRwmx/wkTp8aW3Hvqw28sVnY8q7
-                  9GEEV1DU9sJxrb12pBzWyNLU0v9EiiEWdr0hS4K8D5Q7JmKbFPv1RfocX1ocEPDN
-                  EJMA53C2Y6rq8mHV6IsvzgucLfFCo0tlR2aXTvTJHuu1ddSOKtyVkHwC4cUEmzu3
-                  L9VaYDF1sVm6pw==
-               </ds:X509Certificate>
-               <!-- CRL (version 1) issued by Intermedediate CA 1A1 -->
-               <ds:X509CRL>
-                  MIIBkjB8MA0GCSqGSIb3DQEBBAUAMDcxEjAQBgNVBAoTCUludGVybmV0MjEhMB8G
-                  A1UEAxMYVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMUExFw0wODAyMTYwNDU2MjNaFw0y
-                  NzA0MTcwNDU2MjNaMBQwEgIBAhcNMDgwMjE2MDQyNzQ5WjANBgkqhkiG9w0BAQQF
-                  AAOCAQEAfw8nWPVRK8hpt4ZU4AKiKXDc06Wf2L3IbdXHj/n4GiwQAZX9UJ34firo
-                  GKXKplwrffmVuiEwEwFBpm0M+UuCqcDgSeyruucBzRXPkr1DyPOUJ3fbI7lb9BAP
-                  C/cR7e+I+YTaXa1L15ocVN+reWq3hcWRLzejTOlrPhhTCVRnBwmWx83026PRcnjm
-                  +63YONnMFUpx8Cw3ktLVMGbxHjsDAhMTWB8YSQ3oFV7h6tpzmsr0QQxTUugP5wBX
-                  CmMJqrMIAiGfKBDzm3LfW6ZusjIsQ6HxgMC77/wU2y735POxFrnLMyOgqCTo6YHY
-                  62eLjgwVBEeOk9A4mX+NORA6EZ6BRg==
-               </ds:X509CRL>
-            </ds:X509Data>
-         </ds:KeyInfo>
-         
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <!-- Root CA 2 issues Intermediate CA 2A -->
-            <!-- Root CA 2 issues Intermediate CA 2B -->
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 2 -->
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAyMB4XDTA4MDIxNjAyNDc1NloX
-                  DTMzMDIwOTAyNDc1NlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKBx
-                  1TBIAI+/C1z/UGpEEbCV6F+qhyTM9k2qLeVoqS+ZkSCW3rGpJEx3W3cdUClYsiZq
-                  X67OsJ6Yg1ilHmQHOwGO+6da2fJx4fSbNdzcJAUH2Zge4PYufTeE23Z6e8FMakIi
-                  27NElWsY1AdP0TEyXFJHYOhpJwMzs1kMkhBetOMXfgny0GRhK6tfmNlBI7iHTRTP
-                  5RnakeKauomoVx5t+XrHQPaRCzjvRRxgLJ66UDNe48xztbz4lAz1N1yFL5ONIsIj
-                  wds6aOTj6Akt7rha+cozTbpHMWdPvOTiKydpAzabN1y1998geseLLwtDd6RsrHKk
-                  jIjqn1KTMb85zHffoyUCAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFPdjZ6zd62bP
-                  OJ5E2KKIh7FL3GFSMFUGA1UdIwROMEyAFPdjZ6zd62bPOJ5E2KKIh7FL3GFSoTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAy
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQB/4RsB7RzvmDualEaF9Fpgr/pJIa4/TkG/
-                  /WQlKtQL4dA1NH2cA12ET2UiiSA3wwedXqaJ3xR1e5j2d2u30DhsYDBqQT+vWWA0
-                  Z3tJET4n0lIuCozn3b1xNIqTX1/BxeDTuoqz5HVT66mwMPtT8UDTcD8h0jmrW+LU
-                  9aQX4zSYyPaiq0Dvu7dnnrhqAWJ1o2+Bet6YmtfxMUXXSolwC6ZBcWzq6ighXsyw
-                  dh9v+60iczDPvXZq0aLNgYoSmVXNXIj8/gZEDBUY3r2u3FEWVR62XC0wKDTiTe2M
-                  ixmfwIdPq/WshU0tUGqnhTN9x2dCQGJuS1EhTPM2AbBZydZ4ygTE
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 2A -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAyMB4XDTA4MDIxNjAyNDgzOVoX
-                  DTI4MDIxMTAyNDgzOVowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAyQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBANeowIrfgyqAOwSQmU2nf+LwlKrse3d+wpTTIVE+NTOFAT9YHIzP4I9i
-                  axt+63JnLkS3TgxADR/bhoz0qdSeKkba+7/3ZYLNqpdoH0j0HUstKYslDFeElKle
-                  sPcmQAzcwH9k2dwrlLIZZ0jX3/NzK4HgVn8AwYhkCzW0z4cmW25+1dGOteSWm5oF
-                  sot0sGxm+2F4Tt1UbNvYV7uB65dvajqoY0o2gwZLh61wF/A8ADM9qMPX1lW5PgUI
-                  tx/J5MP+FnEEsQi94wnrS8oAldU6Qb6Wv6PwE/YaTUn3m0wp7SWLrlgLLvF4Useb
-                  r2V+Ab0XUz+wRMz9GJvhmxW2Aoz4LhUCAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FHoQVd5JyBpssooxI+gZFAfkDdOgMFUGA1UdIwROMEyAFPdjZ6zd62bPOJ5E2KKI
-                  h7FL3GFSoTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAyggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBYAoFyRZmZJY/nFzfaKFmM
-                  dGD/ex5n3exFoDjKoiShuAU3ReXnFR+AVz9f7FlHqsnWAp0pGMmJ8NrqXpJaO6SC
-                  RBHVPagBAdyoNGK4anjwLTiCKCAVi5MBnGpeis07nfy4Ot1dvl++w/3YgIouABTi
-                  5hyy3bgzFNoS/vwas1k7NJacjZiRTT+3MDJ9OtjHGdZN7/tXQL3vujEGp6+z1Ly7
-                  c1uOIARdlN44Jk9OR7SWaAi0v9bh2i1iw/3wPDjSz1srosxV2ANIonOKfQryxREh
-                  TgEK3IHfc0VGcKPsZ0oljH29/dMoHiYQy4Su8uqjd4n8l2YxGKPXhf4PVO0Go1Ot
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 2B -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBAjANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAyMB4XDTA4MDIxNjAyNDg1N1oX
-                  DTI4MDIxMTAyNDg1N1owNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAyQjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBALgYSfCvdNqEzs7048Tovc9LgyIrDwuBkoU2HbdczIuw8ipJDAOmo5w3
-                  BIDjxUZQx2vO1v6KW81AcOR0LqXd0K8Bnl5OXFHiW3laz9yFhyXKAB5roWnrQmCL
-                  vitN6P3vM6AA2UiNT1Ze9utFQ1SwnDfPDVYTRebhbxRgj5qWOK2mB9OIoD2ff0pI
-                  gf1ziIiJHChljnd2UA3OM/5pI5sKd0iaT6SrhGzysgn1ITTeWlw1axOfyh/+SW8k
-                  yefZQkjWLXce/9DcHDdo3NSDbqX264VQK0QcQi7l2v5HNEecSRecelO0746bjJ7n
-                  mbcQvEkdxgfvZBvqIqB4Drd75yPmcd0CAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FP0txMEysaCUdvSu+xU1DV7eNPOuMFUGA1UdIwROMEyAFPdjZ6zd62bPOJ5E2KKI
-                  h7FL3GFSoTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAyggEAMA0GCSqGSIb3DQEBBAUAA4IBAQCBtGF7Hls4x7xbM8dRYp4g
-                  RG0UsRVwRne+Yozzk/sn38rJni6qhMbEwpd0nLp2hwVi2++knQ/ZG5iAxMNCTkP/
-                  /k1fO4ezglUnlLWzJZb0L7mSulpcFHQ2wiOxPjNTVX/kD+y5FzfmGA31CH3CYDwk
-                  itDI+5TRcpvYYU4YS+thVMdPFqRlS7JkylrF1k4vAdPNCSkzk1RCjTIHqPXGSB1N
-                  JmK5VijeplrmJr9LwxhR9D1/dbth+k4RIZ0/ARRuxBMTCLQcsJ/qdrw3a1qlGi21
-                  0LjfQiBmLW7w5OWjhbK+Y8IAgm9zjswRQHZ5z2sSOf7sw8JviTyVDvlAlQ3XPEbW
-               </ds:X509Certificate>
-            </ds:X509Data>
-         </ds:KeyInfo>
-         
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 3 -->
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAzMB4XDTA4MDIxNjA0NTMxN1oX
-                  DTMzMDIwOTA0NTMxN1owLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcO
-                  aHbctY9/ocMmLq98YpnelSho5l8gSiBm95v6DGJx8tQS3BVJuG6Cp4lTZM3SdmCL
-                  Da9OO8pleZ+8YAVYNvI+GPq3ZNkGWgBw2pGp4TdDvu+wp6yHGGlxwzsIQl7CicBX
-                  7R9UFXEmHbqlBHZY+5IZfdwjHDGCFX1GLHfgZ1fepguUn5+CKNcebkn6fiHrKvcO
-                  AAp083nem+F5cRopL4dxPFecnf+xbuii4r2fbGnVMrCl+lybqql0bmjGAu7gWV4/
-                  EaWQez/+dqBV7RRUvvb6ESB9VBcuWuwBkF+zr8yMFYlHNTpZs1lM8vss2e7oRdke
-                  VQm0jxrU14zpGD4WAkECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNYpvLOrOLVe
-                  Wbtf51KsboM3G7SpMFUGA1UdIwROMEyAFNYpvLOrOLVeWbtf51KsboM3G7SpoTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAz
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBkhItn+wt+CU7RspC4Dh9umdcaikGSeK4P
-                  LwFDFvkUzBbeO+l0QYICVLAso9w6d9ckxloik7vALI5KC9DMLSgc5eSkB6x4Y++A
-                  q/pB2PFinNywKyyyO1c3u6j7HCYa5aSB0Q95Bo5lkxz13EK/DhbLLT3Ytli+Mw3D
-                  xuIZ/jTQDBadEfIuQLOks/aa+WY6AloRC711yflyE8jkaUnvMQoYMBD1oRle77SD
-                  FZqYHfaAONdzcC8q2hwys2L4gopY50l0izN2E2XGtMBZfHJ/9rLAqSNBmB0iCv/x
-                  qXyJ7avCwqkpcFtWSQM6u3F+DwKn8wE1MqevHmK/LVC3f0gE4qtz
-               </ds:X509Certificate>
-               <!-- CRL (version 2) issued by Root CA 3 -->
-               <ds:X509CRL>
-                  MIIB0TCBugIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRlcm5ldDIx
-                  FzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAzFw0wODAyMTYwNjI1NTZaFw0yMTEwMjUw
-                  NjI1NTZaoFkwVzBVBgNVHSMETjBMgBTWKbyzqzi1Xlm7X+dSrG6DNxu0qaExpC8w
-                  LTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5UZXN0IFJvb3QgQ0EgM4IB
-                  ADANBgkqhkiG9w0BAQQFAAOCAQEAKSYrL3BA4V1IeyaXseLn38r+tYUxZbka0gUk
-                  6rewQXgFrB/BIdmOUEd8fxh+nTRCmeWd9BeC/Xq+kGfrq2Q9TkxhF5sz+3G9BGmf
-                  cAVVsua9g567ePHHr/H2kB5BUy2Fn2YIYCR3B8W3Qd4WATofh7+y7aQRReaHLj3U
-                  5c68ar8puyUiPwTg7g/H/qWd0plPkd6OGNyEFNCH/iq25qFUg6mOW1Vv3IZ0PRDc
-                  hNLGVcJWSo19aTImFiqk6iwzkKx+eeu/HNXVzo/D3tM5YA+uPPkIgP2pKsmF1wYc
-                  WJr+OqRp339ffO1qlFmXwklqstBIPn0/YzzKL/em3XXHlulByw==
-               </ds:X509CRL>
-            </ds:X509Data>
-         </ds:KeyInfo>
-         
-      </shibmd:KeyAuthority>
-      
-   </Extensions>
-
-   <EntityDescriptor entityID="http://foo.example.org/shibboleth">
-      <!-- Protocol BLUE -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_FOO"/>
-      </IDPSSODescriptor>
-      
-      <!-- Protocol GREEN -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_GREEN">
-         <!-- Note no 'use' specified. -->
-         <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>CN=foo.example.org,O=Internet2</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_BAR"/>
-      </IDPSSODescriptor>
-      
-      <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
-      </AttributeAuthorityDescriptor>
-      
-   </EntityDescriptor>
-   
-
-   <EntityDescriptor entityID="http://bar.example.org/shibboleth">
-      
-      <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE PROTOCOL_GREEN">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>bar.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bar.example.org/Shibboleth.sso/POST" index="0"/>
-      </SPSSODescriptor>
-      
-   </EntityDescriptor>
-
-</EntitiesDescriptor>
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/oneset-entities-metadata-pkix.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/oneset-entities-metadata-pkix.xml
deleted file mode 100644
index 9f318be11..000000000
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/oneset-entities-metadata-pkix.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" Name="example.org">
-   
-   <Extensions>
-      
-      <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <!-- Root CA 1 issues Intermediate CA 1A -->
-            <!-- Intermediate CA 1A issues Intermediate CA 1A1 -->
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 1 --> 
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                  DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                  6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                  IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                  659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                  yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                  THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                  4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                  bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                  Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                  INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                  K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                  /r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                  V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDcxOFoX
-                  DTI4MDIxMTAyNDcxOFowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAxQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBALy5mrdKqaYlf+bAdeifTJ22FfyHbpLtL6rvg9Zlr3mQC+kmQ1A2H7nO
-                  pXuDGxiwdcFpLEmDHw7B2+p7ghfXvTeu7P7W4JIz4cBq/FhCSiG0hxuy7AQ21inc
-                  o4WJIz9250tWMC7HpELwpFPbfCdPG4jSYcq6fUH1Dp9t8gtL31LVwPgq1hoSEIK0
-                  3nKDQQe9l/wU9ZcS3HbwGOgP521bPUuOyHzYL49r4Te0ACo9Fcpn5JLQa9gzKgnQ
-                  i2O2lVUppsuCpinLJ4GW1q3Ivj1PniAXdLVfBf1CMyfl1WwbWnIBn2mskHKcV7z3
-                  8aaPdsH/7wUPVdPgQwj7ss1ZzKtQCYECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FL+8i4cdqPjsbNViSBisYTHNZgGxMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6
-                  nWgVhy3ioTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAxggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBvtwKsWfoObKJECvK99LCH
-                  pyisrcfFV69QlIW1eP77iNz47GXmnAqA6mO3+5SDJujiAa+jXnPTcz1kLJsh6xvP
-                  aozkCGECRwkzgQMew+0LBHcnD5geYdwJosrw9NWhPNJ0MA51y/LrOO2DCTXmYrIH
-                  c/59ew5ed6/8a+EWLF7798ifBZZrlxDHLHR6Sn53ugVh0cBHw6LE/5AGG5Xf1Ysr
-                  Cn4ZpHLwNn+I30+f2mweOYCkB607D4fkZGBpii6l4XRTV0oMg2aLYMZNwXct6Rhr
-                  NCvatfLuvDskkS9gIoRZNj/It+hKqf8aZ5DK+mloLYS0sem4HpE4d2VwpQfG93IK
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A1 -->
-               <ds:X509Certificate>
-                  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQQFADA2MRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxIDAeBgNVBAMTF1Rlc3QgSW50ZXJtZWRpYXRlIENBIDFBMB4XDTA4MDIx
-                  NjAyNTAyN1oXDTI4MDIxMTAyNTAyN1owNzESMBAGA1UEChMJSW50ZXJuZXQyMSEw
-                  HwYDVQQDExhUZXN0IEludGVybWVkaWF0ZSBDQSAxQTEwggEiMA0GCSqGSIb3DQEB
-                  AQUAA4IBDwAwggEKAoIBAQC4faOujGl1+5gC8SlsUn805CdmmncOvG8sGA5t2S9V
-                  DetiQAhQknNvjmghiWo/9UGXvQZIqdRlj3L8T6itrJPKBuDTVqCBHic1XYoXLIUD
-                  WqampQH0ehhbDCcghgshHunb3yaaaDeB0ZlgJJ/XqOqKvFcRbOSSWWZe+zDuiShK
-                  2WT0UZWIwC2+v01PEG8a5YUZYCVcQEmEAK/mg5og3B4PQ9Zy+iqMjDp3pcouan8L
-                  Svn59Lm65EEjafFnC/1bgl8xJUbrn4Ue/Y8yq8fI8S3SHwm05ojfhwyj/yAXEoZm
-                  pdDLZcWrl/mdpFo8Nud0w/tTG5SJ7qV09dfhgFx/VtW5AgMBAAGjga0wgaowDwYD
-                  VR0TAQH/BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAAcwDgYDVR0PAQH/BAQDAgGG
-                  MB0GA1UdDgQWBBSm0WQur7Gdx6YjizuqQDo7tkeBpjBVBgNVHSMETjBMgBS/vIuH
-                  Haj47GzVYkgYrGExzWYBsaExpC8wLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYD
-                  VQQDEw5UZXN0IFJvb3QgQ0EgMYIBATANBgkqhkiG9w0BAQQFAAOCAQEADZNut4n5
-                  IzLbXMLbyqO2HdXiCw6JkTY2Mj6kIwngbfLMeRHWuPJmM2JOuA8Wk//OIzDJfpte
-                  d+YOAGCJ8yyAXsB5Qr/68YS8sRbmjYgB9jLiz0wg3p5fnBTX2st7EY4aVR4+7pAZ
-                  12uoPMJvHfd2nsCT01A7fs7qnsOWFnJBRvfDgzRwmx/wkTp8aW3Hvqw28sVnY8q7
-                  9GEEV1DU9sJxrb12pBzWyNLU0v9EiiEWdr0hS4K8D5Q7JmKbFPv1RfocX1ocEPDN
-                  EJMA53C2Y6rq8mHV6IsvzgucLfFCo0tlR2aXTvTJHuu1ddSOKtyVkHwC4cUEmzu3
-                  L9VaYDF1sVm6pw==
-               </ds:X509Certificate>
-               <!-- CRL (version 1) issued by Intermedediate CA 1A1 -->
-               <ds:X509CRL>
-                  MIIBkjB8MA0GCSqGSIb3DQEBBAUAMDcxEjAQBgNVBAoTCUludGVybmV0MjEhMB8G
-                  A1UEAxMYVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMUExFw0wODAyMTYwNDU2MjNaFw0y
-                  NzA0MTcwNDU2MjNaMBQwEgIBAhcNMDgwMjE2MDQyNzQ5WjANBgkqhkiG9w0BAQQF
-                  AAOCAQEAfw8nWPVRK8hpt4ZU4AKiKXDc06Wf2L3IbdXHj/n4GiwQAZX9UJ34firo
-                  GKXKplwrffmVuiEwEwFBpm0M+UuCqcDgSeyruucBzRXPkr1DyPOUJ3fbI7lb9BAP
-                  C/cR7e+I+YTaXa1L15ocVN+reWq3hcWRLzejTOlrPhhTCVRnBwmWx83026PRcnjm
-                  +63YONnMFUpx8Cw3ktLVMGbxHjsDAhMTWB8YSQ3oFV7h6tpzmsr0QQxTUugP5wBX
-                  CmMJqrMIAiGfKBDzm3LfW6ZusjIsQ6HxgMC77/wU2y735POxFrnLMyOgqCTo6YHY
-                  62eLjgwVBEeOk9A4mX+NORA6EZ6BRg==
-               </ds:X509CRL>
-            </ds:X509Data>
-         </ds:KeyInfo>
-      </shibmd:KeyAuthority>
-      
-   </Extensions>
-
-   <EntityDescriptor entityID="http://foo.example.org/shibboleth">
-      <!-- Protocol BLUE -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_FOO"/>
-      </IDPSSODescriptor>
-      
-      <!-- Protocol GREEN -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_GREEN">
-         <!-- Note no 'use' specified. -->
-         <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>CN=foo.example.org,O=Internet2</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_BAR"/>
-      </IDPSSODescriptor>
-      
-      <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
-      </AttributeAuthorityDescriptor>
-      
-   </EntityDescriptor>
-   
-
-   <EntityDescriptor entityID="http://bar.example.org/shibboleth">
-      
-      <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE PROTOCOL_GREEN">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>bar.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bar.example.org/Shibboleth.sso/POST" index="0"/>
-      </SPSSODescriptor>
-      
-   </EntityDescriptor>
-
-</EntitiesDescriptor>
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/oneset-entity-metadata-pkix.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/oneset-entity-metadata-pkix.xml
deleted file mode 100644
index b48c32881..000000000
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/oneset-entity-metadata-pkix.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" Name="example.org">
-
-   <EntityDescriptor entityID="http://foo.example.org/shibboleth">
-      
-      <Extensions>
-         
-         <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <!-- Root CA 1 issues Intermediate CA 1A -->
-               <!-- Intermediate CA 1A issues Intermediate CA 1A1 -->
-               <ds:X509Data>
-                  <!-- O=Internet2, CN=Test Root CA 1 --> 
-                  <ds:X509Certificate>
-                     MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                     cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                     DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                     ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                     6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                     IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                     659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                     yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                     THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                     4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                     SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                     bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                     LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                     ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                     Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                     INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                     K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                     /r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                     V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-                  </ds:X509Certificate>
-                  <!-- O=Internet2, CN=Test Intermediate CA 1A -->
-                  <ds:X509Certificate>
-                     MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                     cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDcxOFoX
-                     DTI4MDIxMTAyNDcxOFowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                     ZXN0IEludGVybWVkaWF0ZSBDQSAxQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                     AQoCggEBALy5mrdKqaYlf+bAdeifTJ22FfyHbpLtL6rvg9Zlr3mQC+kmQ1A2H7nO
-                     pXuDGxiwdcFpLEmDHw7B2+p7ghfXvTeu7P7W4JIz4cBq/FhCSiG0hxuy7AQ21inc
-                     o4WJIz9250tWMC7HpELwpFPbfCdPG4jSYcq6fUH1Dp9t8gtL31LVwPgq1hoSEIK0
-                     3nKDQQe9l/wU9ZcS3HbwGOgP521bPUuOyHzYL49r4Te0ACo9Fcpn5JLQa9gzKgnQ
-                     i2O2lVUppsuCpinLJ4GW1q3Ivj1PniAXdLVfBf1CMyfl1WwbWnIBn2mskHKcV7z3
-                     8aaPdsH/7wUPVdPgQwj7ss1ZzKtQCYECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                     AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                     FL+8i4cdqPjsbNViSBisYTHNZgGxMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6
-                     nWgVhy3ioTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                     Um9vdCBDQSAxggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBvtwKsWfoObKJECvK99LCH
-                     pyisrcfFV69QlIW1eP77iNz47GXmnAqA6mO3+5SDJujiAa+jXnPTcz1kLJsh6xvP
-                     aozkCGECRwkzgQMew+0LBHcnD5geYdwJosrw9NWhPNJ0MA51y/LrOO2DCTXmYrIH
-                     c/59ew5ed6/8a+EWLF7798ifBZZrlxDHLHR6Sn53ugVh0cBHw6LE/5AGG5Xf1Ysr
-                     Cn4ZpHLwNn+I30+f2mweOYCkB607D4fkZGBpii6l4XRTV0oMg2aLYMZNwXct6Rhr
-                     NCvatfLuvDskkS9gIoRZNj/It+hKqf8aZ5DK+mloLYS0sem4HpE4d2VwpQfG93IK
-                  </ds:X509Certificate>
-                  <!-- O=Internet2, CN=Test Intermediate CA 1A1 -->
-                  <ds:X509Certificate>
-                     MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQQFADA2MRIwEAYDVQQKEwlJbnRl
-                     cm5ldDIxIDAeBgNVBAMTF1Rlc3QgSW50ZXJtZWRpYXRlIENBIDFBMB4XDTA4MDIx
-                     NjAyNTAyN1oXDTI4MDIxMTAyNTAyN1owNzESMBAGA1UEChMJSW50ZXJuZXQyMSEw
-                     HwYDVQQDExhUZXN0IEludGVybWVkaWF0ZSBDQSAxQTEwggEiMA0GCSqGSIb3DQEB
-                     AQUAA4IBDwAwggEKAoIBAQC4faOujGl1+5gC8SlsUn805CdmmncOvG8sGA5t2S9V
-                     DetiQAhQknNvjmghiWo/9UGXvQZIqdRlj3L8T6itrJPKBuDTVqCBHic1XYoXLIUD
-                     WqampQH0ehhbDCcghgshHunb3yaaaDeB0ZlgJJ/XqOqKvFcRbOSSWWZe+zDuiShK
-                     2WT0UZWIwC2+v01PEG8a5YUZYCVcQEmEAK/mg5og3B4PQ9Zy+iqMjDp3pcouan8L
-                     Svn59Lm65EEjafFnC/1bgl8xJUbrn4Ue/Y8yq8fI8S3SHwm05ojfhwyj/yAXEoZm
-                     pdDLZcWrl/mdpFo8Nud0w/tTG5SJ7qV09dfhgFx/VtW5AgMBAAGjga0wgaowDwYD
-                     VR0TAQH/BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAAcwDgYDVR0PAQH/BAQDAgGG
-                     MB0GA1UdDgQWBBSm0WQur7Gdx6YjizuqQDo7tkeBpjBVBgNVHSMETjBMgBS/vIuH
-                     Haj47GzVYkgYrGExzWYBsaExpC8wLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYD
-                     VQQDEw5UZXN0IFJvb3QgQ0EgMYIBATANBgkqhkiG9w0BAQQFAAOCAQEADZNut4n5
-                     IzLbXMLbyqO2HdXiCw6JkTY2Mj6kIwngbfLMeRHWuPJmM2JOuA8Wk//OIzDJfpte
-                     d+YOAGCJ8yyAXsB5Qr/68YS8sRbmjYgB9jLiz0wg3p5fnBTX2st7EY4aVR4+7pAZ
-                     12uoPMJvHfd2nsCT01A7fs7qnsOWFnJBRvfDgzRwmx/wkTp8aW3Hvqw28sVnY8q7
-                     9GEEV1DU9sJxrb12pBzWyNLU0v9EiiEWdr0hS4K8D5Q7JmKbFPv1RfocX1ocEPDN
-                     EJMA53C2Y6rq8mHV6IsvzgucLfFCo0tlR2aXTvTJHuu1ddSOKtyVkHwC4cUEmzu3
-                     L9VaYDF1sVm6pw==
-                  </ds:X509Certificate>
-                  <!-- CRL (version 1) issued by Intermedediate CA 1A1 -->
-                  <ds:X509CRL>
-                     MIIBkjB8MA0GCSqGSIb3DQEBBAUAMDcxEjAQBgNVBAoTCUludGVybmV0MjEhMB8G
-                     A1UEAxMYVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMUExFw0wODAyMTYwNDU2MjNaFw0y
-                     NzA0MTcwNDU2MjNaMBQwEgIBAhcNMDgwMjE2MDQyNzQ5WjANBgkqhkiG9w0BAQQF
-                     AAOCAQEAfw8nWPVRK8hpt4ZU4AKiKXDc06Wf2L3IbdXHj/n4GiwQAZX9UJ34firo
-                     GKXKplwrffmVuiEwEwFBpm0M+UuCqcDgSeyruucBzRXPkr1DyPOUJ3fbI7lb9BAP
-                     C/cR7e+I+YTaXa1L15ocVN+reWq3hcWRLzejTOlrPhhTCVRnBwmWx83026PRcnjm
-                     +63YONnMFUpx8Cw3ktLVMGbxHjsDAhMTWB8YSQ3oFV7h6tpzmsr0QQxTUugP5wBX
-                     CmMJqrMIAiGfKBDzm3LfW6ZusjIsQ6HxgMC77/wU2y735POxFrnLMyOgqCTo6YHY
-                     62eLjgwVBEeOk9A4mX+NORA6EZ6BRg==
-                  </ds:X509CRL>
-               </ds:X509Data>
-            </ds:KeyInfo>
-         </shibmd:KeyAuthority>
-         
-      </Extensions>
-      
-      <!-- Protocol BLUE -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_FOO"/>
-      </IDPSSODescriptor>
-      
-      <!-- Protocol GREEN -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_GREEN">
-         <!-- Note no 'use' specified. -->
-         <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>CN=foo.example.org,O=Internet2</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_BAR"/>
-      </IDPSSODescriptor>
-      
-      <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
-      </AttributeAuthorityDescriptor>
-      
-   </EntityDescriptor>
-   
-
-   <EntityDescriptor entityID="http://bar.example.org/shibboleth">
-      
-      <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE PROTOCOL_GREEN">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>bar.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bar.example.org/Shibboleth.sso/POST" index="0"/>
-      </SPSSODescriptor>
-      
-   </EntityDescriptor>
-
-</EntitiesDescriptor>
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/threeset-entity-entities-entities-metadata-pkix.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/threeset-entity-entities-entities-metadata-pkix.xml
deleted file mode 100644
index 0b56c3b70..000000000
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/threeset-entity-entities-entities-metadata-pkix.xml
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" Name="http://the.federation.com">
-   
-   <Extensions>
-   
-      <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
-         
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <!-- Root CA 1 issues Intermediate CA 1A -->
-            <!-- Intermediate CA 1A issues Intermediate CA 1A1 -->
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 1 --> 
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                  DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                  6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                  IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                  659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                  yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                  THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                  4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                  bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                  Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                  INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                  K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                  /r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                  V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDcxOFoX
-                  DTI4MDIxMTAyNDcxOFowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAxQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBALy5mrdKqaYlf+bAdeifTJ22FfyHbpLtL6rvg9Zlr3mQC+kmQ1A2H7nO
-                  pXuDGxiwdcFpLEmDHw7B2+p7ghfXvTeu7P7W4JIz4cBq/FhCSiG0hxuy7AQ21inc
-                  o4WJIz9250tWMC7HpELwpFPbfCdPG4jSYcq6fUH1Dp9t8gtL31LVwPgq1hoSEIK0
-                  3nKDQQe9l/wU9ZcS3HbwGOgP521bPUuOyHzYL49r4Te0ACo9Fcpn5JLQa9gzKgnQ
-                  i2O2lVUppsuCpinLJ4GW1q3Ivj1PniAXdLVfBf1CMyfl1WwbWnIBn2mskHKcV7z3
-                  8aaPdsH/7wUPVdPgQwj7ss1ZzKtQCYECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FL+8i4cdqPjsbNViSBisYTHNZgGxMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6
-                  nWgVhy3ioTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAxggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBvtwKsWfoObKJECvK99LCH
-                  pyisrcfFV69QlIW1eP77iNz47GXmnAqA6mO3+5SDJujiAa+jXnPTcz1kLJsh6xvP
-                  aozkCGECRwkzgQMew+0LBHcnD5geYdwJosrw9NWhPNJ0MA51y/LrOO2DCTXmYrIH
-                  c/59ew5ed6/8a+EWLF7798ifBZZrlxDHLHR6Sn53ugVh0cBHw6LE/5AGG5Xf1Ysr
-                  Cn4ZpHLwNn+I30+f2mweOYCkB607D4fkZGBpii6l4XRTV0oMg2aLYMZNwXct6Rhr
-                  NCvatfLuvDskkS9gIoRZNj/It+hKqf8aZ5DK+mloLYS0sem4HpE4d2VwpQfG93IK
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A1 -->
-               <ds:X509Certificate>
-                  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQQFADA2MRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxIDAeBgNVBAMTF1Rlc3QgSW50ZXJtZWRpYXRlIENBIDFBMB4XDTA4MDIx
-                  NjAyNTAyN1oXDTI4MDIxMTAyNTAyN1owNzESMBAGA1UEChMJSW50ZXJuZXQyMSEw
-                  HwYDVQQDExhUZXN0IEludGVybWVkaWF0ZSBDQSAxQTEwggEiMA0GCSqGSIb3DQEB
-                  AQUAA4IBDwAwggEKAoIBAQC4faOujGl1+5gC8SlsUn805CdmmncOvG8sGA5t2S9V
-                  DetiQAhQknNvjmghiWo/9UGXvQZIqdRlj3L8T6itrJPKBuDTVqCBHic1XYoXLIUD
-                  WqampQH0ehhbDCcghgshHunb3yaaaDeB0ZlgJJ/XqOqKvFcRbOSSWWZe+zDuiShK
-                  2WT0UZWIwC2+v01PEG8a5YUZYCVcQEmEAK/mg5og3B4PQ9Zy+iqMjDp3pcouan8L
-                  Svn59Lm65EEjafFnC/1bgl8xJUbrn4Ue/Y8yq8fI8S3SHwm05ojfhwyj/yAXEoZm
-                  pdDLZcWrl/mdpFo8Nud0w/tTG5SJ7qV09dfhgFx/VtW5AgMBAAGjga0wgaowDwYD
-                  VR0TAQH/BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAAcwDgYDVR0PAQH/BAQDAgGG
-                  MB0GA1UdDgQWBBSm0WQur7Gdx6YjizuqQDo7tkeBpjBVBgNVHSMETjBMgBS/vIuH
-                  Haj47GzVYkgYrGExzWYBsaExpC8wLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYD
-                  VQQDEw5UZXN0IFJvb3QgQ0EgMYIBATANBgkqhkiG9w0BAQQFAAOCAQEADZNut4n5
-                  IzLbXMLbyqO2HdXiCw6JkTY2Mj6kIwngbfLMeRHWuPJmM2JOuA8Wk//OIzDJfpte
-                  d+YOAGCJ8yyAXsB5Qr/68YS8sRbmjYgB9jLiz0wg3p5fnBTX2st7EY4aVR4+7pAZ
-                  12uoPMJvHfd2nsCT01A7fs7qnsOWFnJBRvfDgzRwmx/wkTp8aW3Hvqw28sVnY8q7
-                  9GEEV1DU9sJxrb12pBzWyNLU0v9EiiEWdr0hS4K8D5Q7JmKbFPv1RfocX1ocEPDN
-                  EJMA53C2Y6rq8mHV6IsvzgucLfFCo0tlR2aXTvTJHuu1ddSOKtyVkHwC4cUEmzu3
-                  L9VaYDF1sVm6pw==
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1B -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBAjANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDcyOVoX
-                  DTI4MDIxMTAyNDcyOVowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAxQjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBAMFmeuJN8TNCmZf5qRUXb0nIOLdoEhReG3O4dTO7V10eKdUmI3ED4qn2
-                  dJ43lFDN09FI0792GrEJB9rWFq09xoaBuLulTQmEJFmeR2jkNmAoJJ9X6UjzHjsZ
-                  oF1M/PVMDgMX/5NxcLtAtnAOsiaKU7WdiGrvgd8rpdUBh7OMqv68tA3Atn7bn37l
-                  g2EHBkG4eS0mN4bGT2XTfP8Ft1q1INpGa+PTJWAAvqL1gF4S+9r+fg9iSW9YMTlQ
-                  0GbkXGvSEN1LePmx0+Spp56eQj+nASClXcmMCOeGJ2YKRPDQ7DmW6yDbbXtb4AL0
-                  lp1p9zw0iGO7CpEePHoqiV/abCGfEwECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FEBLOJgprnb55vlDuKKL1N+TGFzGMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6
-                  nWgVhy3ioTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAxggEAMA0GCSqGSIb3DQEBBAUAA4IBAQAtkDIR1wUCL7icVAInaNEE
-                  qo1yA3fW6yWa68mhO2QU1NDKDrmVYu5Vxn0ilDUbdDkhOz8OhIIdQkWR0V/PBYpq
-                  oMD+9LtqURypV8HgLP5t/mh7tpQBcj1/9fO0ARDFNgBouSQAXI0oQ3/yBOPCvhRG
-                  yxrYMUTnX11GFnkkzawWEMNGja4FfHybcFhaPrVN0Bt/ycdI8GEChSk+8nudpmYj
-                  gawp0eagQq4XoHS9Bfi1+v7n5WenyCCdvMFc8RvV8OkviaO8Bautmw3YR3pXD8VX
-                  cCCviIhkqf1Hr7Kmcdwa7w5Fq+ruWA+ZpO6JpSjzM5MCl9VQH7GiY+45cgEhRNGL
-               </ds:X509Certificate>
-               <!-- CRL (version 1) issued by Intermedediate CA 1A1 -->
-               <ds:X509CRL>
-                  MIIBkjB8MA0GCSqGSIb3DQEBBAUAMDcxEjAQBgNVBAoTCUludGVybmV0MjEhMB8G
-                  A1UEAxMYVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMUExFw0wODAyMTYwNDU2MjNaFw0y
-                  NzA0MTcwNDU2MjNaMBQwEgIBAhcNMDgwMjE2MDQyNzQ5WjANBgkqhkiG9w0BAQQF
-                  AAOCAQEAfw8nWPVRK8hpt4ZU4AKiKXDc06Wf2L3IbdXHj/n4GiwQAZX9UJ34firo
-                  GKXKplwrffmVuiEwEwFBpm0M+UuCqcDgSeyruucBzRXPkr1DyPOUJ3fbI7lb9BAP
-                  C/cR7e+I+YTaXa1L15ocVN+reWq3hcWRLzejTOlrPhhTCVRnBwmWx83026PRcnjm
-                  +63YONnMFUpx8Cw3ktLVMGbxHjsDAhMTWB8YSQ3oFV7h6tpzmsr0QQxTUugP5wBX
-                  CmMJqrMIAiGfKBDzm3LfW6ZusjIsQ6HxgMC77/wU2y735POxFrnLMyOgqCTo6YHY
-                  62eLjgwVBEeOk9A4mX+NORA6EZ6BRg==
-               </ds:X509CRL>
-            </ds:X509Data>
-         </ds:KeyInfo>
-         
-      </shibmd:KeyAuthority>
-   
-   </Extensions>
-   
-<EntitiesDescriptor Name="example.org">
-   
-   <Extensions>
-      
-      <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
-         
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <!-- Root CA 2 issues Intermediate CA 2A -->
-            <!-- Root CA 2 issues Intermediate CA 2B -->
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 2 -->
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAyMB4XDTA4MDIxNjAyNDc1NloX
-                  DTMzMDIwOTAyNDc1NlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKBx
-                  1TBIAI+/C1z/UGpEEbCV6F+qhyTM9k2qLeVoqS+ZkSCW3rGpJEx3W3cdUClYsiZq
-                  X67OsJ6Yg1ilHmQHOwGO+6da2fJx4fSbNdzcJAUH2Zge4PYufTeE23Z6e8FMakIi
-                  27NElWsY1AdP0TEyXFJHYOhpJwMzs1kMkhBetOMXfgny0GRhK6tfmNlBI7iHTRTP
-                  5RnakeKauomoVx5t+XrHQPaRCzjvRRxgLJ66UDNe48xztbz4lAz1N1yFL5ONIsIj
-                  wds6aOTj6Akt7rha+cozTbpHMWdPvOTiKydpAzabN1y1998geseLLwtDd6RsrHKk
-                  jIjqn1KTMb85zHffoyUCAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFPdjZ6zd62bP
-                  OJ5E2KKIh7FL3GFSMFUGA1UdIwROMEyAFPdjZ6zd62bPOJ5E2KKIh7FL3GFSoTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAy
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQB/4RsB7RzvmDualEaF9Fpgr/pJIa4/TkG/
-                  /WQlKtQL4dA1NH2cA12ET2UiiSA3wwedXqaJ3xR1e5j2d2u30DhsYDBqQT+vWWA0
-                  Z3tJET4n0lIuCozn3b1xNIqTX1/BxeDTuoqz5HVT66mwMPtT8UDTcD8h0jmrW+LU
-                  9aQX4zSYyPaiq0Dvu7dnnrhqAWJ1o2+Bet6YmtfxMUXXSolwC6ZBcWzq6ighXsyw
-                  dh9v+60iczDPvXZq0aLNgYoSmVXNXIj8/gZEDBUY3r2u3FEWVR62XC0wKDTiTe2M
-                  ixmfwIdPq/WshU0tUGqnhTN9x2dCQGJuS1EhTPM2AbBZydZ4ygTE
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 2A -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAyMB4XDTA4MDIxNjAyNDgzOVoX
-                  DTI4MDIxMTAyNDgzOVowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAyQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBANeowIrfgyqAOwSQmU2nf+LwlKrse3d+wpTTIVE+NTOFAT9YHIzP4I9i
-                  axt+63JnLkS3TgxADR/bhoz0qdSeKkba+7/3ZYLNqpdoH0j0HUstKYslDFeElKle
-                  sPcmQAzcwH9k2dwrlLIZZ0jX3/NzK4HgVn8AwYhkCzW0z4cmW25+1dGOteSWm5oF
-                  sot0sGxm+2F4Tt1UbNvYV7uB65dvajqoY0o2gwZLh61wF/A8ADM9qMPX1lW5PgUI
-                  tx/J5MP+FnEEsQi94wnrS8oAldU6Qb6Wv6PwE/YaTUn3m0wp7SWLrlgLLvF4Useb
-                  r2V+Ab0XUz+wRMz9GJvhmxW2Aoz4LhUCAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FHoQVd5JyBpssooxI+gZFAfkDdOgMFUGA1UdIwROMEyAFPdjZ6zd62bPOJ5E2KKI
-                  h7FL3GFSoTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAyggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBYAoFyRZmZJY/nFzfaKFmM
-                  dGD/ex5n3exFoDjKoiShuAU3ReXnFR+AVz9f7FlHqsnWAp0pGMmJ8NrqXpJaO6SC
-                  RBHVPagBAdyoNGK4anjwLTiCKCAVi5MBnGpeis07nfy4Ot1dvl++w/3YgIouABTi
-                  5hyy3bgzFNoS/vwas1k7NJacjZiRTT+3MDJ9OtjHGdZN7/tXQL3vujEGp6+z1Ly7
-                  c1uOIARdlN44Jk9OR7SWaAi0v9bh2i1iw/3wPDjSz1srosxV2ANIonOKfQryxREh
-                  TgEK3IHfc0VGcKPsZ0oljH29/dMoHiYQy4Su8uqjd4n8l2YxGKPXhf4PVO0Go1Ot
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 2B -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBAjANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAyMB4XDTA4MDIxNjAyNDg1N1oX
-                  DTI4MDIxMTAyNDg1N1owNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAyQjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBALgYSfCvdNqEzs7048Tovc9LgyIrDwuBkoU2HbdczIuw8ipJDAOmo5w3
-                  BIDjxUZQx2vO1v6KW81AcOR0LqXd0K8Bnl5OXFHiW3laz9yFhyXKAB5roWnrQmCL
-                  vitN6P3vM6AA2UiNT1Ze9utFQ1SwnDfPDVYTRebhbxRgj5qWOK2mB9OIoD2ff0pI
-                  gf1ziIiJHChljnd2UA3OM/5pI5sKd0iaT6SrhGzysgn1ITTeWlw1axOfyh/+SW8k
-                  yefZQkjWLXce/9DcHDdo3NSDbqX264VQK0QcQi7l2v5HNEecSRecelO0746bjJ7n
-                  mbcQvEkdxgfvZBvqIqB4Drd75yPmcd0CAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FP0txMEysaCUdvSu+xU1DV7eNPOuMFUGA1UdIwROMEyAFPdjZ6zd62bPOJ5E2KKI
-                  h7FL3GFSoTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAyggEAMA0GCSqGSIb3DQEBBAUAA4IBAQCBtGF7Hls4x7xbM8dRYp4g
-                  RG0UsRVwRne+Yozzk/sn38rJni6qhMbEwpd0nLp2hwVi2++knQ/ZG5iAxMNCTkP/
-                  /k1fO4ezglUnlLWzJZb0L7mSulpcFHQ2wiOxPjNTVX/kD+y5FzfmGA31CH3CYDwk
-                  itDI+5TRcpvYYU4YS+thVMdPFqRlS7JkylrF1k4vAdPNCSkzk1RCjTIHqPXGSB1N
-                  JmK5VijeplrmJr9LwxhR9D1/dbth+k4RIZ0/ARRuxBMTCLQcsJ/qdrw3a1qlGi21
-                  0LjfQiBmLW7w5OWjhbK+Y8IAgm9zjswRQHZ5z2sSOf7sw8JviTyVDvlAlQ3XPEbW
-               </ds:X509Certificate>
-            </ds:X509Data>
-         </ds:KeyInfo>
-         
-      </shibmd:KeyAuthority>
-      
-   </Extensions>
-
-   <EntityDescriptor entityID="http://foo.example.org/shibboleth">
-      
-      <Extensions>
-         <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="3">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                  <ds:X509Data>
-                     <!-- O=Internet2, CN=Test Root CA 3 -->
-                     <ds:X509Certificate>
-                        MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                        cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAzMB4XDTA4MDIxNjA0NTMxN1oX
-                        DTMzMDIwOTA0NTMxN1owLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                        ZXN0IFJvb3QgQ0EgMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcO
-                        aHbctY9/ocMmLq98YpnelSho5l8gSiBm95v6DGJx8tQS3BVJuG6Cp4lTZM3SdmCL
-                        Da9OO8pleZ+8YAVYNvI+GPq3ZNkGWgBw2pGp4TdDvu+wp6yHGGlxwzsIQl7CicBX
-                        7R9UFXEmHbqlBHZY+5IZfdwjHDGCFX1GLHfgZ1fepguUn5+CKNcebkn6fiHrKvcO
-                        AAp083nem+F5cRopL4dxPFecnf+xbuii4r2fbGnVMrCl+lybqql0bmjGAu7gWV4/
-                        EaWQez/+dqBV7RRUvvb6ESB9VBcuWuwBkF+zr8yMFYlHNTpZs1lM8vss2e7oRdke
-                        VQm0jxrU14zpGD4WAkECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                        SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNYpvLOrOLVe
-                        Wbtf51KsboM3G7SpMFUGA1UdIwROMEyAFNYpvLOrOLVeWbtf51KsboM3G7SpoTGk
-                        LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAz
-                        ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBkhItn+wt+CU7RspC4Dh9umdcaikGSeK4P
-                        LwFDFvkUzBbeO+l0QYICVLAso9w6d9ckxloik7vALI5KC9DMLSgc5eSkB6x4Y++A
-                        q/pB2PFinNywKyyyO1c3u6j7HCYa5aSB0Q95Bo5lkxz13EK/DhbLLT3Ytli+Mw3D
-                        xuIZ/jTQDBadEfIuQLOks/aa+WY6AloRC711yflyE8jkaUnvMQoYMBD1oRle77SD
-                        FZqYHfaAONdzcC8q2hwys2L4gopY50l0izN2E2XGtMBZfHJ/9rLAqSNBmB0iCv/x
-                        qXyJ7avCwqkpcFtWSQM6u3F+DwKn8wE1MqevHmK/LVC3f0gE4qtz
-                     </ds:X509Certificate>
-                     <!-- CRL (version 2) issued by Root CA 3 -->
-                     <ds:X509CRL>
-                        MIIB0TCBugIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRlcm5ldDIx
-                        FzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAzFw0wODAyMTYwNjI1NTZaFw0yMTEwMjUw
-                        NjI1NTZaoFkwVzBVBgNVHSMETjBMgBTWKbyzqzi1Xlm7X+dSrG6DNxu0qaExpC8w
-                        LTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5UZXN0IFJvb3QgQ0EgM4IB
-                        ADANBgkqhkiG9w0BAQQFAAOCAQEAKSYrL3BA4V1IeyaXseLn38r+tYUxZbka0gUk
-                        6rewQXgFrB/BIdmOUEd8fxh+nTRCmeWd9BeC/Xq+kGfrq2Q9TkxhF5sz+3G9BGmf
-                        cAVVsua9g567ePHHr/H2kB5BUy2Fn2YIYCR3B8W3Qd4WATofh7+y7aQRReaHLj3U
-                        5c68ar8puyUiPwTg7g/H/qWd0plPkd6OGNyEFNCH/iq25qFUg6mOW1Vv3IZ0PRDc
-                        hNLGVcJWSo19aTImFiqk6iwzkKx+eeu/HNXVzo/D3tM5YA+uPPkIgP2pKsmF1wYc
-                        WJr+OqRp339ffO1qlFmXwklqstBIPn0/YzzKL/em3XXHlulByw==
-                     </ds:X509CRL>
-                  </ds:X509Data>
-               </ds:KeyInfo>
-         </shibmd:KeyAuthority>
-      </Extensions>
-      
-      <!-- Protocol BLUE -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_FOO"/>
-      </IDPSSODescriptor>
-      
-      <!-- Protocol GREEN -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_GREEN">
-         <!-- Note no 'use' specified. -->
-         <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>CN=foo.example.org,O=Internet2</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_BAR"/>
-      </IDPSSODescriptor>
-      
-      <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
-      </AttributeAuthorityDescriptor>
-      
-   </EntityDescriptor>
-   
-
-   <EntityDescriptor entityID="http://bar.example.org/shibboleth">
-      
-      <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE PROTOCOL_GREEN">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>bar.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bar.example.org/Shibboleth.sso/POST" index="0"/>
-      </SPSSODescriptor>
-      
-   </EntityDescriptor>
-
-</EntitiesDescriptor>
-   
-</EntitiesDescriptor>
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/twoset-2authorities-entities-metadata-pkix.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/twoset-2authorities-entities-metadata-pkix.xml
deleted file mode 100644
index 738cd2e25..000000000
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/twoset-2authorities-entities-metadata-pkix.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" Name="example.org">
-   
-   <Extensions>
-      
-      <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
-         
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <!-- Root CA 1 issues Intermediate CA 1A -->
-            <!-- Intermediate CA 1A issues Intermediate CA 1A1 -->
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 1 --> 
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                  DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                  6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                  IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                  659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                  yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                  THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                  4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                  bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                  Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                  INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                  K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                  /r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                  V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDcxOFoX
-                  DTI4MDIxMTAyNDcxOFowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAxQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBALy5mrdKqaYlf+bAdeifTJ22FfyHbpLtL6rvg9Zlr3mQC+kmQ1A2H7nO
-                  pXuDGxiwdcFpLEmDHw7B2+p7ghfXvTeu7P7W4JIz4cBq/FhCSiG0hxuy7AQ21inc
-                  o4WJIz9250tWMC7HpELwpFPbfCdPG4jSYcq6fUH1Dp9t8gtL31LVwPgq1hoSEIK0
-                  3nKDQQe9l/wU9ZcS3HbwGOgP521bPUuOyHzYL49r4Te0ACo9Fcpn5JLQa9gzKgnQ
-                  i2O2lVUppsuCpinLJ4GW1q3Ivj1PniAXdLVfBf1CMyfl1WwbWnIBn2mskHKcV7z3
-                  8aaPdsH/7wUPVdPgQwj7ss1ZzKtQCYECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FL+8i4cdqPjsbNViSBisYTHNZgGxMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6
-                  nWgVhy3ioTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAxggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBvtwKsWfoObKJECvK99LCH
-                  pyisrcfFV69QlIW1eP77iNz47GXmnAqA6mO3+5SDJujiAa+jXnPTcz1kLJsh6xvP
-                  aozkCGECRwkzgQMew+0LBHcnD5geYdwJosrw9NWhPNJ0MA51y/LrOO2DCTXmYrIH
-                  c/59ew5ed6/8a+EWLF7798ifBZZrlxDHLHR6Sn53ugVh0cBHw6LE/5AGG5Xf1Ysr
-                  Cn4ZpHLwNn+I30+f2mweOYCkB607D4fkZGBpii6l4XRTV0oMg2aLYMZNwXct6Rhr
-                  NCvatfLuvDskkS9gIoRZNj/It+hKqf8aZ5DK+mloLYS0sem4HpE4d2VwpQfG93IK
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A1 -->
-               <ds:X509Certificate>
-                  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQQFADA2MRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxIDAeBgNVBAMTF1Rlc3QgSW50ZXJtZWRpYXRlIENBIDFBMB4XDTA4MDIx
-                  NjAyNTAyN1oXDTI4MDIxMTAyNTAyN1owNzESMBAGA1UEChMJSW50ZXJuZXQyMSEw
-                  HwYDVQQDExhUZXN0IEludGVybWVkaWF0ZSBDQSAxQTEwggEiMA0GCSqGSIb3DQEB
-                  AQUAA4IBDwAwggEKAoIBAQC4faOujGl1+5gC8SlsUn805CdmmncOvG8sGA5t2S9V
-                  DetiQAhQknNvjmghiWo/9UGXvQZIqdRlj3L8T6itrJPKBuDTVqCBHic1XYoXLIUD
-                  WqampQH0ehhbDCcghgshHunb3yaaaDeB0ZlgJJ/XqOqKvFcRbOSSWWZe+zDuiShK
-                  2WT0UZWIwC2+v01PEG8a5YUZYCVcQEmEAK/mg5og3B4PQ9Zy+iqMjDp3pcouan8L
-                  Svn59Lm65EEjafFnC/1bgl8xJUbrn4Ue/Y8yq8fI8S3SHwm05ojfhwyj/yAXEoZm
-                  pdDLZcWrl/mdpFo8Nud0w/tTG5SJ7qV09dfhgFx/VtW5AgMBAAGjga0wgaowDwYD
-                  VR0TAQH/BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAAcwDgYDVR0PAQH/BAQDAgGG
-                  MB0GA1UdDgQWBBSm0WQur7Gdx6YjizuqQDo7tkeBpjBVBgNVHSMETjBMgBS/vIuH
-                  Haj47GzVYkgYrGExzWYBsaExpC8wLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYD
-                  VQQDEw5UZXN0IFJvb3QgQ0EgMYIBATANBgkqhkiG9w0BAQQFAAOCAQEADZNut4n5
-                  IzLbXMLbyqO2HdXiCw6JkTY2Mj6kIwngbfLMeRHWuPJmM2JOuA8Wk//OIzDJfpte
-                  d+YOAGCJ8yyAXsB5Qr/68YS8sRbmjYgB9jLiz0wg3p5fnBTX2st7EY4aVR4+7pAZ
-                  12uoPMJvHfd2nsCT01A7fs7qnsOWFnJBRvfDgzRwmx/wkTp8aW3Hvqw28sVnY8q7
-                  9GEEV1DU9sJxrb12pBzWyNLU0v9EiiEWdr0hS4K8D5Q7JmKbFPv1RfocX1ocEPDN
-                  EJMA53C2Y6rq8mHV6IsvzgucLfFCo0tlR2aXTvTJHuu1ddSOKtyVkHwC4cUEmzu3
-                  L9VaYDF1sVm6pw==
-               </ds:X509Certificate>
-               <!-- CRL (version 1) issued by Intermedediate CA 1A1 -->
-               <ds:X509CRL>
-                  MIIBkjB8MA0GCSqGSIb3DQEBBAUAMDcxEjAQBgNVBAoTCUludGVybmV0MjEhMB8G
-                  A1UEAxMYVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMUExFw0wODAyMTYwNDU2MjNaFw0y
-                  NzA0MTcwNDU2MjNaMBQwEgIBAhcNMDgwMjE2MDQyNzQ5WjANBgkqhkiG9w0BAQQF
-                  AAOCAQEAfw8nWPVRK8hpt4ZU4AKiKXDc06Wf2L3IbdXHj/n4GiwQAZX9UJ34firo
-                  GKXKplwrffmVuiEwEwFBpm0M+UuCqcDgSeyruucBzRXPkr1DyPOUJ3fbI7lb9BAP
-                  C/cR7e+I+YTaXa1L15ocVN+reWq3hcWRLzejTOlrPhhTCVRnBwmWx83026PRcnjm
-                  +63YONnMFUpx8Cw3ktLVMGbxHjsDAhMTWB8YSQ3oFV7h6tpzmsr0QQxTUugP5wBX
-                  CmMJqrMIAiGfKBDzm3LfW6ZusjIsQ6HxgMC77/wU2y735POxFrnLMyOgqCTo6YHY
-                  62eLjgwVBEeOk9A4mX+NORA6EZ6BRg==
-               </ds:X509CRL>
-            </ds:X509Data>
-         </ds:KeyInfo>
-         
-      </shibmd:KeyAuthority>
-         
-      <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="3">
-         
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 3 -->
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAzMB4XDTA4MDIxNjA0NTMxN1oX
-                  DTMzMDIwOTA0NTMxN1owLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcO
-                  aHbctY9/ocMmLq98YpnelSho5l8gSiBm95v6DGJx8tQS3BVJuG6Cp4lTZM3SdmCL
-                  Da9OO8pleZ+8YAVYNvI+GPq3ZNkGWgBw2pGp4TdDvu+wp6yHGGlxwzsIQl7CicBX
-                  7R9UFXEmHbqlBHZY+5IZfdwjHDGCFX1GLHfgZ1fepguUn5+CKNcebkn6fiHrKvcO
-                  AAp083nem+F5cRopL4dxPFecnf+xbuii4r2fbGnVMrCl+lybqql0bmjGAu7gWV4/
-                  EaWQez/+dqBV7RRUvvb6ESB9VBcuWuwBkF+zr8yMFYlHNTpZs1lM8vss2e7oRdke
-                  VQm0jxrU14zpGD4WAkECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNYpvLOrOLVe
-                  Wbtf51KsboM3G7SpMFUGA1UdIwROMEyAFNYpvLOrOLVeWbtf51KsboM3G7SpoTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAz
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBkhItn+wt+CU7RspC4Dh9umdcaikGSeK4P
-                  LwFDFvkUzBbeO+l0QYICVLAso9w6d9ckxloik7vALI5KC9DMLSgc5eSkB6x4Y++A
-                  q/pB2PFinNywKyyyO1c3u6j7HCYa5aSB0Q95Bo5lkxz13EK/DhbLLT3Ytli+Mw3D
-                  xuIZ/jTQDBadEfIuQLOks/aa+WY6AloRC711yflyE8jkaUnvMQoYMBD1oRle77SD
-                  FZqYHfaAONdzcC8q2hwys2L4gopY50l0izN2E2XGtMBZfHJ/9rLAqSNBmB0iCv/x
-                  qXyJ7avCwqkpcFtWSQM6u3F+DwKn8wE1MqevHmK/LVC3f0gE4qtz
-               </ds:X509Certificate>
-               <!-- CRL (version 2) issued by Root CA 3 -->
-               <ds:X509CRL>
-                  MIIB0TCBugIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRlcm5ldDIx
-                  FzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAzFw0wODAyMTYwNjI1NTZaFw0yMTEwMjUw
-                  NjI1NTZaoFkwVzBVBgNVHSMETjBMgBTWKbyzqzi1Xlm7X+dSrG6DNxu0qaExpC8w
-                  LTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5UZXN0IFJvb3QgQ0EgM4IB
-                  ADANBgkqhkiG9w0BAQQFAAOCAQEAKSYrL3BA4V1IeyaXseLn38r+tYUxZbka0gUk
-                  6rewQXgFrB/BIdmOUEd8fxh+nTRCmeWd9BeC/Xq+kGfrq2Q9TkxhF5sz+3G9BGmf
-                  cAVVsua9g567ePHHr/H2kB5BUy2Fn2YIYCR3B8W3Qd4WATofh7+y7aQRReaHLj3U
-                  5c68ar8puyUiPwTg7g/H/qWd0plPkd6OGNyEFNCH/iq25qFUg6mOW1Vv3IZ0PRDc
-                  hNLGVcJWSo19aTImFiqk6iwzkKx+eeu/HNXVzo/D3tM5YA+uPPkIgP2pKsmF1wYc
-                  WJr+OqRp339ffO1qlFmXwklqstBIPn0/YzzKL/em3XXHlulByw==
-               </ds:X509CRL>
-            </ds:X509Data>
-         </ds:KeyInfo>
-         
-      </shibmd:KeyAuthority>
-      
-   </Extensions>
-
-   <EntityDescriptor entityID="http://foo.example.org/shibboleth">
-      <!-- Protocol BLUE -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_FOO"/>
-      </IDPSSODescriptor>
-      
-      <!-- Protocol GREEN -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_GREEN">
-         <!-- Note no 'use' specified. -->
-         <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>CN=foo.example.org,O=Internet2</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_BAR"/>
-      </IDPSSODescriptor>
-      
-      <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
-      </AttributeAuthorityDescriptor>
-      
-   </EntityDescriptor>
-   
-
-   <EntityDescriptor entityID="http://bar.example.org/shibboleth">
-      
-      <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE PROTOCOL_GREEN">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>bar.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bar.example.org/Shibboleth.sso/POST" index="0"/>
-      </SPSSODescriptor>
-      
-   </EntityDescriptor>
-
-</EntitiesDescriptor>
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/twoset-entity-entities-metadata-pkix.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/twoset-entity-entities-metadata-pkix.xml
deleted file mode 100644
index b972dff4e..000000000
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/security/twoset-entity-entities-metadata-pkix.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" Name="example.org">
-   
-   <Extensions>
-      
-      <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="5">
-         
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <!-- Root CA 1 issues Intermediate CA 1A -->
-            <!-- Intermediate CA 1A issues Intermediate CA 1A1 -->
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 1 --> 
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDUyNloX
-                  DTMzMDIwOTAyNDUyNlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV5
-                  6dwqZGkiVx5/v9ULicAen3RuSRpd+SJ46p6RgXxWRA2WlHZYMW7pMTeN/KvbHKEk
-                  IkAu5fh19iLW+XkhWHGVTm7pPoZ7AdzJ4PfJId290T80/uS/kZT3coOeiqZy6dQ6
-                  659tVXCH9K0X/S5et6i+BS+gHPF/RvxnuVKTBrlHfToxwtN7GtkKRlvGHo9l83p3
-                  yoOEH83gBHBy3Hd2HUSSCH6c/rh/3u2pCzojQA2H8+L9/C3qG/OuLEtmVpaV7flz
-                  THLKQN6diK6NSS2ViEF0ymbb7ZO2caG1fwOLfeBU+Kbmre8XVJTmSAhG4ox8XLmr
-                  4/ugZnU50D1IaCbfhxECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFI9bMgOQsY4J
-                  bO1yrcG6nWgVhy3iMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6nWgVhy3ioTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAx
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBaf7gv/KYn5THGUJNczro8erZajPVqL678
-                  Jf1lv/oShdDesD0kXjxUIe9OSC2yhqFlZ3Ls8iB8D2naisWgo58Yty9r6nLJtEnB
-                  INrUSpAX1XmIeR/PgbPT+3ZRqWvb2hnkCM8HtfRPZLZCB/Leg4KHQMN0HTyZueCP
-                  K+RZkomQ5ir6O821za9SMboSDGGMr4KqbLFOrIBes+lOwEXVP84J1vi6qj0cWvmh
-                  /r4X3UV0D7qf508NrEvPlw/jTUzEHOf64a1g68V8xWrbef1MKvLZzcD5/meJ3Gpd
-                  V+AEfwI5bBmfpUetZsnLDqz5LX+qu0ORP6kRjS30u/0PNHNzdKtn
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAxMB4XDTA4MDIxNjAyNDcxOFoX
-                  DTI4MDIxMTAyNDcxOFowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAxQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBALy5mrdKqaYlf+bAdeifTJ22FfyHbpLtL6rvg9Zlr3mQC+kmQ1A2H7nO
-                  pXuDGxiwdcFpLEmDHw7B2+p7ghfXvTeu7P7W4JIz4cBq/FhCSiG0hxuy7AQ21inc
-                  o4WJIz9250tWMC7HpELwpFPbfCdPG4jSYcq6fUH1Dp9t8gtL31LVwPgq1hoSEIK0
-                  3nKDQQe9l/wU9ZcS3HbwGOgP521bPUuOyHzYL49r4Te0ACo9Fcpn5JLQa9gzKgnQ
-                  i2O2lVUppsuCpinLJ4GW1q3Ivj1PniAXdLVfBf1CMyfl1WwbWnIBn2mskHKcV7z3
-                  8aaPdsH/7wUPVdPgQwj7ss1ZzKtQCYECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FL+8i4cdqPjsbNViSBisYTHNZgGxMFUGA1UdIwROMEyAFI9bMgOQsY4JbO1yrcG6
-                  nWgVhy3ioTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAxggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBvtwKsWfoObKJECvK99LCH
-                  pyisrcfFV69QlIW1eP77iNz47GXmnAqA6mO3+5SDJujiAa+jXnPTcz1kLJsh6xvP
-                  aozkCGECRwkzgQMew+0LBHcnD5geYdwJosrw9NWhPNJ0MA51y/LrOO2DCTXmYrIH
-                  c/59ew5ed6/8a+EWLF7798ifBZZrlxDHLHR6Sn53ugVh0cBHw6LE/5AGG5Xf1Ysr
-                  Cn4ZpHLwNn+I30+f2mweOYCkB607D4fkZGBpii6l4XRTV0oMg2aLYMZNwXct6Rhr
-                  NCvatfLuvDskkS9gIoRZNj/It+hKqf8aZ5DK+mloLYS0sem4HpE4d2VwpQfG93IK
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 1A1 -->
-               <ds:X509Certificate>
-                  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQQFADA2MRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxIDAeBgNVBAMTF1Rlc3QgSW50ZXJtZWRpYXRlIENBIDFBMB4XDTA4MDIx
-                  NjAyNTAyN1oXDTI4MDIxMTAyNTAyN1owNzESMBAGA1UEChMJSW50ZXJuZXQyMSEw
-                  HwYDVQQDExhUZXN0IEludGVybWVkaWF0ZSBDQSAxQTEwggEiMA0GCSqGSIb3DQEB
-                  AQUAA4IBDwAwggEKAoIBAQC4faOujGl1+5gC8SlsUn805CdmmncOvG8sGA5t2S9V
-                  DetiQAhQknNvjmghiWo/9UGXvQZIqdRlj3L8T6itrJPKBuDTVqCBHic1XYoXLIUD
-                  WqampQH0ehhbDCcghgshHunb3yaaaDeB0ZlgJJ/XqOqKvFcRbOSSWWZe+zDuiShK
-                  2WT0UZWIwC2+v01PEG8a5YUZYCVcQEmEAK/mg5og3B4PQ9Zy+iqMjDp3pcouan8L
-                  Svn59Lm65EEjafFnC/1bgl8xJUbrn4Ue/Y8yq8fI8S3SHwm05ojfhwyj/yAXEoZm
-                  pdDLZcWrl/mdpFo8Nud0w/tTG5SJ7qV09dfhgFx/VtW5AgMBAAGjga0wgaowDwYD
-                  VR0TAQH/BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAAcwDgYDVR0PAQH/BAQDAgGG
-                  MB0GA1UdDgQWBBSm0WQur7Gdx6YjizuqQDo7tkeBpjBVBgNVHSMETjBMgBS/vIuH
-                  Haj47GzVYkgYrGExzWYBsaExpC8wLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYD
-                  VQQDEw5UZXN0IFJvb3QgQ0EgMYIBATANBgkqhkiG9w0BAQQFAAOCAQEADZNut4n5
-                  IzLbXMLbyqO2HdXiCw6JkTY2Mj6kIwngbfLMeRHWuPJmM2JOuA8Wk//OIzDJfpte
-                  d+YOAGCJ8yyAXsB5Qr/68YS8sRbmjYgB9jLiz0wg3p5fnBTX2st7EY4aVR4+7pAZ
-                  12uoPMJvHfd2nsCT01A7fs7qnsOWFnJBRvfDgzRwmx/wkTp8aW3Hvqw28sVnY8q7
-                  9GEEV1DU9sJxrb12pBzWyNLU0v9EiiEWdr0hS4K8D5Q7JmKbFPv1RfocX1ocEPDN
-                  EJMA53C2Y6rq8mHV6IsvzgucLfFCo0tlR2aXTvTJHuu1ddSOKtyVkHwC4cUEmzu3
-                  L9VaYDF1sVm6pw==
-               </ds:X509Certificate>
-               <!-- CRL (version 1) issued by Intermedediate CA 1A1 -->
-               <ds:X509CRL>
-                  MIIBkjB8MA0GCSqGSIb3DQEBBAUAMDcxEjAQBgNVBAoTCUludGVybmV0MjEhMB8G
-                  A1UEAxMYVGVzdCBJbnRlcm1lZGlhdGUgQ0EgMUExFw0wODAyMTYwNDU2MjNaFw0y
-                  NzA0MTcwNDU2MjNaMBQwEgIBAhcNMDgwMjE2MDQyNzQ5WjANBgkqhkiG9w0BAQQF
-                  AAOCAQEAfw8nWPVRK8hpt4ZU4AKiKXDc06Wf2L3IbdXHj/n4GiwQAZX9UJ34firo
-                  GKXKplwrffmVuiEwEwFBpm0M+UuCqcDgSeyruucBzRXPkr1DyPOUJ3fbI7lb9BAP
-                  C/cR7e+I+YTaXa1L15ocVN+reWq3hcWRLzejTOlrPhhTCVRnBwmWx83026PRcnjm
-                  +63YONnMFUpx8Cw3ktLVMGbxHjsDAhMTWB8YSQ3oFV7h6tpzmsr0QQxTUugP5wBX
-                  CmMJqrMIAiGfKBDzm3LfW6ZusjIsQ6HxgMC77/wU2y735POxFrnLMyOgqCTo6YHY
-                  62eLjgwVBEeOk9A4mX+NORA6EZ6BRg==
-               </ds:X509CRL>
-            </ds:X509Data>
-         </ds:KeyInfo>
-         
-         <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-            <!-- Root CA 2 issues Intermediate CA 2A -->
-            <!-- Root CA 2 issues Intermediate CA 2B -->
-            <ds:X509Data>
-               <!-- O=Internet2, CN=Test Root CA 2 -->
-               <ds:X509Certificate>
-                  MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAyMB4XDTA4MDIxNjAyNDc1NloX
-                  DTMzMDIwOTAyNDc1NlowLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                  ZXN0IFJvb3QgQ0EgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKBx
-                  1TBIAI+/C1z/UGpEEbCV6F+qhyTM9k2qLeVoqS+ZkSCW3rGpJEx3W3cdUClYsiZq
-                  X67OsJ6Yg1ilHmQHOwGO+6da2fJx4fSbNdzcJAUH2Zge4PYufTeE23Z6e8FMakIi
-                  27NElWsY1AdP0TEyXFJHYOhpJwMzs1kMkhBetOMXfgny0GRhK6tfmNlBI7iHTRTP
-                  5RnakeKauomoVx5t+XrHQPaRCzjvRRxgLJ66UDNe48xztbz4lAz1N1yFL5ONIsIj
-                  wds6aOTj6Akt7rha+cozTbpHMWdPvOTiKydpAzabN1y1998geseLLwtDd6RsrHKk
-                  jIjqn1KTMb85zHffoyUCAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                  SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFPdjZ6zd62bP
-                  OJ5E2KKIh7FL3GFSMFUGA1UdIwROMEyAFPdjZ6zd62bPOJ5E2KKIh7FL3GFSoTGk
-                  LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAy
-                  ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQB/4RsB7RzvmDualEaF9Fpgr/pJIa4/TkG/
-                  /WQlKtQL4dA1NH2cA12ET2UiiSA3wwedXqaJ3xR1e5j2d2u30DhsYDBqQT+vWWA0
-                  Z3tJET4n0lIuCozn3b1xNIqTX1/BxeDTuoqz5HVT66mwMPtT8UDTcD8h0jmrW+LU
-                  9aQX4zSYyPaiq0Dvu7dnnrhqAWJ1o2+Bet6YmtfxMUXXSolwC6ZBcWzq6ighXsyw
-                  dh9v+60iczDPvXZq0aLNgYoSmVXNXIj8/gZEDBUY3r2u3FEWVR62XC0wKDTiTe2M
-                  ixmfwIdPq/WshU0tUGqnhTN9x2dCQGJuS1EhTPM2AbBZydZ4ygTE
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 2A -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAyMB4XDTA4MDIxNjAyNDgzOVoX
-                  DTI4MDIxMTAyNDgzOVowNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAyQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBANeowIrfgyqAOwSQmU2nf+LwlKrse3d+wpTTIVE+NTOFAT9YHIzP4I9i
-                  axt+63JnLkS3TgxADR/bhoz0qdSeKkba+7/3ZYLNqpdoH0j0HUstKYslDFeElKle
-                  sPcmQAzcwH9k2dwrlLIZZ0jX3/NzK4HgVn8AwYhkCzW0z4cmW25+1dGOteSWm5oF
-                  sot0sGxm+2F4Tt1UbNvYV7uB65dvajqoY0o2gwZLh61wF/A8ADM9qMPX1lW5PgUI
-                  tx/J5MP+FnEEsQi94wnrS8oAldU6Qb6Wv6PwE/YaTUn3m0wp7SWLrlgLLvF4Useb
-                  r2V+Ab0XUz+wRMz9GJvhmxW2Aoz4LhUCAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FHoQVd5JyBpssooxI+gZFAfkDdOgMFUGA1UdIwROMEyAFPdjZ6zd62bPOJ5E2KKI
-                  h7FL3GFSoTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAyggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBYAoFyRZmZJY/nFzfaKFmM
-                  dGD/ex5n3exFoDjKoiShuAU3ReXnFR+AVz9f7FlHqsnWAp0pGMmJ8NrqXpJaO6SC
-                  RBHVPagBAdyoNGK4anjwLTiCKCAVi5MBnGpeis07nfy4Ot1dvl++w/3YgIouABTi
-                  5hyy3bgzFNoS/vwas1k7NJacjZiRTT+3MDJ9OtjHGdZN7/tXQL3vujEGp6+z1Ly7
-                  c1uOIARdlN44Jk9OR7SWaAi0v9bh2i1iw/3wPDjSz1srosxV2ANIonOKfQryxREh
-                  TgEK3IHfc0VGcKPsZ0oljH29/dMoHiYQy4Su8uqjd4n8l2YxGKPXhf4PVO0Go1Ot
-               </ds:X509Certificate>
-               <!-- O=Internet2, CN=Test Intermediate CA 2B -->
-               <ds:X509Certificate>
-                  MIIDjDCCAnSgAwIBAgIBAjANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                  cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAyMB4XDTA4MDIxNjAyNDg1N1oX
-                  DTI4MDIxMTAyNDg1N1owNjESMBAGA1UEChMJSW50ZXJuZXQyMSAwHgYDVQQDExdU
-                  ZXN0IEludGVybWVkaWF0ZSBDQSAyQjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                  AQoCggEBALgYSfCvdNqEzs7048Tovc9LgyIrDwuBkoU2HbdczIuw8ipJDAOmo5w3
-                  BIDjxUZQx2vO1v6KW81AcOR0LqXd0K8Bnl5OXFHiW3laz9yFhyXKAB5roWnrQmCL
-                  vitN6P3vM6AA2UiNT1Ze9utFQ1SwnDfPDVYTRebhbxRgj5qWOK2mB9OIoD2ff0pI
-                  gf1ziIiJHChljnd2UA3OM/5pI5sKd0iaT6SrhGzysgn1ITTeWlw1axOfyh/+SW8k
-                  yefZQkjWLXce/9DcHDdo3NSDbqX264VQK0QcQi7l2v5HNEecSRecelO0746bjJ7n
-                  mbcQvEkdxgfvZBvqIqB4Drd75yPmcd0CAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTAD
-                  AQH/MBEGCWCGSAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYE
-                  FP0txMEysaCUdvSu+xU1DV7eNPOuMFUGA1UdIwROMEyAFPdjZ6zd62bPOJ5E2KKI
-                  h7FL3GFSoTGkLzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3Qg
-                  Um9vdCBDQSAyggEAMA0GCSqGSIb3DQEBBAUAA4IBAQCBtGF7Hls4x7xbM8dRYp4g
-                  RG0UsRVwRne+Yozzk/sn38rJni6qhMbEwpd0nLp2hwVi2++knQ/ZG5iAxMNCTkP/
-                  /k1fO4ezglUnlLWzJZb0L7mSulpcFHQ2wiOxPjNTVX/kD+y5FzfmGA31CH3CYDwk
-                  itDI+5TRcpvYYU4YS+thVMdPFqRlS7JkylrF1k4vAdPNCSkzk1RCjTIHqPXGSB1N
-                  JmK5VijeplrmJr9LwxhR9D1/dbth+k4RIZ0/ARRuxBMTCLQcsJ/qdrw3a1qlGi21
-                  0LjfQiBmLW7w5OWjhbK+Y8IAgm9zjswRQHZ5z2sSOf7sw8JviTyVDvlAlQ3XPEbW
-               </ds:X509Certificate>
-            </ds:X509Data>
-         </ds:KeyInfo>
-         
-      </shibmd:KeyAuthority>
-      
-   </Extensions>
-
-   <EntityDescriptor entityID="http://foo.example.org/shibboleth">
-      
-      <Extensions>
-         <shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" VerifyDepth="3">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-                  <ds:X509Data>
-                     <!-- O=Internet2, CN=Test Root CA 3 -->
-                     <ds:X509Certificate>
-                        MIIDgzCCAmugAwIBAgIBADANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRl
-                        cm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAzMB4XDTA4MDIxNjA0NTMxN1oX
-                        DTMzMDIwOTA0NTMxN1owLTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5U
-                        ZXN0IFJvb3QgQ0EgMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcO
-                        aHbctY9/ocMmLq98YpnelSho5l8gSiBm95v6DGJx8tQS3BVJuG6Cp4lTZM3SdmCL
-                        Da9OO8pleZ+8YAVYNvI+GPq3ZNkGWgBw2pGp4TdDvu+wp6yHGGlxwzsIQl7CicBX
-                        7R9UFXEmHbqlBHZY+5IZfdwjHDGCFX1GLHfgZ1fepguUn5+CKNcebkn6fiHrKvcO
-                        AAp083nem+F5cRopL4dxPFecnf+xbuii4r2fbGnVMrCl+lybqql0bmjGAu7gWV4/
-                        EaWQez/+dqBV7RRUvvb6ESB9VBcuWuwBkF+zr8yMFYlHNTpZs1lM8vss2e7oRdke
-                        VQm0jxrU14zpGD4WAkECAwEAAaOBrTCBqjAPBgNVHRMBAf8EBTADAQH/MBEGCWCG
-                        SAGG+EIBAQQEAwIABzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNYpvLOrOLVe
-                        Wbtf51KsboM3G7SpMFUGA1UdIwROMEyAFNYpvLOrOLVeWbtf51KsboM3G7SpoTGk
-                        LzAtMRIwEAYDVQQKEwlJbnRlcm5ldDIxFzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAz
-                        ggEAMA0GCSqGSIb3DQEBBAUAA4IBAQBkhItn+wt+CU7RspC4Dh9umdcaikGSeK4P
-                        LwFDFvkUzBbeO+l0QYICVLAso9w6d9ckxloik7vALI5KC9DMLSgc5eSkB6x4Y++A
-                        q/pB2PFinNywKyyyO1c3u6j7HCYa5aSB0Q95Bo5lkxz13EK/DhbLLT3Ytli+Mw3D
-                        xuIZ/jTQDBadEfIuQLOks/aa+WY6AloRC711yflyE8jkaUnvMQoYMBD1oRle77SD
-                        FZqYHfaAONdzcC8q2hwys2L4gopY50l0izN2E2XGtMBZfHJ/9rLAqSNBmB0iCv/x
-                        qXyJ7avCwqkpcFtWSQM6u3F+DwKn8wE1MqevHmK/LVC3f0gE4qtz
-                     </ds:X509Certificate>
-                     <!-- CRL (version 2) issued by Root CA 3 -->
-                     <ds:X509CRL>
-                        MIIB0TCBugIBATANBgkqhkiG9w0BAQQFADAtMRIwEAYDVQQKEwlJbnRlcm5ldDIx
-                        FzAVBgNVBAMTDlRlc3QgUm9vdCBDQSAzFw0wODAyMTYwNjI1NTZaFw0yMTEwMjUw
-                        NjI1NTZaoFkwVzBVBgNVHSMETjBMgBTWKbyzqzi1Xlm7X+dSrG6DNxu0qaExpC8w
-                        LTESMBAGA1UEChMJSW50ZXJuZXQyMRcwFQYDVQQDEw5UZXN0IFJvb3QgQ0EgM4IB
-                        ADANBgkqhkiG9w0BAQQFAAOCAQEAKSYrL3BA4V1IeyaXseLn38r+tYUxZbka0gUk
-                        6rewQXgFrB/BIdmOUEd8fxh+nTRCmeWd9BeC/Xq+kGfrq2Q9TkxhF5sz+3G9BGmf
-                        cAVVsua9g567ePHHr/H2kB5BUy2Fn2YIYCR3B8W3Qd4WATofh7+y7aQRReaHLj3U
-                        5c68ar8puyUiPwTg7g/H/qWd0plPkd6OGNyEFNCH/iq25qFUg6mOW1Vv3IZ0PRDc
-                        hNLGVcJWSo19aTImFiqk6iwzkKx+eeu/HNXVzo/D3tM5YA+uPPkIgP2pKsmF1wYc
-                        WJr+OqRp339ffO1qlFmXwklqstBIPn0/YzzKL/em3XXHlulByw==
-                     </ds:X509CRL>
-                  </ds:X509Data>
-               </ds:KeyInfo>
-         </shibmd:KeyAuthority>
-      </Extensions>
-      
-      <!-- Protocol BLUE -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_FOO"/>
-      </IDPSSODescriptor>
-      
-      <!-- Protocol GREEN -->
-      <IDPSSODescriptor protocolSupportEnumeration="PROTOCOL_GREEN">
-         <!-- Note no 'use' specified. -->
-         <KeyDescriptor>
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>CN=foo.example.org,O=Internet2</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://foo.example.org/shibboleth/SSO_BAR"/>
-      </IDPSSODescriptor>
-      
-      <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>foo.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.example.org:8443/shibboleth/AA"/>
-      </AttributeAuthorityDescriptor>
-      
-   </EntityDescriptor>
-   
-
-   <EntityDescriptor entityID="http://bar.example.org/shibboleth">
-      
-      <SPSSODescriptor protocolSupportEnumeration="PROTOCOL_BLUE PROTOCOL_GREEN">
-         <KeyDescriptor use="signing">
-            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-               <ds:KeyName>bar.example.org</ds:KeyName>
-            </ds:KeyInfo>
-         </KeyDescriptor>
-         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bar.example.org/Shibboleth.sso/POST" index="0"/>
-      </SPSSODescriptor>
-      
-   </EntityDescriptor>
-
-</EntitiesDescriptor>
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibMDKeyAuthority.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibMDKeyAuthority.xml
deleted file mode 100644
index ddb1228f0..000000000
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibMDKeyAuthority.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"/>
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibMDKeyAuthorityChildElements.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibMDKeyAuthorityChildElements.xml
deleted file mode 100644
index 890bc13f1..000000000
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibMDKeyAuthorityChildElements.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-    <ds:KeyInfo/>
-    <ds:KeyInfo/>
-    <ds:KeyInfo/>
-    <ds:KeyInfo/>
-</shibmd:KeyAuthority>
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibMDKeyAuthorityOptionalAttributes.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibMDKeyAuthorityOptionalAttributes.xml
deleted file mode 100644
index 08751c196..000000000
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibMDKeyAuthorityOptionalAttributes.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:KeyAuthority xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:test="http://www.example.org/testObjects" VerifyDepth="5" test:UnknownAttrib="FooBar"/>
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibMDScope.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibMDScope.xml
deleted file mode 100644
index cd88636c2..000000000
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibMDScope.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">ThisIsSomeScopeValue</shibmd:Scope>
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibMDScopeOptionalAttributes.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibMDScopeOptionalAttributes.xml
deleted file mode 100644
index 81931ac92..000000000
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibMDScopeOptionalAttributes.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="true">ThisIsSomeScopeValue</shibmd:Scope>
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibScopedValue.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibScopedValue.xml
deleted file mode 100644
index 204d0077c..000000000
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibScopedValue.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<encoder:ScopedValue xmlns:encoder="urn:mace:shibboleth:2.0:attribute:encoder">member at example.edu</encoder:ScopedValue>
diff --git a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibScopedValueOptionalAttributes.xml b/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibScopedValueOptionalAttributes.xml
deleted file mode 100644
index 001dbb0f8..000000000
--- a/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/xmlobject/ShibScopedValueOptionalAttributes.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<encoder:ScopedValue xmlns:encoder="urn:mace:shibboleth:2.0:attribute:encoder" scope="example.edu">member</encoder:ScopedValue>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list