From eebfaae70be1b9e7023673e46f8603b08232fb96 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Fri, 12 Oct 2012 15:44:51 +0200
Subject: resolves SWAMIDOPS-6678

---
 swamid-2.0/idp.kb.se.xml | 101 +++++++++++++++++++++++++++++++++++++++++++++++
 swamid-idp-2.0.mxml      |   1 +
 2 files changed, 102 insertions(+)
 create mode 100644 swamid-2.0/idp.kb.se.xml

diff --git a/swamid-2.0/idp.kb.se.xml b/swamid-2.0/idp.kb.se.xml
new file mode 100644
index 00000000..bf66378b
--- /dev/null
+++ b/swamid-2.0/idp.kb.se.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.kb.se/idp/shibboleth">
+
+    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+        <Extensions>
+            <shibmd:Scope regexp="false">kb.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIDEDCCAfigAwIBAgIVANtF15ZO6H7sUe14fLarTWN68i+6MA0GCSqGSIb3DQEB
+BQUAMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTAeFw0xMjA1MTUwODE2MTZaFw0xMzA1
+MTUwODE2MTZaMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAI5hTWyo9FvDJLFCHChRYSL1wZ7AsiL+RkBl+ath46EZ
+X4tcmMLg9T5qkveFqR5HQF8BK2+i3XcBmnXYqqCyYCUXc7oiKm83xrssgcP4xlAd
+L2H6rNBOaIG5sUqaU1nNb9BmL0Z8fJaamyX9+rqQSGj5JCGdwwR2CMi14bbJvz2W
+fQsGI8HHqTrAp/1RwG3dHsDXjQUHlaOAF3WWX+P/fYJepJPtHPVaurSllD00GQXf
+fswG4IBz+sdv/rId6ydAHMWc8M+oBVkVLzeOjcNOxrm6xpMjXhlsgJkQVcEVgP99
+MLY4FZ0RNVfzrSNB7WUbOnANFOyYEFdaZOAP6Ff6NS8CAwEAAaNZMFcwNgYDVR0R
+BC8wLYIJaWRwLmtiLnNlhiBodHRwczovL2lkcC5rYi5zZS9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUXOR57Uvaf5MNiogvbh+Pr2X35FUwDQYJKoZIhvcNAQEFBQAD
+ggEBABf3IMAt91LKUJoNU2VoSaHa+JYfjUkJp29lO1+GacoPrsbMkt4f09ALaqUB
+D3uTAP8IYWyxboESqHNXmk+rFKIYS4j1n6nx+Nomqs4bcY5qUcXOjTEUSKj67D3A
+eqmzb8ICVXHuejQqf1qA0nxSmDqO4ci13W7pF8Sy15J6WY+gi/qvwQLuCE7zD3qM
+FgBz0aBdSFpgIPo6Y7PLEyfutclknp+AE4S/Mzkxyrl72hoyWoct6fPuRVfROFxN
+eXhXEiHIleIlDkOMy3mgyjg2l2azS/K4Um12iEbCxONc8UvQipy2nzJ6XT8qp483
+HoPbenzIMS3KvKqUl64+5qwAZhM=
+
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+	<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+         
+        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kb.se/idp/profile/Shibboleth/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kb.se/idp/profile/SAML2/POST/SSO"/>
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kb.se/idp/profile/SAML2/Redirect/SSO"/>
+    </IDPSSODescriptor>
+
+    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+        <Extensions>
+            <shibmd:Scope regexp="false">kb.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIDEDCCAfigAwIBAgIVANtF15ZO6H7sUe14fLarTWN68i+6MA0GCSqGSIb3DQEB
+BQUAMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTAeFw0xMjA1MTUwODE2MTZaFw0xMzA1
+MTUwODE2MTZaMBQxEjAQBgNVBAMTCWlkcC5rYi5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAI5hTWyo9FvDJLFCHChRYSL1wZ7AsiL+RkBl+ath46EZ
+X4tcmMLg9T5qkveFqR5HQF8BK2+i3XcBmnXYqqCyYCUXc7oiKm83xrssgcP4xlAd
+L2H6rNBOaIG5sUqaU1nNb9BmL0Z8fJaamyX9+rqQSGj5JCGdwwR2CMi14bbJvz2W
+fQsGI8HHqTrAp/1RwG3dHsDXjQUHlaOAF3WWX+P/fYJepJPtHPVaurSllD00GQXf
+fswG4IBz+sdv/rId6ydAHMWc8M+oBVkVLzeOjcNOxrm6xpMjXhlsgJkQVcEVgP99
+MLY4FZ0RNVfzrSNB7WUbOnANFOyYEFdaZOAP6Ff6NS8CAwEAAaNZMFcwNgYDVR0R
+BC8wLYIJaWRwLmtiLnNlhiBodHRwczovL2lkcC5rYi5zZS9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUXOR57Uvaf5MNiogvbh+Pr2X35FUwDQYJKoZIhvcNAQEFBQAD
+ggEBABf3IMAt91LKUJoNU2VoSaHa+JYfjUkJp29lO1+GacoPrsbMkt4f09ALaqUB
+D3uTAP8IYWyxboESqHNXmk+rFKIYS4j1n6nx+Nomqs4bcY5qUcXOjTEUSKj67D3A
+eqmzb8ICVXHuejQqf1qA0nxSmDqO4ci13W7pF8Sy15J6WY+gi/qvwQLuCE7zD3qM
+FgBz0aBdSFpgIPo6Y7PLEyfutclknp+AE4S/Mzkxyrl72hoyWoct6fPuRVfROFxN
+eXhXEiHIleIlDkOMy3mgyjg2l2azS/K4Um12iEbCxONc8UvQipy2nzJ6XT8qp483
+HoPbenzIMS3KvKqUl64+5qwAZhM=
+
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+
+        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+         
+    </AttributeAuthorityDescriptor>
+    <Organization>
+    	<OrganizationName xml:lang="en">KB</OrganizationName>
+    	<OrganizationDisplayName xml:lang="en">Kungliga Bibliotek</OrganizationDisplayName>
+    	<OrganizationURL xml:lang="en">http://kb.se</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="technical">
+    	<Company>Kungliga Biblioteket</Company>
+    	<EmailAddress>swamid@kb.se</EmailAddress>
+    </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index 07d88be0..f40dc1aa 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -25,4 +25,5 @@
   <xi:include href="swamid-1.0/idp.bth.se.xml"/>
   <xi:include href="swamid-2.0/fds.hhs.se.xml"/>
   <xi:include href="swamid-1.0/samlidp.ki.se.xml"/>
+  <xi:include href="swamid-2.0/idp.kb.se.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3