Resolves SWAMIDOPS-8093 plus cleanup

2 files changed, 0 insertions, 40 deletions

diff --git a/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml b/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml
index 837d16ae..ca55784b 100644
--- a/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml
@@ -10,7 +10,6 @@
   </md:Extensions>
   <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>
-      <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://calypso.sau.kau.se/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="sv">Mondo Stockholms universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Mondo Stockholm University</mdui:DisplayName>
diff --git a/swamid-2.0/shibboleth.ebscohost.com.xml b/swamid-2.0/shibboleth.ebscohost.com.xml
index 53580558..d831b246 100644
--- a/swamid-2.0/shibboleth.ebscohost.com.xml
+++ b/swamid-2.0/shibboleth.ebscohost.com.xml
@@ -54,45 +54,6 @@ GXN6t76L1hd4Ant9KFynMa+RET9Mf26Fffpuhk09MVUJqcc=
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>To be removed SWAMIDOPS-8093</ds:KeyName>
-        <ds:KeyName>shibboleth.ebscohost.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.ebscohost.com,OU=Terms of use at www.verisign.com/rpa (c)05,O=EBSCO Publishing,L=Ipswich,ST=Massachusetts,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFizCCBHOgAwIBAgIQAUMqMY4GGE7RyypkxwmWTzANBgkqhkiG9w0BAQsFADCB
-vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMt
-VmVyaVNpZ24gQ2xhc3MgMyBJbnRlcm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4X
-DTEzMDMyNzAwMDAwMFoXDTE2MDMyNjIzNTk1OVowgaoxCzAJBgNVBAYTAlVTMRYw
-FAYDVQQIEw1NYXNzYWNodXNldHRzMRAwDgYDVQQHFAdJcHN3aWNoMRkwFwYDVQQK
-FBBFQlNDTyBQdWJsaXNoaW5nMTMwMQYDVQQLFCpUZXJtcyBvZiB1c2UgYXQgd3d3
-LnZlcmlzaWduLmNvbS9ycGEgKGMpMDUxITAfBgNVBAMUGHNoaWJib2xldGguZWJz
-Y29ob3N0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKUKHWUi
-hEa2qeQcooFqXBl/+AwmtcvIMdNroFBD2a8Z0r0HFYYxfsisIWxnJkfwkzYpuz/X
-jOy5kBHRDoFmdpPcEf65fLfdrhsUJ/oHnZ5mf3XNVZA3mrabZzWUI7WPTpR2SMB/
-1mgFthIZ/+4KSqAScC8OKbb7pkg6McxDw+c20RplQIwlayVezCn1DD3ynNYlXz26
-kqNMLhWwT4AGkEHD8H4w5QDbhYaAW7bo36syiOnU+FhGHzTCbjYCM+ZeolY56rjj
-UctR2S9HZQyXqeHQ/ksMW7PKgsuhsfuUqYmI+rvxoVe1jkquhCGYODQVnWJyiiFS
-qat+jjZyPeVHiRkCAwEAAaOCAZcwggGTMCMGA1UdEQQcMBqCGHNoaWJib2xldGgu
-ZWJzY29ob3N0LmNvbTAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIFoDBDBgNVHSAE
-PDA6MDgGCmCGSAGG+EUBBzYwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cudmVy
-aXNpZ24uY29tL2NwczBBBgNVHR8EOjA4MDagNKAyhjBodHRwOi8vU1ZSSW50bC1H
-My1jcmwudmVyaXNpZ24uY29tL1NWUkludGxHMy5jcmwwNAYDVR0lBC0wKwYIKwYB
-BQUHAwEGCCsGAQUFBwMCBglghkgBhvhCBAEGCisGAQQBgjcKAwMwHwYDVR0jBBgw
-FoAU15t82CKgFffdrV/OKZtYw7xGALUwcgYIKwYBBQUHAQEEZjBkMCQGCCsGAQUF
-BzABhhhodHRwOi8vb2NzcC52ZXJpc2lnbi5jb20wPAYIKwYBBQUHMAKGMGh0dHA6
-Ly9TVlJJbnRsLUczLWFpYS52ZXJpc2lnbi5jb20vU1ZSSW50bEczLmNlcjANBgkq
-hkiG9w0BAQsFAAOCAQEAZDAVJq/8qorA7GxHW+6rcjxUsjjlrPFIsE+xWWlrLepn
-GmSTrw9udap0Iq0kO+42bCd0aMvhRlTOZKW5+ra89vKoaH16hrpnYZMIxpwzre7X
-zxhkNnw1Mx1dE8Cmol47V8dPBTr8/U8HiJmH4YFCoQX+zMsdC40AcyhPIxgyo1ra
-Gki40IQJ/zFXkLpUO87nAYQy6WVJNFbtPB0ZWEhmaPWsmF51Dybw0HK0/2KkXLP9
-aefnD8KF5bcPuu2spKwU4CfbZdSPo0n6AiDTxucbJt/OMS5Uh50ZRiE8Oc8v1tt+
-8z47khf6dA5tT/OCeVEwt2z0O8VgNTQ4gcF2jbuK/A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
     <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>incommoncredsnew</ds:KeyName>