diff options
| author | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2015-08-11 13:07:03 +0200 |
| commit | b53085c02cf81855379eb460206ee5a45abc9163 (patch) | |
| tree | 5040fae56dcafd89049c7be8accdb89892e433b9 /swamid-interfederations-1.0/idp.oamk.fi.xml | |
| parent | e2781960bad421c50ee348dbf9300b8ea71d83b1 (diff) | |
| parent | d2d73bd1376647ea05d8b7d8fe7da971bc5c1d39 (diff) | |
resolve conflicts and merge
Diffstat (limited to 'swamid-interfederations-1.0/idp.oamk.fi.xml')
| -rw-r--r-- | swamid-interfederations-1.0/idp.oamk.fi.xml | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/swamid-interfederations-1.0/idp.oamk.fi.xml b/swamid-interfederations-1.0/idp.oamk.fi.xml deleted file mode 100644 index c2536800..00000000 --- a/swamid-interfederations-1.0/idp.oamk.fi.xml +++ /dev/null @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.oamk.fi/idp/shibboleth"> - <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> - <md:Extensions> - <shibmd:Scope regexp="false">oamk.fi</shibmd:Scope> - <saml:Attribute Name="tags"> - <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue> - <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue> - </saml:Attribute> - </md:Extensions> - <md:KeyDescriptor> - <ds:KeyInfo> - <ds:X509Data> - <ds:X509Certificate>MIIEJDCCAwygAwIBAgIRAJDZbv9JChO1v4c2PegLC3gwDQYJKoZIhvcNAQEFBQAwOTELMAkGA1UE -BhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTAeFw0xMjAx -MjQwOTA0MjNaFw0xNTAxMjMwOTA0MjNaMGoxCzAJBgNVBAYTAmZpMSkwJwYDVQQKDCBPdWx1biBz -ZXVkdW4ga291bHV0dXNrdW50YXlodHltYTEUMBIGA1UEAwwLaWRwLm9hbWsuZmkxGjAYBgkqhkiG -9w0BCQEWC25vY0BvYW1rLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz1pmmgwq -ddeiMWmthZP0W34WIKx4g5csiP/9p6DigzhNGn5+sZgsh7gb6FS1VtXWhwCFnCZCb/f0vm0AEqc2 -H9IQHTKPWWeM33S3uCOUBh1Jf7B9/3ysa70gZIdPFMkt+tX0Fd8hByeybu8FDyRwq95la1L3kPuQ -qX6do0Ks2kEmALSHwPP9aMfCB8Mr4hZx0YpECVheIS2NgISbCtvx5F9IvfUds7FNr5eVHbz5j1dm -gSalDjSGZN2HAwMw8EW91d314SYDtwdEC2PdvUCdbjdOnTXoHsftcDtS9PoWGzqZjLoptDjalc1z -j8Q3UUVyqXDX9HGwDq9p+ZdEaYokPwIDAQABo4H1MIHyMBMGA1UdIwQMMAqACEqgqliE0148MBkG -A1UdIAQSMBAwDgYMKwYBBAGCDwIDAQECMHIGA1UdHwRrMGkwZ6BloGOGYWxkYXA6Ly8xOTQuMjUy -LjEyNC4yNDE6Mzg5L2NuPVNvbmVyYSUyMENsYXNzMiUyMENBLG89U29uZXJhLGM9Rkk/Y2VydGlm -aWNhdGVyZXZvY2F0aW9ubGlzdDtiaW5hcnkwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC -MA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQUAuG1dJ173cm7/fePBi906Va3TdUwDQYJKoZIhvcN -AQEFBQADggEBAHSh0AVK4D+979981GuW1T+gEsp7vGBH1x9TiFPc8WI25UJ46eSf14wSzB+f3irK -T4s6CyvMJr2lZylvZF61orVJ/p2Ii21z8l/SEbk3ZbAT/vawdKU0dffypy4FhwWfTXADHAc9Li7z -K3YfRLJLUxYw8nt/3XjqiZ0q6CkEu7ZOZ163ew27oGv8TpNTjQAFh1ZX5xkKrwMhrhaykpO2Ww3E -Df2IYPvrPLtJYSHAn0aZ1UIn5dl8+/tFu9dpYn7p12/c9IBiBzyOUEn6uczxGlyf7NG35lscHuwR -Ry8FNbWVwbylLohU2Ms9XOSxHmexafsdLuZYGASMnCUQQgdzX/E=</ds:X509Certificate> - </ds:X509Data> - </ds:KeyInfo> - </md:KeyDescriptor> - <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat> - <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.oamk.fi/idp/profile/SAML2/Redirect/SSO"/> - </md:IDPSSODescriptor> - <md:Organization> - <md:OrganizationName xml:lang="fi">Oulun ammattikorkeakoulu</md:OrganizationName> - <md:OrganizationName xml:lang="en">Oulu University of Applied Sciences</md:OrganizationName> - <md:OrganizationName xml:lang="sv">Yrkeshögskolan i Uleåborg</md:OrganizationName> - <md:OrganizationDisplayName xml:lang="fi">Oulun ammattikorkeakoulu</md:OrganizationDisplayName> - <md:OrganizationDisplayName xml:lang="en">Oulu University of Applied Sciences</md:OrganizationDisplayName> - <md:OrganizationDisplayName xml:lang="sv">Yrkeshögskolan i Uleåborg</md:OrganizationDisplayName> - <md:OrganizationURL xml:lang="fi">http://www.oamk.fi</md:OrganizationURL> - <md:OrganizationURL xml:lang="en">http://www.oamk.fi</md:OrganizationURL> - <md:OrganizationURL xml:lang="sv">http://www.oamk.fi</md:OrganizationURL> - </md:Organization> - <md:ContactPerson contactType="technical"> - <md:GivenName>Panu</md:GivenName> - <md:SurName>Jylha</md:SurName> - <md:EmailAddress>mailto:haka_admin@oamk.fi</md:EmailAddress> - </md:ContactPerson> - <md:ContactPerson contactType="support"> - <md:GivenName>Panu</md:GivenName> - <md:SurName>Jylha</md:SurName> - <md:EmailAddress>mailto:haka_admin@oamk.fi</md:EmailAddress> - </md:ContactPerson> -</md:EntityDescriptor> |