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

2 files changed, 42 insertions, 7 deletions

diff --git a/nya-1.0-testing.mxml b/nya-1.0-testing.mxml
index 5d2e658f..bb1ce901 100644
--- a/nya-1.0-testing.mxml
+++ b/nya-1.0-testing.mxml
@@ -7,7 +7,6 @@
   <xi:include href="nya-1.0/shibboleth.testc.ladok.umu.se.xml"/>
   <xi:include href="nya-1.0/shibboleth.testb.antagning.se.xml"/>
   <xi:include href="nya-1.0/shibboleth.testa.antagning.se.xml"/>
-  <xi:include href="nya-workshop/130.243.0.28.xml"/>
   <xi:include href="nya-workshop/bauta.umdc.umu.se.xml"/>
   <xi:include href="nya-workshop/swamid.wayf.ruc.dk.xml"/>
   <xi:include href="nya-workshop/users.hv.se.xml"/>
@@ -32,4 +31,5 @@
   <xi:include href="nya-workshop/130.229.16.238.xml"/>
   <xi:include href="nya-workshop/login-dev.du.se.xml"/>
   <xi:include href="nya-workshop/130.229.16.240.xml"/>
+  <xi:include href="nya-workshop/vm-shibb-03.hig.se.xml"/>
 </EntitiesDescriptor>
diff --git a/nya-workshop/130.243.0.28.xml b/nya-workshop/vm-shibb-03.hig.se.xml
index aa4fcccf..5f15869c 100644
--- a/nya-workshop/130.243.0.28.xml
+++ b/nya-workshop/vm-shibb-03.hig.se.xml
@@ -1,24 +1,59 @@
-<?xml version="1.0"?>
+
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vm-shibb-03.hig.se">
+
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vm-shibb-03.hig.se/Shibboleth.sso/DS" index="1"/>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="https://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>vm-shibb-03.hig.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=vm-shibb-03.hig.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDETCCAfmgAwIBAgIJAMPsse/uymyzMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNVBAMTEnZtLXNoaWJiLTAzLmhpZy5zZTAeFw0wOTA0MjEwODUzMjVaFw0xOTA0MTkwODUzMjVaMB0xGzAZBgNVBAMTEnZtLXNoaWJiLTAzLmhpZy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALkIlu3cZmAeO7rDkhnqy3KIXKHT0rybuGwSF9H2Fimtk2qO/w10PPVYOy1aseHJtNShuDBDeLlosIGwO9bOMBU8mpEmVh9NpibrBfm/mLzu2zhlJnx6bvbei0W8bkdHHYz/0wsARqbh5lHwRRoUh5kD+edtIPBEKnNtBmXy7TE1gOFfrYXXZUelXYrS9w/uJ1B2tDS5UzCWG2dXGWXxfDOOkdOd/X6tkT6B1DN6i9eEJ1jzTIpGVv5JfYZaxTjUVwpQjEsjo4QnYXOmqaN/CZwPeTdHorVzjxpwpxa/dLLWsUe2NcpzDQ10ptMZXHY0S6ohFGrhpaSh8EXKS/yj1p0CAwEAAaNUMFIwMQYDVR0RBCowKIISdm0tc2hpYmItMDMuaGlnLnNlhhJ2bS1zaGliYi0wMy5oaWcuc2UwHQYDVR0OBBYEFPkCYHeh+f8+8SRHVpqxdzvvbCxkMA0GCSqGSIb3DQEBBQUAA4IBAQBC+48YO32cmDwgt0MpPIeywBwwSbTDGKaCffiWzQhex/jUWRJgBy+cfRmBpdXp/P0CML8sjW3LjBbOcFLpnMeYdE4ITOE+4S9R78BOCcW/4FU4qlCbaLrMG098sJOkzDf23yb7BInk+gk+8FCSXmfjmuKM4kawQFvuXtVilq4XWqixYCEmqcfxZKp2X2o5PFotqMRsMX7X0q3IBK8+IIB/1lrlGXdB/mrBzo8C/+gjevgpFSylQSDDsQEUj65ahYmwTjD1U6F+m87/WWCG8QqXp7cvg2HmTzPe6QNkXs7gauhn+12ceXw4Jfh2z5xj6a9Suh7voH5GnGWs7KIjRbrq</ds:X509Certificate>
+          <ds:X509Certificate>MIIDETCCAfmgAwIBAgIJAMPsse/uymyzMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+BAMTEnZtLXNoaWJiLTAzLmhpZy5zZTAeFw0wOTA0MjEwODUzMjVaFw0xOTA0MTkw
+ODUzMjVaMB0xGzAZBgNVBAMTEnZtLXNoaWJiLTAzLmhpZy5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALkIlu3cZmAeO7rDkhnqy3KIXKHT0rybuGwS
+F9H2Fimtk2qO/w10PPVYOy1aseHJtNShuDBDeLlosIGwO9bOMBU8mpEmVh9Npibr
+Bfm/mLzu2zhlJnx6bvbei0W8bkdHHYz/0wsARqbh5lHwRRoUh5kD+edtIPBEKnNt
+BmXy7TE1gOFfrYXXZUelXYrS9w/uJ1B2tDS5UzCWG2dXGWXxfDOOkdOd/X6tkT6B
+1DN6i9eEJ1jzTIpGVv5JfYZaxTjUVwpQjEsjo4QnYXOmqaN/CZwPeTdHorVzjxpw
+pxa/dLLWsUe2NcpzDQ10ptMZXHY0S6ohFGrhpaSh8EXKS/yj1p0CAwEAAaNUMFIw
+MQYDVR0RBCowKIISdm0tc2hpYmItMDMuaGlnLnNlhhJ2bS1zaGliYi0wMy5oaWcu
+c2UwHQYDVR0OBBYEFPkCYHeh+f8+8SRHVpqxdzvvbCxkMA0GCSqGSIb3DQEBBQUA
+A4IBAQBC+48YO32cmDwgt0MpPIeywBwwSbTDGKaCffiWzQhex/jUWRJgBy+cfRmB
+pdXp/P0CML8sjW3LjBbOcFLpnMeYdE4ITOE+4S9R78BOCcW/4FU4qlCbaLrMG098
+sJOkzDf23yb7BInk+gk+8FCSXmfjmuKM4kawQFvuXtVilq4XWqixYCEmqcfxZKp2
+X2o5PFotqMRsMX7X0q3IBK8+IIB/1lrlGXdB/mrBzo8C/+gjevgpFSylQSDDsQEU
+j65ahYmwTjD1U6F+m87/WWCG8QqXp7cvg2HmTzPe6QNkXs7gauhn+12ceXw4Jfh2
+z5xj6a9Suh7voH5GnGWs7KIjRbrq
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="https://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>vm-shibb-03.hig.se</ds:KeyName>
         <ds:X509Data>
           <ds:X509SubjectName>CN=vm-shibb-03.hig.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDETCCAfmgAwIBAgIJAMPsse/uymyzMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNVBAMTEnZtLXNoaWJiLTAzLmhpZy5zZTAeFw0wOTA0MjEwODUzMjVaFw0xOTA0MTkwODUzMjVaMB0xGzAZBgNVBAMTEnZtLXNoaWJiLTAzLmhpZy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALkIlu3cZmAeO7rDkhnqy3KIXKHT0rybuGwSF9H2Fimtk2qO/w10PPVYOy1aseHJtNShuDBDeLlosIGwO9bOMBU8mpEmVh9NpibrBfm/mLzu2zhlJnx6bvbei0W8bkdHHYz/0wsARqbh5lHwRRoUh5kD+edtIPBEKnNtBmXy7TE1gOFfrYXXZUelXYrS9w/uJ1B2tDS5UzCWG2dXGWXxfDOOkdOd/X6tkT6B1DN6i9eEJ1jzTIpGVv5JfYZaxTjUVwpQjEsjo4QnYXOmqaN/CZwPeTdHorVzjxpwpxa/dLLWsUe2NcpzDQ10ptMZXHY0S6ohFGrhpaSh8EXKS/yj1p0CAwEAAaNUMFIwMQYDVR0RBCowKIISdm0tc2hpYmItMDMuaGlnLnNlhhJ2bS1zaGliYi0wMy5oaWcuc2UwHQYDVR0OBBYEFPkCYHeh+f8+8SRHVpqxdzvvbCxkMA0GCSqGSIb3DQEBBQUAA4IBAQBC+48YO32cmDwgt0MpPIeywBwwSbTDGKaCffiWzQhex/jUWRJgBy+cfRmBpdXp/P0CML8sjW3LjBbOcFLpnMeYdE4ITOE+4S9R78BOCcW/4FU4qlCbaLrMG098sJOkzDf23yb7BInk+gk+8FCSXmfjmuKM4kawQFvuXtVilq4XWqixYCEmqcfxZKp2X2o5PFotqMRsMX7X0q3IBK8+IIB/1lrlGXdB/mrBzo8C/+gjevgpFSylQSDDsQEUj65ahYmwTjD1U6F+m87/WWCG8QqXp7cvg2HmTzPe6QNkXs7gauhn+12ceXw4Jfh2z5xj6a9Suh7voH5GnGWs7KIjRbrq</ds:X509Certificate>
