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

2 files changed, 5 insertions, 6 deletions

diff --git a/swamid-1.0.mxml b/swamid-1.0.mxml
index cf57a963..ba3c8877 100644
--- a/swamid-1.0.mxml
+++ b/swamid-1.0.mxml
@@ -29,7 +29,6 @@
   <xi:include href="swamid-1.0/idp.secure.su.se.xml"/>
   <xi:include href="swamid-1.0/umdac-humpdac.ad.umu.se.xml"/>
   <xi:include href="swamid-1.0/sp.lhs.se.xml"/>
-  <xi:include href="swamid-1.0/roundup.it.su.se.xml"/>
   <xi:include href="swamid-1.0/moodle.lhs.se.xml"/>
   <xi:include href="swamid-1.0/slcstest.uninett.no.xml"/>
   <xi:include href="swamid-1.0/www.cambro.umu.se.xml"/>
diff --git a/swamid-1.0/idp.suni.se.xml b/swamid-1.0/idp.suni.se.xml
index a1071a1a..b79e81eb 100644
--- a/swamid-1.0/idp.suni.se.xml
+++ b/swamid-1.0/idp.suni.se.xml
@@ -1,4 +1,4 @@
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.suni.se/adfs/services/trust">

+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" ID="_4fd38a7c-2e3a-4ebd-a93e-77cfd918c171" entityID="https://idp.suni.se/adfs/services/trust">

   <Extensions>

     <shibmd:Scope regexp="false">suni.se</shibmd:Scope>

   </Extensions>

@@ -6,14 +6,14 @@
     <KeyDescriptor use="encryption">

       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">

         <X509Data>

-			<X509Certificate>MIIC2DCCAcCgAwIBAgIQXEjiNTWdtLROPwm4ilRMxjANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIEVuY3J5cHRpb24gLSBpZHAuc3VuaS5zZTAeFw0xMjA0MTMxMDAwMDhaFw0xMzA0MTMxMDAwMDhaMCgxJjAkBgNVBAMTHUFERlMgRW5jcnlwdGlvbiAtIGlkcC5zdW5pLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4BMwJfoPImmqhl0GXRWeUjkQ4f1f/bsvP7bWwCjCMRjjG2SJpWTljkvev0ikMXZNbf95R4trXxPifONKIqwYrahC18YEEnV0R5HIMK9iHmKDDDS4uyxMxrbsUkiN6BB1ws8C2obPru73QM7vGgMbjyal1S6sWQSitr87smCoLNU/o/5FjhuWul8+yQl9iJMt8V215249Z1Rns4RpOUg120VzN0DDZnOSH1elxCOgFs5ilS0oQ3cs8aEMZEV+xSM9kN7efFixt5JoEbsaLx1SS2UgTMWvKW/7hgrYbe4YpSURDhR8xsLtpcCQSN8u6c2IyxzVqdSIbdqOt/jiTXqV+QIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBUtnjsLY5qQYZqxmibq5i4iQ69W4y+jh3GQPEW6hG9yFO/d42ylubftAK3ZNmbi0BLCzH29Oc7fUevoFr44L1Uegd/4TZMGbPY0F6WHgb2Ye8ItkD3tliFL5AerDNSbABEPKbFJtewQsLk/1ALt/FPb8ZClmL4LrJJzxlqPrEZeHZ3xl2PzvOlimdsGUAieiYMSjBhJItwcDn9zN4t38ULoTvj5ePBfzrkS65Z1XroV4BH3tuGzk7PyQFx+kpAGpvET3Ga+Pp8zlyfGrHMmvnhFYUAq9EtsEqDA2c3GKVrnSKm5mJ2a0nj2xq2K1pN5DSACB3NcRMzBnmRIb2FOOXj</X509Certificate> 

-		</X509Data>

+          <X509Certificate>MIIC2DCCAcCgAwIBAgIQXEjiNTWdtLROPwm4ilRMxjANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIEVuY3J5cHRpb24gLSBpZHAuc3VuaS5zZTAeFw0xMjA0MTMxMDAwMDhaFw0xMzA0MTMxMDAwMDhaMCgxJjAkBgNVBAMTHUFERlMgRW5jcnlwdGlvbiAtIGlkcC5zdW5pLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4BMwJfoPImmqhl0GXRWeUjkQ4f1f/bsvP7bWwCjCMRjjG2SJpWTljkvev0ikMXZNbf95R4trXxPifONKIqwYrahC18YEEnV0R5HIMK9iHmKDDDS4uyxMxrbsUkiN6BB1ws8C2obPru73QM7vGgMbjyal1S6sWQSitr87smCoLNU/o/5FjhuWul8+yQl9iJMt8V215249Z1Rns4RpOUg120VzN0DDZnOSH1elxCOgFs5ilS0oQ3cs8aEMZEV+xSM9kN7efFixt5JoEbsaLx1SS2UgTMWvKW/7hgrYbe4YpSURDhR8xsLtpcCQSN8u6c2IyxzVqdSIbdqOt/jiTXqV+QIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBUtnjsLY5qQYZqxmibq5i4iQ69W4y+jh3GQPEW6hG9yFO/d42ylubftAK3ZNmbi0BLCzH29Oc7fUevoFr44L1Uegd/4TZMGbPY0F6WHgb2Ye8ItkD3tliFL5AerDNSbABEPKbFJtewQsLk/1ALt/FPb8ZClmL4LrJJzxlqPrEZeHZ3xl2PzvOlimdsGUAieiYMSjBhJItwcDn9zN4t38ULoTvj5ePBfzrkS65Z1XroV4BH3tuGzk7PyQFx+kpAGpvET3Ga+Pp8zlyfGrHMmvnhFYUAq9EtsEqDA2c3GKVrnSKm5mJ2a0nj2xq2K1pN5DSACB3NcRMzBnmRIb2FOOXj</X509Certificate>

