hv new IdP

git-svn-id: svn+ssh://svn.it.su.se/svn/swamid-metadata/trunk@337 0878fbc5-a6f2-46f6-b174-cb7b08c221d1

3 files changed, 38 insertions, 1 deletions

diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index 43c656fc..c2cede4d 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -132,6 +132,7 @@
   <xi:include href="swamid-1.0/kib.ki.se.xml"/>
   <xi:include href="swamid-1.0/beta.lobber.se.xml"/>
   <xi:include href="swamid-1.0/idp.his.se.xml"/>
-  <xi:include href="swamid-1.0/users.hv.se.xml"/>
+  <xi:include href="swamid-1.0/users.hv.se-shib1.xml"/>
+  <xi:include href="swamid-1.0/users.hv.se-saml2.xml"/>
   <xi:include href="swamid-1.0/www07test.sub.su.se.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-1.0/users.hv.se.xml b/swamid-1.0/users.hv.se-saml2.xml
index 868d068c..36911db9 100644
--- a/swamid-1.0/users.hv.se.xml
+++ b/swamid-1.0/users.hv.se-saml2.xml
@@ -19,6 +19,11 @@
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://users.hv.se/login/saml2/idp/SSOService.php"/>
   </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">HV</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Högskolan i Väst (SAML2)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.hv.se</OrganizationURL>
+  </Organization>
   <ContactPerson contactType="technical">
     <GivenName>Magnus</GivenName>
     <SurName>Andersson</SurName>
diff --git a/swamid-1.0/users.hv.se-shib1.xml b/swamid-1.0/users.hv.se-shib1.xml
new file mode 100644
index 00000000..7cc969f2
--- /dev/null
+++ b/swamid-1.0/users.hv.se-shib1.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://users.hv.se/login/shib13/idp/metadata.php">
+  <IDPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" 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>MIICgTCCAeoCCQCbOlrWDdX7FTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xGDAWBgNVBAgTD0FuZHJlYXMgU29sYmVyZzEMMAoGA1UEBxMDRm9vMRAwDgYDVQQKEwdVTklORVRUMRgwFgYDVQQDEw9mZWlkZS5lcmxhbmcubm8xITAfBgkqhkiG9w0BCQEWEmFuZHJlYXNAdW5pbmV0dC5ubzAeFw0wNzA2MTUxMjAxMzVaFw0wNzA4MTQxMjAxMzVaMIGEMQswCQYDVQQGEwJOTzEYMBYGA1UECBMPQW5kcmVhcyBTb2xiZXJnMQwwCgYDVQQHEwNGb28xEDAOBgNVBAoTB1VOSU5FVFQxGDAWBgNVBAMTD2ZlaWRlLmVybGFuZy5ubzEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDivbhR7P516x/S3BqKxupQe0LONoliupiBOesCO3SHbDrl3+q9IbfnfmE04rNuMcPsIxB161TdDpIesLCn7c8aPHISKOtPlAeTZSnb8QAu7aRjZq3+PbrP5uW3TcfCGPtKTytHOge/OlJbo078dVhXQ14d1EDwXJW1rRXuUt4C8QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBACDVfp86HObqY+e8BUoWQ9+VMQx1ASDohBjwOsg2WykUqRXF+dLfcUH9dWR63CtZIKFDbStNomPnQz7nbK+onygwBspVEbnHuUihZq3ZUdmumQqCw4Uvs/1Uvq3orOo/WJVhTyvLgFVK2QarQ4/67OZfHd7R+POBXhophSMv1ZOo</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIICgTCCAeoCCQCbOlrWDdX7FTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTk8xGDAWBgNVBAgTD0FuZHJlYXMgU29sYmVyZzEMMAoGA1UEBxMDRm9vMRAwDgYDVQQKEwdVTklORVRUMRgwFgYDVQQDEw9mZWlkZS5lcmxhbmcubm8xITAfBgkqhkiG9w0BCQEWEmFuZHJlYXNAdW5pbmV0dC5ubzAeFw0wNzA2MTUxMjAxMzVaFw0wNzA4MTQxMjAxMzVaMIGEMQswCQYDVQQGEwJOTzEYMBYGA1UECBMPQW5kcmVhcyBTb2xiZXJnMQwwCgYDVQQHEwNGb28xEDAOBgNVBAoTB1VOSU5FVFQxGDAWBgNVBAMTD2ZlaWRlLmVybGFuZy5ubzEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDivbhR7P516x/S3BqKxupQe0LONoliupiBOesCO3SHbDrl3+q9IbfnfmE04rNuMcPsIxB161TdDpIesLCn7c8aPHISKOtPlAeTZSnb8QAu7aRjZq3+PbrP5uW3TcfCGPtKTytHOge/OlJbo078dVhXQ14d1EDwXJW1rRXuUt4C8QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBACDVfp86HObqY+e8BUoWQ9+VMQx1ASDohBjwOsg2WykUqRXF+dLfcUH9dWR63CtZIKFDbStNomPnQz7nbK+onygwBspVEbnHuUihZq3ZUdmumQqCw4Uvs/1Uvq3orOo/WJVhTyvLgFVK2QarQ4/67OZfHd7R+POBXhophSMv1ZOo</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://users.hv.se/login/shib13/idp/SSOService.php"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">HV</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Högskolan i Väst (SAML1)</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.hv.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Magnus</GivenName>
+    <SurName>Andersson</SurName>
+    <EmailAddress>Magnus.Andersson@hv.se</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>