Fixat till RegistrationInfo i 2 xml-filer + Makefilen för test2

2 files changed, 16 insertions, 6 deletions

diff --git a/swamid-2.0/se.timeedit.net-bth-staff-test.xml b/swamid-2.0/se.timeedit.net-bth-staff-test.xml
index 1ed98069..2b6159b2 100644
--- a/swamid-2.0/se.timeedit.net-bth-staff-test.xml
+++ b/swamid-2.0/se.timeedit.net-bth-staff-test.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://se.timeedit.net/bth-staff-test">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://se.timeedit.net/bth-staff-test">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
   <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="false">
     <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">TimeEdit för anställda vid Blekinge tekniska högskola testserver</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">TimeEdit for employees at BTH test server</mdui:DisplayName>
         <mdui:Description xml:lang="sv">TimeEdit, utvecklat av TimeEdit AB</mdui:Description>
@@ -10,7 +15,7 @@
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDcDCCAlgCCQDVKUGzGrt/2jANBgkqhkiG9w0BAQsFADB6MQswCQYDVQQGEwJTRTEYMBYGA1UE
 CAwPVmFzdHJhIGdvdGFsYW5kMRMwEQYDVQQHDApHb3RoZW5idXJnMRQwEgYDVQQKDAtUaW1lRWRp
diff --git a/swamid-2.0/se.timeedit.net-bth-stud-test.xml b/swamid-2.0/se.timeedit.net-bth-stud-test.xml
index 7ec2406f..640d4e98 100644
--- a/swamid-2.0/se.timeedit.net-bth-stud-test.xml
+++ b/swamid-2.0/se.timeedit.net-bth-stud-test.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://se.timeedit.net/bth-stud-test">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://se.timeedit.net/bth-stud-test">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
   <md:SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="false">
     <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">TimeEdit för studenter vid Blekinge tekniska högskola test server</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">TimeEdit for students at BTH test server</mdui:DisplayName>
         <mdui:Description xml:lang="sv">TimeEdit, utvecklat av TimeEdit AB</mdui:Description>
@@ -10,7 +15,7 @@
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDcDCCAlgCCQDVKUGzGrt/2jANBgkqhkiG9w0BAQsFADB6MQswCQYDVQQGEwJTRTEYMBYGA1UE
 CAwPVmFzdHJhIGdvdGFsYW5kMRMwEQYDVQQHDApHb3RoZW5idXJnMRQwEgYDVQQKDAtUaW1lRWRp