From b61f3a7d5bbfb1daa7a7c636cf24f8e27c6ed146 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Thu, 1 Dec 2011 21:58:36 +0100
Subject: resolves SWAMIDOPS-6362

---
 swamid-1.0/shibboleth.ebscohost.com.xml | 158 ++++++++++++++------------------
 1 file changed, 69 insertions(+), 89 deletions(-)

(limited to 'swamid-1.0')

diff --git a/swamid-1.0/shibboleth.ebscohost.com.xml b/swamid-1.0/shibboleth.ebscohost.com.xml
index 4d14f170..3e279fe2 100644
--- a/swamid-1.0/shibboleth.ebscohost.com.xml
+++ b/swamid-1.0/shibboleth.ebscohost.com.xml
@@ -1,89 +1,69 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://shibboleth.ebscohost.com">
-  <SPSSODescriptor WantAssertionsSigned="false" AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEZDCCA82gAwIBAgIQNTUPNPvSFFOtVKGg5okawzANBgkqhkiG9w0BAQUFADCB                                                                                                    
-ujEfMB0GA1UEChMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazEXMBUGA1UECxMOVmVy                                                                                                    
-aVNpZ24sIEluYy4xMzAxBgNVBAsTKlZlcmlTaWduIEludGVybmF0aW9uYWwgU2Vy                                                                                                    
-dmVyIENBIC0gQ2xhc3MgMzFJMEcGA1UECxNAd3d3LnZlcmlzaWduLmNvbS9DUFMg                                                                                                    
-SW5jb3JwLmJ5IFJlZi4gTElBQklMSVRZIExURC4oYyk5NyBWZXJpU2lnbjAeFw0w                                                                                                    
-OTAzMTcwMDAwMDBaFw0xMTA0MDQyMzU5NTlaMIGbMQswCQYDVQQGEwJVUzEWMBQG                                                                                                    
-A1UECBMNTWFzc2FjaHVzZXR0czEQMA4GA1UEBxQHSXBzd2ljaDEfMB0GA1UEChQW                                                                                                    
-RUJTQ08gSW5kdXN0cmllcywgSW5jLjEeMBwGA1UECxQVc2hpYmJvbGV0aDEuZXBu                                                                                                    
-ZXQuY29tMSEwHwYDVQQDFBhzaGliYm9sZXRoLmVic2NvaG9zdC5jb20wgZ8wDQYJ                                                                                                    
-KoZIhvcNAQEBBQADgY0AMIGJAoGBAKKCiIggktHn3Hhixq/YiEVnIccwPsfbvtNM                                                                                                    
-fjfdoAhRFHAmD9MsOOBKjCURLuZ6gXPTUpNUa/C1aP9+4UaIT1ipSndKPhxsMCgg                                                                                                    
-86o2msG1v6K5V/pGiya1aMR5s1HhmodB1ZryA+untXRV56sD2FnKjk2lwS4psAlo                                                                                                    
-IlXW9hFLAgMBAAGjggGGMIIBgjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFoDBGBgNV                                                                                                    
-HR8EPzA9MDugOaA3hjVodHRwOi8vY3JsLnZlcmlzaWduLmNvbS9DbGFzczNJbnRl                                                                                                    
-cm5hdGlvbmFsU2VydmVyLmNybDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCow                                                                                                    
-KAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwNAYDVR0l                                                                                                    
-BC0wKwYJYIZIAYb4QgQBBgorBgEEAYI3CgMDBggrBgEFBQcDAQYIKwYBBQUHAwIw                                                                                                    
-NAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC52ZXJpc2ln                                                                                                    
-bi5jb20wbgYIKwYBBQUHAQwEYjBgoV6gXDBaMFgwVhYJaW1hZ2UvZ2lmMCEwHzAH                                                                                                    
-BgUrDgMCGgQUS2u5KJYGDLvQUjibKaxLB4shBRgwJhYkaHR0cDovL2xvZ28udmVy                                                                                                    
-aXNpZ24uY29tL3ZzbG9nbzEuZ2lmMA0GCSqGSIb3DQEBBQUAA4GBAKFh9LRKkCh1                                                                                                    
-rZ/hhSaA8kQwoM4TV2QkBhU5BXcl1RZ5gmp3N5ZQJl3BlhfZQXSxSSGFWP3YGFW7
-jKRBlmOyRaP9tGXkuCqTu34Jwbjg+7n1TYnCyQV8NR5YO3Ir6Z+qUCkq5ZsVsonR
-oWySqfgtWSMHeY1vWcbPbprL6ZhRtzGl</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFIDCCBAigAwIBAgIQRKwcchAJVesvRaoyM06LijANBgkqhkiG9w0BAQUFADCB
-vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMt
-VmVyaVNpZ24gQ2xhc3MgMyBJbnRlcm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4X
-DTExMDQwMTAwMDAwMFoXDTEzMDQwMzIzNTk1OVowgZsxCzAJBgNVBAYTAlVTMRYw
-FAYDVQQIEw1NYXNzYWNodXNldHRzMRAwDgYDVQQHFAdJcHN3aWNoMR8wHQYDVQQK
-FBZFQlNDTyBJbmR1c3RyaWVzLCBJbmMuMR4wHAYDVQQLFBVzaGliYm9sZXRoMS5l
-cG5ldC5jb20xITAfBgNVBAMUGHNoaWJib2xldGguZWJzY29ob3N0LmNvbTCBnzAN
-BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApyJV+9wzY6I+kklwGc4bazyFGsxaAMbe
-n7lPDbCJ/5z3vjmB+gKJUSxovSvIunEc/8EwQ1XgC90Kwqcaxp+0bd3E3krXSgYk
-TxoXRk64ZALF6L0g7SpwikCDWjJ3Y31L83mxjAKHgemkGrjNKXptCaU2ONa6+52M
-KBoceXisJLsCAwEAAaOCAb8wggG7MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEEG
-A1UdHwQ6MDgwNqA0oDKGMGh0dHA6Ly9TVlJJbnRsLUczLWNybC52ZXJpc2lnbi5j
-b20vU1ZSSW50bEczLmNybDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYI
-KwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwNAYDVR0lBC0w
-KwYJYIZIAYb4QgQBBgorBgEEAYI3CgMDBggrBgEFBQcDAQYIKwYBBQUHAwIwcgYI
-KwYBBQUHAQEEZjBkMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC52ZXJpc2lnbi5j
-b20wPAYIKwYBBQUHMAKGMGh0dHA6Ly9TVlJJbnRsLUczLWFpYS52ZXJpc2lnbi5j
-b20vU1ZSSW50bEczLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFn
-ZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRw
-Oi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQAD
-ggEBAHBZHUV04SvJMdlt3Md5jc9X633k6wg9RULrZeai6odViYrmfmol8lh7I/Dd
-accxn2szmnhp0lKXaFNU33MOT/nnXGpe2dP4KD2dg7xW/ONf7/8UX5oKMcy9oxhu
-Iu+gIVKBbG6VnAO5ctHTE1w/wE7gw8Wvxkl+4Fysfd59fKzlhiaU9TGcTeroEUVd
-FKbURinepOdF2m0WyzcVLXFTLkyf9hu2Xv4A7zSC/vkWnpOT8K2+8dvh15S8n0mH
-fSXsKNn8tLSR10gYyD0sXGUYr03Upnjnkg69p4O//GRwf04NEV/NehxL2tvgjbO/
-WFUQmFDppVjUgYkCed/yDImwZoE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">epnet.com</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EBSCO Information Services</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ebsco.com/home/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Burns</GivenName>
-    <SurName>Ron</SurName>
-    <EmailAddress>rburns@epnet.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Flynn</GivenName>
-    <SurName>Dave</SurName>
-    <EmailAddress>dflynn@epnet.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>Customer Satisfaction</SurName>
-    <EmailAddress>eptech@epnet.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://shibboleth.ebscohost.com">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>shibboleth.ebscohost.com</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=shibboleth.ebscohost.com,OU=shibboleth1.epnet.com,O=EBSCO Industries\, Inc.,L=Ipswich,ST=Massachusetts,C=US</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFIDCCBAigAwIBAgIQRKwcchAJVesvRaoyM06LijANBgkqhkiG9w0BAQUFADCB
+vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMt
+VmVyaVNpZ24gQ2xhc3MgMyBJbnRlcm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4X
+DTExMDQwMTAwMDAwMFoXDTEzMDQwMzIzNTk1OVowgZsxCzAJBgNVBAYTAlVTMRYw
+FAYDVQQIEw1NYXNzYWNodXNldHRzMRAwDgYDVQQHFAdJcHN3aWNoMR8wHQYDVQQK
+FBZFQlNDTyBJbmR1c3RyaWVzLCBJbmMuMR4wHAYDVQQLFBVzaGliYm9sZXRoMS5l
+cG5ldC5jb20xITAfBgNVBAMUGHNoaWJib2xldGguZWJzY29ob3N0LmNvbTCBnzAN
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApyJV+9wzY6I+kklwGc4bazyFGsxaAMbe
+n7lPDbCJ/5z3vjmB+gKJUSxovSvIunEc/8EwQ1XgC90Kwqcaxp+0bd3E3krXSgYk
+TxoXRk64ZALF6L0g7SpwikCDWjJ3Y31L83mxjAKHgemkGrjNKXptCaU2ONa6+52M
+KBoceXisJLsCAwEAAaOCAb8wggG7MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEEG
+A1UdHwQ6MDgwNqA0oDKGMGh0dHA6Ly9TVlJJbnRsLUczLWNybC52ZXJpc2lnbi5j
+b20vU1ZSSW50bEczLmNybDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYI
+KwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwNAYDVR0lBC0w
+KwYJYIZIAYb4QgQBBgorBgEEAYI3CgMDBggrBgEFBQcDAQYIKwYBBQUHAwIwcgYI
+KwYBBQUHAQEEZjBkMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC52ZXJpc2lnbi5j
+b20wPAYIKwYBBQUHMAKGMGh0dHA6Ly9TVlJJbnRsLUczLWFpYS52ZXJpc2lnbi5j
+b20vU1ZSSW50bEczLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFn
+ZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRw
+Oi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQAD
+ggEBAHBZHUV04SvJMdlt3Md5jc9X633k6wg9RULrZeai6odViYrmfmol8lh7I/Dd
+accxn2szmnhp0lKXaFNU33MOT/nnXGpe2dP4KD2dg7xW/ONf7/8UX5oKMcy9oxhu
+Iu+gIVKBbG6VnAO5ctHTE1w/wE7gw8Wvxkl+4Fysfd59fKzlhiaU9TGcTeroEUVd
+FKbURinepOdF2m0WyzcVLXFTLkyf9hu2Xv4A7zSC/vkWnpOT8K2+8dvh15S8n0mH
+fSXsKNn8tLSR10gYyD0sXGUYr03Upnjnkg69p4O//GRwf04NEV/NehxL2tvgjbO/
+WFUQmFDppVjUgYkCed/yDImwZoE=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML/Artifact" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/POST" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/Artifact" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/ECP" index="5"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">EBSCO Publishing</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">EBSCO Information Services/EBSCO Publishing</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ebscohost.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:SurName>EBSCO Customer Satisfaction</md:SurName>
+    <md:EmailAddress>support@ebsco.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>EBSCO Shiboleth Admin</md:SurName>
+    <md:EmailAddress>shib-admin@ebscohost.com</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>EBSCO Shibboleth Tech</md:SurName>
+    <md:EmailAddress>shib-tech@ebscohost.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
\ No newline at end of file
-- 
cgit v1.2.3