summaryrefslogtreecommitdiff
path: root/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-08-11 13:07:03 +0200
committerLeif Johansson <leifj@sunet.se>2015-08-11 13:07:03 +0200
commitb53085c02cf81855379eb460206ee5a45abc9163 (patch)
tree5040fae56dcafd89049c7be8accdb89892e433b9 /swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml
parente2781960bad421c50ee348dbf9300b8ea71d83b1 (diff)
parentd2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff)
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml')
-rw-r--r--swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml84
1 files changed, 0 insertions, 84 deletions
diff --git a/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml
index 0beafd08..54ee9881 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml
@@ -27,48 +27,6 @@
<ds:KeyName>shibboleth-idp.uni-goettingen.de</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=shibboleth-idp.uni-goettingen.de,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIGKjCCBRKgAwIBAgIHF4B3Y7hUSjANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDA0MzAxMzI1MzlaFw0xOTA0Mjkx
-MzI1MzlaMIGUMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMSkwJwYDVQQDEyBzaGliYm9sZXRoLWlkcC51bmkt
-Z29ldHRpbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKaY
-OIuBhaYLZU4M7a9+ut9NChZQiFVxbIJ3jZPMMjtiulx5f6zLDK43QUI4G6MBy6l0
-EEToRvIP2Y39COyDFrJO6Bgk+gIfHvHpogXBZiOk7Nf4PbtV9Mi9uffE/B9fMLdZ
-+jwoHS8ZD8bRuTXuJRq9pHK8g5qrJfYwoWvU4Z+DvdU2hYEvtNm28rUDkyfbPUI2
-HruUKu4nJyc/wK1uwZSrGsXvJ8J/YouIVYEUl0LoEZg4zrXolh1yka9U+GwNY/a9
-Pyvsi8Qglsujvs/klWyDM8k7iGeVwpAVcEQasNo+enjBodt9PLeNnHcjtaqvlvXK
-G8NOjFrtm+nP38EzXXkCAwEAAaOCAmMwggJfMDkGA1UdIAQyMDAwEQYPKwYBBAGB
-rSGCLAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIw
-ADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0G
-A1UdDgQWBBS5CdgiLqqsrOWLdx1BYgQU/xu4vDAfBgNVHSMEGDAWgBQdvXPMbe5u
-HHRw2aMbOrqoJ9686zA5BgNVHREEMjAwgiBzaGliYm9sZXRoLWlkcC51bmktZ29l
-dHRpbmdlbi5kZYEMc2hpYkBnd2RnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NybC9j
-YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0
-aW5nZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
-CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
-U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0
-aW5nZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEARzs6ng60wS+YtUJeEpa6j2Ee
-kB2+JrXmoBO5ho8X4zUXIsnFU09yEL9Fp3uxmSZnUIKBKQbjmOqJlQj5a3jfuqhU
-lz4BJHDcFG7ine6xMmVR8HEo7vgYISyjqfIJn4aB9EO1Vi1uOY8WApPnDVlFpoHt
-khvLc8hFipt8dWc+LHalZibqdVsNppN0LZi/A2zDnq/oSBrFB49Rs9eaMHx7H95I
-bs3e0k+2d5H0rUK+/oKp9nWzCEt7wDpI2zPVzKyKbMwZ5/DIYtiF6WMZK1bM3zow
-NoiaiccK26vE3CCe+eBrIvz53bLP3zTxI0Z+80apvUj+JwIw0UL03626ma24wQ==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>shibboleth-idp.uni-goettingen.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=shibboleth-idp.uni-goettingen.de,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
<ds:X509Certificate>MIIGMjCCBRqgAwIBAgIHGcwhSXcahzANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
@@ -129,48 +87,6 @@ wDkP23Ru
<ds:KeyName>shibboleth-idp.uni-goettingen.de</ds:KeyName>
<ds:X509Data>
<ds:X509SubjectName>CN=shibboleth-idp.uni-goettingen.de,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
- <ds:X509Certificate>MIIGKjCCBRKgAwIBAgIHF4B3Y7hUSjANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDA0MzAxMzI1MzlaFw0xOTA0Mjkx
-MzI1MzlaMIGUMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMSkwJwYDVQQDEyBzaGliYm9sZXRoLWlkcC51bmkt
-Z29ldHRpbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKaY
-OIuBhaYLZU4M7a9+ut9NChZQiFVxbIJ3jZPMMjtiulx5f6zLDK43QUI4G6MBy6l0
-EEToRvIP2Y39COyDFrJO6Bgk+gIfHvHpogXBZiOk7Nf4PbtV9Mi9uffE/B9fMLdZ
-+jwoHS8ZD8bRuTXuJRq9pHK8g5qrJfYwoWvU4Z+DvdU2hYEvtNm28rUDkyfbPUI2
-HruUKu4nJyc/wK1uwZSrGsXvJ8J/YouIVYEUl0LoEZg4zrXolh1yka9U+GwNY/a9
-Pyvsi8Qglsujvs/klWyDM8k7iGeVwpAVcEQasNo+enjBodt9PLeNnHcjtaqvlvXK
-G8NOjFrtm+nP38EzXXkCAwEAAaOCAmMwggJfMDkGA1UdIAQyMDAwEQYPKwYBBAGB
-rSGCLAEBBAMBMBEGDysGAQQBga0hgiwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIw
-ADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0G
-A1UdDgQWBBS5CdgiLqqsrOWLdx1BYgQU/xu4vDAfBgNVHSMEGDAWgBQdvXPMbe5u
-HHRw2aMbOrqoJ9686zA5BgNVHREEMjAwgiBzaGliYm9sZXRoLWlkcC51bmktZ29l
-dHRpbmdlbi5kZYEMc2hpYkBnd2RnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NybC9j
-YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0
-aW5nZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
-CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
-U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0
-aW5nZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEARzs6ng60wS+YtUJeEpa6j2Ee
-kB2+JrXmoBO5ho8X4zUXIsnFU09yEL9Fp3uxmSZnUIKBKQbjmOqJlQj5a3jfuqhU
-lz4BJHDcFG7ine6xMmVR8HEo7vgYISyjqfIJn4aB9EO1Vi1uOY8WApPnDVlFpoHt
-khvLc8hFipt8dWc+LHalZibqdVsNppN0LZi/A2zDnq/oSBrFB49Rs9eaMHx7H95I
-bs3e0k+2d5H0rUK+/oKp9nWzCEt7wDpI2zPVzKyKbMwZ5/DIYtiF6WMZK1bM3zow
-NoiaiccK26vE3CCe+eBrIvz53bLP3zTxI0Z+80apvUj+JwIw0UL03626ma24wQ==
-</ds:X509Certificate>
- </ds:X509Data>
- </ds:KeyInfo>
- </md:KeyDescriptor>
- <md:KeyDescriptor>
- <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
- <ds:KeyName>shibboleth-idp.uni-goettingen.de</ds:KeyName>
- <ds:X509Data>
- <ds:X509SubjectName>CN=shibboleth-idp.uni-goettingen.de,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
<ds:X509Certificate>MIIGMjCCBRqgAwIBAgIHGcwhSXcahzANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl