From f4759e7eb43827ecd3c9b9c04595f5271e73de7f Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 16 Feb 2016 10:43:09 +0100
Subject: rkh metadata and drop old metadata

---
 ...s-proxy-test.swamid.se-10000-saml2idp-proxy.xml | 68 ----------------------
 ...kh.adfs-proxy-test.swamid.se-saml2idp-proxy.xml | 23 ++++++++
 swamid-sp-2.0.mxml                                 |  2 +-
 3 files changed, 24 insertions(+), 69 deletions(-)
 delete mode 100644 swamid-2.0/adfs-proxy-test.swamid.se-10000-saml2idp-proxy.xml
 create mode 100644 swamid-2.0/rkh.adfs-proxy-test.swamid.se-saml2idp-proxy.xml

diff --git a/swamid-2.0/adfs-proxy-test.swamid.se-10000-saml2idp-proxy.xml b/swamid-2.0/adfs-proxy-test.swamid.se-10000-saml2idp-proxy.xml
deleted file mode 100644
index f48296bb..00000000
--- a/swamid-2.0/adfs-proxy-test.swamid.se-10000-saml2idp-proxy.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://adfs-proxy-test.swamid.se/Saml2IDP/proxy.xml">
-  <ns0:Extensions>
-    <ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
-    <ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
-    <ns1:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <ns1:SigningMethod Algorithm="http,//www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <ns1:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
-    <ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
-    <ns1:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
-    <ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-  </ns0:Extensions>
-  <ns0:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:KeyDescriptor use="signing">
-      <ns2:KeyInfo>
-        <ns2:X509Data>
-          <ns2:X509Certificate>MIIEBjCCAu6gAwIBAgIJANwxpCjfD5fLMA0GCSqGSIb3DQEBBQUAMF8xCzAJBgNV
-BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQxGDAWBgNVBAMTD2xva2kuaXRzLnVtdS5zZTAeFw0xNTEy
-MTAxNDMzNTlaFw0yNTEyMDcxNDMzNTlaMF8xCzAJBgNVBAYTAkFVMRMwEQYDVQQI
-EwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQx
-GDAWBgNVBAMTD2xva2kuaXRzLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAOCyQM982ZWJRI6SJ5nPCX2TZATHJfpsWHzXRQpt/vrtmYkvaWKL
-BqSzNhJkiPRrZl4xtJQXtDfUH8ZOnQU0T4IivOuvlP4pytlTYzE1WjSPZY6UJCw5
-MfGnZ+l5vdYv4XiR2dS+L3IYfQeX+pAh61LHXayxMdfNdXRfV+/pnp93qhW5ZjMn
-K076hicbfg4XCXk3Lw7PoJPNWWgcKCwddHMHFSpIhBgp5LtNiooT5hfHypbTSHaQ
-apVlScuzXlMAkeH9srhEO0BDT1Rq0dScMuttF1eY/h+T1N9Vha1dVu1WgynfboaC
-8BUBLM0KoxcguRuGD2/ruFaOCWCMXAv54DcCAwEAAaOBxDCBwTAdBgNVHQ4EFgQU
-as56pDo5FS+9I7xnVXOVp5De8H0wgZEGA1UdIwSBiTCBhoAUas56pDo5FS+9I7xn
-VXOVp5De8H2hY6RhMF8xCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRl
-MSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxGDAWBgNVBAMTD2xv
-a2kuaXRzLnVtdS5zZYIJANwxpCjfD5fLMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
-AQEFBQADggEBAAERtzf3jrf0VnwbGr0iOoJUFcuanAObMG6PM20Y/PBdPi0XBnlH
-ReXHkGnMiY44cdyQByJH/HRTIGPmNEwUPtzvsLcwpxWz6sAogQlXhgI6ZHVaTt3T
-XBJGBi+cuG4ggRZSvcmJLwJ1EpwWXNVekiIEQbW+mlwARLbM5N7btQRA3DWofbIx
-JLn4HckD/n5dq5ueniyDqDgc2o1V2/G/zpEg90lIN7gsSOOqsbttMZFvGq3m+t3E
-KxjpGx+7PhkGMf9zCVrXXztaqDyZjeNa/rpADj+kU6KudZ9eESvdppCBR0EiROm0
-8xZOMdYU6Sc6SJVa/W48bqJsv95pCZM6joU=
-</ns2:X509Certificate>
-        </ns2:X509Data>
-      </ns2:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs-proxy-test.swamid.se:10000/Saml2/sso/post"/>
-    <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs-proxy-test.swamid.se:10000/Saml2/sso/redirect"/>
-  </ns0:IDPSSODescriptor>
-  <ns0:Organization>
-    <ns0:OrganizationName xml:lang="en">Rebecka Identities Org.</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">Rebecka Identities</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">http://www.example.com</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson contactType="technical">
-    <ns0:GivenName>Technical</ns0:GivenName>
-    <ns0:EmailAddress>technical@example.com</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson contactType="support">
-    <ns0:GivenName>Support</ns0:GivenName>
-    <ns0:EmailAddress>support@example.com</ns0:EmailAddress>
-  </ns0:ContactPerson>
-</ns0:EntityDescriptor>
diff --git a/swamid-2.0/rkh.adfs-proxy-test.swamid.se-saml2idp-proxy.xml b/swamid-2.0/rkh.adfs-proxy-test.swamid.se-saml2idp-proxy.xml
new file mode 100644
index 00000000..fbdc407e
--- /dev/null
+++ b/swamid-2.0/rkh.adfs-proxy-test.swamid.se-saml2idp-proxy.xml
@@ -0,0 +1,23 @@
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://rkh.adfs-proxy-test.swamid.se/Saml2IDP/proxy.xml"><ns0:Extensions><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5" /><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160" /><ns1:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224" /><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384" /><ns1:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512" /><ns1:SigningMethod Algorithm="http,//www.w3.org/2000/09/xmldsig#dsa-sha1" /><ns1:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160" /><ns1:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384" /><ns1:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512" /></ns0:Extensions><ns0:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><ns0:KeyDescriptor use="signing"><ns2:KeyInfo><ns2:X509Data><ns2:X509Certificate>MIIEBjCCAu6gAwIBAgIJANwxpCjfD5fLMA0GCSqGSIb3DQEBBQUAMF8xCzAJBgNV
+BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQxGDAWBgNVBAMTD2xva2kuaXRzLnVtdS5zZTAeFw0xNTEy
+MTAxNDMzNTlaFw0yNTEyMDcxNDMzNTlaMF8xCzAJBgNVBAYTAkFVMRMwEQYDVQQI
+EwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQx
+GDAWBgNVBAMTD2xva2kuaXRzLnVtdS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAOCyQM982ZWJRI6SJ5nPCX2TZATHJfpsWHzXRQpt/vrtmYkvaWKL
+BqSzNhJkiPRrZl4xtJQXtDfUH8ZOnQU0T4IivOuvlP4pytlTYzE1WjSPZY6UJCw5
+MfGnZ+l5vdYv4XiR2dS+L3IYfQeX+pAh61LHXayxMdfNdXRfV+/pnp93qhW5ZjMn
+K076hicbfg4XCXk3Lw7PoJPNWWgcKCwddHMHFSpIhBgp5LtNiooT5hfHypbTSHaQ
+apVlScuzXlMAkeH9srhEO0BDT1Rq0dScMuttF1eY/h+T1N9Vha1dVu1WgynfboaC
+8BUBLM0KoxcguRuGD2/ruFaOCWCMXAv54DcCAwEAAaOBxDCBwTAdBgNVHQ4EFgQU
+as56pDo5FS+9I7xnVXOVp5De8H0wgZEGA1UdIwSBiTCBhoAUas56pDo5FS+9I7xn
+VXOVp5De8H2hY6RhMF8xCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRl
+MSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxGDAWBgNVBAMTD2xv
+a2kuaXRzLnVtdS5zZYIJANwxpCjfD5fLMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
+AQEFBQADggEBAAERtzf3jrf0VnwbGr0iOoJUFcuanAObMG6PM20Y/PBdPi0XBnlH
+ReXHkGnMiY44cdyQByJH/HRTIGPmNEwUPtzvsLcwpxWz6sAogQlXhgI6ZHVaTt3T
+XBJGBi+cuG4ggRZSvcmJLwJ1EpwWXNVekiIEQbW+mlwARLbM5N7btQRA3DWofbIx
+JLn4HckD/n5dq5ueniyDqDgc2o1V2/G/zpEg90lIN7gsSOOqsbttMZFvGq3m+t3E
+KxjpGx+7PhkGMf9zCVrXXztaqDyZjeNa/rpADj+kU6KudZ9eESvdppCBR0EiROm0
+8xZOMdYU6Sc6SJVa/W48bqJsv95pCZM6joU=
+</ns2:X509Certificate></ns2:X509Data></ns2:KeyInfo></ns0:KeyDescriptor><ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat><ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs-proxy-test.swamid.se:10000/Saml2/sso/post" /><ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs-proxy-test.swamid.se:10000/Saml2/sso/redirect" /></ns0:IDPSSODescriptor><ns0:Organization><ns0:OrganizationName xml:lang="en">RKH ADFS Test (IdP)</ns0:OrganizationName><ns0:OrganizationDisplayName xml:lang="en">RKH ADFS Test</ns0:OrganizationDisplayName><ns0:OrganizationURL xml:lang="en">https://example.com</ns0:OrganizationURL></ns0:Organization><ns0:ContactPerson contactType="technical"><ns0:GivenName>Technical</ns0:GivenName><ns0:EmailAddress>technical@example.com</ns0:EmailAddress></ns0:ContactPerson><ns0:ContactPerson contactType="support"><ns0:GivenName>Support</ns0:GivenName><ns0:EmailAddress>support@example.com</ns0:EmailAddress></ns0:ContactPerson></ns0:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 71935e13..3c39f5ac 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -489,5 +489,5 @@
   <xi:include href="swamid-2.0/play.bth.se.xml"/>
   <xi:include href="swamid-2.0/test.play.bth.se.xml"/>
   <xi:include href="swamid-2.0/keystone.lab.cloud.ipnett.net-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/adfs-proxy-test.swamid.se-10000-saml2idp-proxy.xml"/>
+  <xi:include href="swamid-2.0/rkh.adfs-proxy-test.swamid.se-saml2idp-proxy.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3