+        </X509Data>

       </KeyInfo>

     </KeyDescriptor>

     <KeyDescriptor use="signing">

       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">

         <X509Data>

-			<X509Certificate>MIIC0jCCAbqgAwIBAgIQS8lPCdCO1YRGywJDFutE7zANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBpZHAuc3VuaS5zZTAeFw0xMjA0MTMxMDAwMTBaFw0xMzA0MTMxMDAwMTBaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAtIGlkcC5zdW5pLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2foZBCMRnGb97/oTHmcto6B9L08sfhtjxxQY8+RazXgAAxRReFpyLqrHFMFFpyQjzSzd+0DW//quGT+YxVk9YrluO+M2LFEt6FwZsxQxiPfoPwNp6AvvU0v4JfVs6Og6xrrYQF3xTa1+cwdpWqBhZPOUZ4Y0r7WmjEBgWi5lW657/GaddcqE+HUh4JFcus9SaQmPFyftRAdUIt5hgoThse3cPjDrAmcs0XQCN2/ay5Q6+ewJbNNR3pJzPnJ7WTRCLV6MDC9Zzc9M2yBWUsgLXC6GoWLsxjqrFliVIzSH27D9JwVRDPmXexQA0rxdxNjPQn0WtiOcW653sKi4c9A1wwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCB6XWG5AKYx7eLFpEDhwjUjGCxeZrC6j5ldZT0eypmFQJ41IBCNODcDDpL1olVpV05lQMdAsWGdCUHwBkIc6NPd/4YbSbkgyX+GKOMNX16VetsNJoxFppYwhchj4NgFZTMB36e4xmnYwjPJDzTbARohdfhpk3JtjwovwX2TSF8fINfjT+KN/ayEail5JCCIBtJqCM8IVFNKO7pWL2u1xkZpAh740r72z7VuwMx5Ig8/+xc5h7j3ftiz2LsBtkgqiimUhy0WjzTmYuV2VRZsvYVdwBmOSRvh3/hNqwpjXADkGMwgvjuRMgf45/k4cjWTyCVCG0KmJ0DamJf5RAO44Jj</X509Certificate> 

+          <X509Certificate>MIIC0jCCAbqgAwIBAgIQS8lPCdCO1YRGywJDFutE7zANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBpZHAuc3VuaS5zZTAeFw0xMjA0MTMxMDAwMTBaFw0xMzA0MTMxMDAwMTBaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAtIGlkcC5zdW5pLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2foZBCMRnGb97/oTHmcto6B9L08sfhtjxxQY8+RazXgAAxRReFpyLqrHFMFFpyQjzSzd+0DW//quGT+YxVk9YrluO+M2LFEt6FwZsxQxiPfoPwNp6AvvU0v4JfVs6Og6xrrYQF3xTa1+cwdpWqBhZPOUZ4Y0r7WmjEBgWi5lW657/GaddcqE+HUh4JFcus9SaQmPFyftRAdUIt5hgoThse3cPjDrAmcs0XQCN2/ay5Q6+ewJbNNR3pJzPnJ7WTRCLV6MDC9Zzc9M2yBWUsgLXC6GoWLsxjqrFliVIzSH27D9JwVRDPmXexQA0rxdxNjPQn0WtiOcW653sKi4c9A1wwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCB6XWG5AKYx7eLFpEDhwjUjGCxeZrC6j5ldZT0eypmFQJ41IBCNODcDDpL1olVpV05lQMdAsWGdCUHwBkIc6NPd/4YbSbkgyX+GKOMNX16VetsNJoxFppYwhchj4NgFZTMB36e4xmnYwjPJDzTbARohdfhpk3JtjwovwX2TSF8fINfjT+KN/ayEail5JCCIBtJqCM8IVFNKO7pWL2u1xkZpAh740r72z7VuwMx5Ig8/+xc5h7j3ftiz2LsBtkgqiimUhy0WjzTmYuV2VRZsvYVdwBmOSRvh3/hNqwpjXADkGMwgvjuRMgf45/k4cjWTyCVCG0KmJ0DamJf5RAO44Jj</X509Certificate>

         </X509Data>

       </KeyInfo>

     </KeyDescriptor>

@@ -35,7 +35,7 @@
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="AD FS 1.x UPN"/>

     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Role"/>

     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Surname"/>

-    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="PPID"/>

+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonNIN"/>

     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Name ID"/>

     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication time stamp"/>

     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication method"/>