+          <ds:X509Certificate>MIIDETCCAfmgAwIBAgIJAMPsse/uymyzMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+BAMTEnZtLXNoaWJiLTAzLmhpZy5zZTAeFw0wOTA0MjEwODUzMjVaFw0xOTA0MTkw
+ODUzMjVaMB0xGzAZBgNVBAMTEnZtLXNoaWJiLTAzLmhpZy5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALkIlu3cZmAeO7rDkhnqy3KIXKHT0rybuGwS
+F9H2Fimtk2qO/w10PPVYOy1aseHJtNShuDBDeLlosIGwO9bOMBU8mpEmVh9Npibr
+Bfm/mLzu2zhlJnx6bvbei0W8bkdHHYz/0wsARqbh5lHwRRoUh5kD+edtIPBEKnNt
+BmXy7TE1gOFfrYXXZUelXYrS9w/uJ1B2tDS5UzCWG2dXGWXxfDOOkdOd/X6tkT6B
+1DN6i9eEJ1jzTIpGVv5JfYZaxTjUVwpQjEsjo4QnYXOmqaN/CZwPeTdHorVzjxpw
+pxa/dLLWsUe2NcpzDQ10ptMZXHY0S6ohFGrhpaSh8EXKS/yj1p0CAwEAAaNUMFIw
+MQYDVR0RBCowKIISdm0tc2hpYmItMDMuaGlnLnNlhhJ2bS1zaGliYi0wMy5oaWcu
+c2UwHQYDVR0OBBYEFPkCYHeh+f8+8SRHVpqxdzvvbCxkMA0GCSqGSIb3DQEBBQUA
+A4IBAQBC+48YO32cmDwgt0MpPIeywBwwSbTDGKaCffiWzQhex/jUWRJgBy+cfRmB
+pdXp/P0CML8sjW3LjBbOcFLpnMeYdE4ITOE+4S9R78BOCcW/4FU4qlCbaLrMG098
+sJOkzDf23yb7BInk+gk+8FCSXmfjmuKM4kawQFvuXtVilq4XWqixYCEmqcfxZKp2
+X2o5PFotqMRsMX7X0q3IBK8+IIB/1lrlGXdB/mrBzo8C/+gjevgpFSylQSDDsQEU
+j65ahYmwTjD1U6F+m87/WWCG8QqXp7cvg2HmTzPe6QNkXs7gauhn+12ceXw4Jfh2
+z5xj6a9Suh7voH5GnGWs7KIjRbrq
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
@@ -38,4 +73,4 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vm-shibb-03.hig.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
 
-</md:EntityDescriptor>
+</md:EntityDescriptor>
\ No newline at end of file