Merge branch 'master' of md-master.swamid.se:swamid-metadata

Conflicts:
	swamid-testing-idp-1.0.mxml

2 files changed, 189 insertions, 0 deletions

diff --git a/swamid-2.0/idp.hh.se-idp-shibboleth.xml b/swamid-2.0/idp.hh.se-idp-shibboleth.xml
new file mode 100644
index 00000000..c3ca5a4d
--- /dev/null
+++ b/swamid-2.0/idp.hh.se-idp-shibboleth.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     This is example metadata only. Do *NOT* supply it as is without review,
+     and do *NOT* provide it in real time to your partners.
+
+     This metadata is not dynamic - it will not change as your configuration changes.
+-->
+<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:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://idp.hh.se/idp/shibboleth">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmd:Scope regexp="false">hh.se</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">idp.hh.se Shib 3 Test</mdui:DisplayName>
+        <mdui:Description xml:lang="en">idp.hh.se Shib 3 Test</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEDCCAfigAwIBAgIVAJsBkOckapNcBBI8b7dWvImrhvIGMA0GCSqGSIb3DQEB
+CwUAMBQxEjAQBgNVBAMMCWlkcC5oaC5zZTAeFw0xNjAzMTQxMDIxMTVaFw0zNjAz
+MTQxMDIxMTVaMBQxEjAQBgNVBAMMCWlkcC5oaC5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKQZPY4ffk0ILD/HkgK1m3/A0brL1F5hYyNZwFZ+Yjzc
+5hslf1wkKD5eolCwXXioP6e8eK7wKjCTBJEvzvJCszlZQebw0cIXVu9EiwABgkCY
+EYOH00GSdQ2qM/fc+LQmOBydBJedueySkWN2A+IVPSLkRScQ2/uPGC0O/DmmMgHQ
+FkvGeqUE9xJ7s1XoNFKXs040nm99lhEzTNgLNx8G1otG7UUxOcexF/cAlsZsEjLJ
+ZEmwmdD9ECzZY2QA+9q3t1qi80k3+a7O6zr+WBH9FQfWa+k0rEeIriOkwfAg9tlq
+DEnEB+eAUmZ28AgwnaYDbzsZtI2YSH4QMPgtRmDyU+8CAwEAAaNZMFcwHQYDVR0O
+BBYEFAJTEdrIrB9bf0eOmm3A1+UjoawuMDYGA1UdEQQvMC2CCWlkcC5oaC5zZYYg
+aHR0cHM6Ly9pZHAuaGguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
+ggEBADREnV4Q0/naj76myeKUipMsN2VZLYx+K/Zi1aPIzGEieD9nBWB3HpsLarNI
+B5IInXqfeXSQQKMlTkc5lDPzFMPLFN89lXqpaIUXQTSNAYRwffnIWBodPl7okRtd
+oH074EEVvBi4ng8vx1UdGsQ3H44jqF/pHwG4cVH6pVi9eVYRo/OyjoV5QskgAv+R
+CPXQ5nPK2P2QzEkxQaVmZlyTGsLxQmFMFKkCxA2akT8kBwc3q2YHklkabvMWu6ZV
++a0KsOLFqva5pDxPAzfLGzWOvFdOh52dMkTg1FHPVl9S9Fgphj4fDw21rNcCoU7B
+Wj/p8G0pPieiOJ6Mgh4niOFi9oo=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDDzCCAfegAwIBAgIUMNLqLN3AFMdnKkcUCavqKY5Z1rUwDQYJKoZIhvcNAQEL
+BQAwFDESMBAGA1UEAwwJaWRwLmhoLnNlMB4XDTE2MDMxNDEwMjExNFoXDTM2MDMx
+NDEwMjExNFowFDESMBAGA1UEAwwJaWRwLmhoLnNlMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAi55P1kE9G13DcJi+Ax78CXKgbZ6+q94plXIo3/vT92RI
+i/UTH7Hl05EnrQRp9N9bmgCes2lG45aJHgyPUhK58nFChFubhKN0pe8G9tEaztPY
+XcoCnaKIzexEdwfQoLUz1YrUYcbddfrwH1ZodIDYq5HsKMfNW1bd5hHXuXCnCRYv
+byXfbjYzASZy0swUs2vhI9pgdjRTbiqDp8q7xa4SIk7thb2SvX3hBOB0BqhQ1Jn/
+7tCb930KvnhFyXoU5JPRheAVVoGx6/EJBltm+peFyN0uZ5vu9kHr+BWPhIeTF9bp
+NNTeTU6UqPvZSj2WGAHGqCyONNjxGHY0ABnX6V7ETQIDAQABo1kwVzAdBgNVHQ4E
+FgQUneSufQDUeoAhtTA9tc7eb1yG1WUwNgYDVR0RBC8wLYIJaWRwLmhoLnNlhiBo
+dHRwczovL2lkcC5oaC5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
+AQEAWEeKH4iKPD1bCt88NLQVSfYC2iqKqzyDVx1g01J2pNXlN1KNCVdVHPv1azSD
++UFDybpPC70pD3pCM9ahmKIfyhrTNew3M4YqLJmYluCW7zoqOD8VCEVKYAYGMtbF
+UZ+W4afoHQu/pwi2tRUO4r2Eb9WPY3q9jrH2snZ15sPWYb68FmQfBEnCmOJ19zi7
+BssPc57//UxkmPvVLUm34B+9mg/XeBp4WTofKBbcnQv0urSGKxZkQBUv1fzPpPXJ
+JtV+lqSk+kYDb84rW0BSqP0OL5z7Bp7rrCCwC1KeLpebKulJMozAxWqIPPS10ABB
+RgAusEoMo1w4CrwOMBfFqoCZ6g==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEDCCAfigAwIBAgIVAITxucLq7luivXgcQ3B89B7PSw8ZMA0GCSqGSIb3DQEB
+CwUAMBQxEjAQBgNVBAMMCWlkcC5oaC5zZTAeFw0xNjAzMTQxMDIxMTVaFw0zNjAz
+MTQxMDIxMTVaMBQxEjAQBgNVBAMMCWlkcC5oaC5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAN+2P9ydGsvYJ8EGP5tYFOMG2bm3jNe5X4Bp4WhpW/Wp
+Ljjy1G0hk5N6jGDI+wYnKv98k4sbq9lDnJjogeOkb48BAuLMJpRTxtBAkaymEe1v
+cKbogIyweBr1uCcpjo5YESiSM143JCBJDFqgvWy0KF/nwcUcBNQdhHksAm9W73Nh
+5BwcUUFs5ZPeksh6ZwjJiUNN0Q4JjLCy+C0Mj/lYdoR0OFPvYTIob7At/eFdJaFE
+674at26mQpNMYNF5OhzgxjS4sKdz30fyqxpCAd0YXHxvQmEuV2cuPC3hRngAan5q
+1V0JTntvkWfw5eDNUQbGYtbfgi+JZ4diqB0pamVfdUsCAwEAAaNZMFcwHQYDVR0O
+BBYEFMVOc9dqf73Mw2AibdRxxwwMsV5IMDYGA1UdEQQvMC2CCWlkcC5oaC5zZYYg
+aHR0cHM6Ly9pZHAuaGguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
+ggEBAJ/wd24lDHPNp9HFjTM/MQUKaXF7hRHVFmbS2y861uKJNDoXyTsYvw34Yp+c
+KkB7pyc0HSEuIV1h2SuYJFngDrTPjmrcINEifJEWjAAqfSbamRBUxfErrSST6kjQ
+jZnK4OYn3wwLvUdN6Oei50JoOctm+2ozRoEvxJzXCHzbgXhg5QT0AvuXDwazrpFf
+Jm9frku2giBQQfFJ6/2gIdl4GjTQbynSuOoN5JiWfcM5vFhSTC1v/QG/GBmQ2qzy
+9qyt59TmyF+x55Que3hWuTVL/KqR1uGgUdExVpSPZX7d35mh1KAI/ZFTZFfzqgye
+YpNyRSuI6t4ZdyVTy4B2kXQtVfo=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <!--
+        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hh.se/idp/profile/SAML2/Redirect/SLO"/>
+        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hh.se/idp/profile/SAML2/POST/SLO"/>
+        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hh.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+        -->
+    <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.hh.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hh.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hh.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">hh.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEDCCAfigAwIBAgIVAJsBkOckapNcBBI8b7dWvImrhvIGMA0GCSqGSIb3DQEB
+CwUAMBQxEjAQBgNVBAMMCWlkcC5oaC5zZTAeFw0xNjAzMTQxMDIxMTVaFw0zNjAz
+MTQxMDIxMTVaMBQxEjAQBgNVBAMMCWlkcC5oaC5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKQZPY4ffk0ILD/HkgK1m3/A0brL1F5hYyNZwFZ+Yjzc
+5hslf1wkKD5eolCwXXioP6e8eK7wKjCTBJEvzvJCszlZQebw0cIXVu9EiwABgkCY
+EYOH00GSdQ2qM/fc+LQmOBydBJedueySkWN2A+IVPSLkRScQ2/uPGC0O/DmmMgHQ
+FkvGeqUE9xJ7s1XoNFKXs040nm99lhEzTNgLNx8G1otG7UUxOcexF/cAlsZsEjLJ
+ZEmwmdD9ECzZY2QA+9q3t1qi80k3+a7O6zr+WBH9FQfWa+k0rEeIriOkwfAg9tlq
+DEnEB+eAUmZ28AgwnaYDbzsZtI2YSH4QMPgtRmDyU+8CAwEAAaNZMFcwHQYDVR0O
+BBYEFAJTEdrIrB9bf0eOmm3A1+UjoawuMDYGA1UdEQQvMC2CCWlkcC5oaC5zZYYg
+aHR0cHM6Ly9pZHAuaGguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
+ggEBADREnV4Q0/naj76myeKUipMsN2VZLYx+K/Zi1aPIzGEieD9nBWB3HpsLarNI
+B5IInXqfeXSQQKMlTkc5lDPzFMPLFN89lXqpaIUXQTSNAYRwffnIWBodPl7okRtd
+oH074EEVvBi4ng8vx1UdGsQ3H44jqF/pHwG4cVH6pVi9eVYRo/OyjoV5QskgAv+R
+CPXQ5nPK2P2QzEkxQaVmZlyTGsLxQmFMFKkCxA2akT8kBwc3q2YHklkabvMWu6ZV
++a0KsOLFqva5pDxPAzfLGzWOvFdOh52dMkTg1FHPVl9S9Fgphj4fDw21rNcCoU7B
+Wj/p8G0pPieiOJ6Mgh4niOFi9oo=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDDzCCAfegAwIBAgIUMNLqLN3AFMdnKkcUCavqKY5Z1rUwDQYJKoZIhvcNAQEL
+BQAwFDESMBAGA1UEAwwJaWRwLmhoLnNlMB4XDTE2MDMxNDEwMjExNFoXDTM2MDMx
+NDEwMjExNFowFDESMBAGA1UEAwwJaWRwLmhoLnNlMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAi55P1kE9G13DcJi+Ax78CXKgbZ6+q94plXIo3/vT92RI
+i/UTH7Hl05EnrQRp9N9bmgCes2lG45aJHgyPUhK58nFChFubhKN0pe8G9tEaztPY
+XcoCnaKIzexEdwfQoLUz1YrUYcbddfrwH1ZodIDYq5HsKMfNW1bd5hHXuXCnCRYv
+byXfbjYzASZy0swUs2vhI9pgdjRTbiqDp8q7xa4SIk7thb2SvX3hBOB0BqhQ1Jn/
+7tCb930KvnhFyXoU5JPRheAVVoGx6/EJBltm+peFyN0uZ5vu9kHr+BWPhIeTF9bp
+NNTeTU6UqPvZSj2WGAHGqCyONNjxGHY0ABnX6V7ETQIDAQABo1kwVzAdBgNVHQ4E
+FgQUneSufQDUeoAhtTA9tc7eb1yG1WUwNgYDVR0RBC8wLYIJaWRwLmhoLnNlhiBo
+dHRwczovL2lkcC5oaC5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
+AQEAWEeKH4iKPD1bCt88NLQVSfYC2iqKqzyDVx1g01J2pNXlN1KNCVdVHPv1azSD
++UFDybpPC70pD3pCM9ahmKIfyhrTNew3M4YqLJmYluCW7zoqOD8VCEVKYAYGMtbF
+UZ+W4afoHQu/pwi2tRUO4r2Eb9WPY3q9jrH2snZ15sPWYb68FmQfBEnCmOJ19zi7
+BssPc57//UxkmPvVLUm34B+9mg/XeBp4WTofKBbcnQv0urSGKxZkQBUv1fzPpPXJ
+JtV+lqSk+kYDb84rW0BSqP0OL5z7Bp7rrCCwC1KeLpebKulJMozAxWqIPPS10ABB
+RgAusEoMo1w4CrwOMBfFqoCZ6g==
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEDCCAfigAwIBAgIVAITxucLq7luivXgcQ3B89B7PSw8ZMA0GCSqGSIb3DQEB
+CwUAMBQxEjAQBgNVBAMMCWlkcC5oaC5zZTAeFw0xNjAzMTQxMDIxMTVaFw0zNjAz
+MTQxMDIxMTVaMBQxEjAQBgNVBAMMCWlkcC5oaC5zZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAN+2P9ydGsvYJ8EGP5tYFOMG2bm3jNe5X4Bp4WhpW/Wp
+Ljjy1G0hk5N6jGDI+wYnKv98k4sbq9lDnJjogeOkb48BAuLMJpRTxtBAkaymEe1v
+cKbogIyweBr1uCcpjo5YESiSM143JCBJDFqgvWy0KF/nwcUcBNQdhHksAm9W73Nh
+5BwcUUFs5ZPeksh6ZwjJiUNN0Q4JjLCy+C0Mj/lYdoR0OFPvYTIob7At/eFdJaFE
+674at26mQpNMYNF5OhzgxjS4sKdz30fyqxpCAd0YXHxvQmEuV2cuPC3hRngAan5q
+1V0JTntvkWfw5eDNUQbGYtbfgi+JZ4diqB0pamVfdUsCAwEAAaNZMFcwHQYDVR0O
+BBYEFMVOc9dqf73Mw2AibdRxxwwMsV5IMDYGA1UdEQQvMC2CCWlkcC5oaC5zZYYg
+aHR0cHM6Ly9pZHAuaGguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
+ggEBAJ/wd24lDHPNp9HFjTM/MQUKaXF7hRHVFmbS2y861uKJNDoXyTsYvw34Yp+c
+KkB7pyc0HSEuIV1h2SuYJFngDrTPjmrcINEifJEWjAAqfSbamRBUxfErrSST6kjQ
+jZnK4OYn3wwLvUdN6Oei50JoOctm+2ozRoEvxJzXCHzbgXhg5QT0AvuXDwazrpFf
+Jm9frku2giBQQfFJ6/2gIdl4GjTQbynSuOoN5JiWfcM5vFhSTC1v/QG/GBmQ2qzy
+9qyt59TmyF+x55Que3hWuTVL/KqR1uGgUdExVpSPZX7d35mh1KAI/ZFTZFfzqgye
+YpNyRSuI6t4ZdyVTy4B2kXQtVfo=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
+    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
+  </AttributeAuthorityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index fee251b0..2dea2812 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -54,4 +54,5 @@
   <xi:include href="swamid-2.0/testidp.lu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp2.bth.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp.hh.se-idp-shibboleth.xml"/>
 </EntitiesDescriptor>