From d04f876f24cd954ba9c0c511b708bef4179b557c Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Thu, 24 Jan 2013 12:21:04 +0100
Subject: vfu

---
 swamid-1.0/vfu.su.se.xml | 42 +++++++++++-------------------------------
 1 file changed, 11 insertions(+), 31 deletions(-)

diff --git a/swamid-1.0/vfu.su.se.xml b/swamid-1.0/vfu.su.se.xml
index d51d941e..a13ed764 100644
--- a/swamid-1.0/vfu.su.se.xml
+++ b/swamid-1.0/vfu.su.se.xml
@@ -1,37 +1,17 @@
-
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_680ade14ad27c92ae6c559f1212cc9d2" entityID="https://vfu.su.se/Shibboleth.sso">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vfu.su.se/Shibboleth.sso">
 
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vfu.su.se/Shibboleth.sso/WAYF" index="1"/>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vfu.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vfu.su.se/Shibboleth.sso/WAYF"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vfu.su.se/Shibboleth.sso/WAYF" index="1"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vfu.su.se/Shibboleth.sso/WAYF/wavelan"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vfu.su.se/Shibboleth.sso/WAYF/wavelan" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vfu.su.se/Shibboleth.sso/WAYF/idp.secure.su.se"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vfu.su.se/Shibboleth.sso/WAYF/idp.it.su.se"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vfu.su.se/Shibboleth.sso/WAYF/guest-idp.it.su.se"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vfu.su.se/Shibboleth.sso/SWAMID"/>
     </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>vfu-prod-sp01</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=vfu-prod-sp01</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC7jCCAdagAwIBAgIJALmMhVR9S5weMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDXZmdS1wcm9kLXNwMDEwHhcNMTExMTIxMTUwMDM4WhcNMjExMTE4MTUwMDM4
-WjAYMRYwFAYDVQQDEw12ZnUtcHJvZC1zcDAxMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAmIXUFzvpibm1/eZnX++31RQt+OkgMZDVwhI8Tbv6/WIsWCQd
-jFESHufjL6hH2wKvPj0JOag321CBnK4Uc3pkagSKX4A+NyJdWu8p4fQw9iw693WT
-7JwDHAaUcr3GoyxSENPDwTHaw6S9wvbsBV09Y+cnioIbYRbMfgkH/ysekJVcPJop
-ipUP6lxxs5GRG+V/Ieo21RhO139TnR8NzsEQZiq/jymEYT30e/54aaV+2gnfDEZs
-6Uw478ne2/CJCc5JedNzzKeqGnEZbHMhLCIbuLEhq2iqlBcGHRjIAKetSspP2SZK
-uusHVGTAslytQZS8EtJlpUlISmlETAdmrRqstQIDAQABozswOTAYBgNVHREEETAP
-gg12ZnUtcHJvZC1zcDAxMB0GA1UdDgQWBBQhGf9xTZKSyD7nZBalo3mth6KBFjAN
-BgkqhkiG9w0BAQUFAAOCAQEAPVnGZ5JWdpju/sp8068w5Ug4m10fTjn2kkfpOcLu
-qxjVaZLf/TnY6ZF/Ez4X7nYqf8b2PznprbM+N78Gzihpe1P4vLnrpR80kEd+pDv1
-KHletzHHpn2M1iwIi0Jqp/OpezCaLgRz/RbGetDKgDVzzXRBfGW1ELQetpv5xr18
-je6XvIacHI+0g3xQiO1N3Zj5BvgdlnE6xGeQaJJGJgoSRTf3jOAq8XusKjKlIai5
-jUddZxuROgO0B3XXjcoWMJLhSqNNXbKkhitFTtFi0bBQyk6eBIiRB/rRL8FZDMUh
-ZbIlfQJbU+IsF+PBKYkQ9oGeHIBu0E6lRYjrmIFz1n176w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
+    <md:KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>vfu-prod-sp01</ds:KeyName>
         <ds:X509Data>
@@ -73,4 +53,4 @@ ZbIlfQJbU+IsF+PBKYkQ9oGeHIBu0E6lRYjrmIFz1n176w==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
   </md:SPSSODescriptor>
 
-</md:EntityDescriptor>
\ No newline at end of file
+</md:EntityDescriptor>
-- 
cgit v1.2.3