fiv cleanup

3 files changed, 42 insertions, 2 deletions

diff --git a/fiv/aprikoslogin.pingpong.net.xml b/fiv/aprikoslogin.pingpong.net.xml
new file mode 100644
index 00000000..c80924ac
--- /dev/null
+++ b/fiv/aprikoslogin.pingpong.net.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://aprikoslogin.pingpong.net/simplesaml/saml2/idp/metadata.php" ID="pfxfe269bb4-5d72-4cec-ba4b-c84dc590f4fe"><ds:Signature>
+  <ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+    <ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+  <ds:Reference URI="#pfxfe269bb4-5d72-4cec-ba4b-c84dc590f4fe"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>jmfaq9QlQ2EoF/06tdSAT3QzrBY=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>nD52akaH/H9gHrFkDrjFhZay2hnpxJ8aHmgdOwNDGC+ZNjU4JMSYGgS02e64VK/2mizkkXmkN8Zzo3gZHCVXjisKlkVrov/KrwVM1dYr6z7ZQVoWg2/HWIsn1JYvNVZCUCuJViLuN6TNm/6RbThYyRqs5NxJrukqzi7+JnXroVY7etp3Id7gaCALIFtBD8BVaIxeCkYFBE3vqij2Fp0nI53grHGWIaRU+MsgN52JoNUZCo0atuZCx4gP1WlGduyJhL9ElJcFaTHfEGBMhzq43Ma/ZscaLejEFC8KpsWfRERcxVbhO46MJZhsXFEXJudlkJhA/eK07lLCIraHpd79UA==</ds:SignatureValue>
+<ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIDRzCCAi+gAwIBAgIJAOW09FoKjdI5MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNVBAMTGmxvZ2luLmFwcmlrb3MucGluZ3BvbmcubmV0MB4XDTExMDUwMjE5MDEzNVoXDTIxMDQyOTE5MDEzNVowJTEjMCEGA1UEAxMabG9naW4uYXByaWtvcy5waW5ncG9uZy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCm002qjfHdEw17+20j/VWTTCcTFgyul/s33R7QmynGkNUTpE+m0tMygiwq/ATLKWFC5QMHoeXB1/At6pCIhC6+BjF8Qz0N4i+u4ZREse2nbZ5r7W5V2CxMIt2exe0uWrBjSecDsk0JdianpFVTABJoSGpuUVPwuRvTg+73NNXXZdmaDqS4uzP6z3czyzIlNz1rSgIO0ZPBNu5bf9YGL+5mirS4diEDPmOkWZmieVjfsMbqYAmhUVZ2z2Tg8Y4E0AeWVHD23iaZeasywtX4KsEUbisUToyeicsrn9w1SAGVwgAXKwR0TTrZVSkrLnNjZ0aGWgu8C2UNH9b/f5iCVMi7AgMBAAGjejB4MFcGA1UdEQRQME6CGmxvZ2luLmFwcmlrb3MucGluZ3BvbmcubmV0hjBodHRwczovL2xvZ2luLmFwcmlrb3MucGluZ3BvbmcubmV0L3NpbXBsZXNhbWxwaHAwHQYDVR0OBBYEFPGwBGNlQT9XvEwQ5SXCDAvxDj3qMA0GCSqGSIb3DQEBBQUAA4IBAQCipmjgVAotwveL91R9bKfhQMmOlR4cRin1vlE0Weqb40YNFJD2nEAqdGiq/JzcIq+LGDdrjmZQRuHuciGLXwov3uQRBZil6H1at+/2vUFCqNnt7k4lAJ7G/3jCbQeVLAav+zeBvUfxqk/1aJzAQKKIyC1dCUPqCpaIws/62b6ok1Yd5v/pmz0fmXsBjDKIPa3r7YBKLeH6Tl7HCN+5d2zzYM53Vy8PbKfXY2NhnpYPwBuBkehjF7GYrId35t86T4Chu1DYEMyDEnn2WY8428M25cpYq21oEJBsNRBWlwwHFPITquw51lhLa7RXs4TyTh+50eypsrvhNDSa+UksDFXH</ds:X509Certificate></ds:X509Data></ds:KeyInfo></ds:Signature>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDRzCCAi+gAwIBAgIJAOW09FoKjdI5MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNVBAMTGmxvZ2luLmFwcmlrb3MucGluZ3BvbmcubmV0MB4XDTExMDUwMjE5MDEzNVoXDTIxMDQyOTE5MDEzNVowJTEjMCEGA1UEAxMabG9naW4uYXByaWtvcy5waW5ncG9uZy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCm002qjfHdEw17+20j/VWTTCcTFgyul/s33R7QmynGkNUTpE+m0tMygiwq/ATLKWFC5QMHoeXB1/At6pCIhC6+BjF8Qz0N4i+u4ZREse2nbZ5r7W5V2CxMIt2exe0uWrBjSecDsk0JdianpFVTABJoSGpuUVPwuRvTg+73NNXXZdmaDqS4uzP6z3czyzIlNz1rSgIO0ZPBNu5bf9YGL+5mirS4diEDPmOkWZmieVjfsMbqYAmhUVZ2z2Tg8Y4E0AeWVHD23iaZeasywtX4KsEUbisUToyeicsrn9w1SAGVwgAXKwR0TTrZVSkrLnNjZ0aGWgu8C2UNH9b/f5iCVMi7AgMBAAGjejB4MFcGA1UdEQRQME6CGmxvZ2luLmFwcmlrb3MucGluZ3BvbmcubmV0hjBodHRwczovL2xvZ2luLmFwcmlrb3MucGluZ3BvbmcubmV0L3NpbXBsZXNhbWxwaHAwHQYDVR0OBBYEFPGwBGNlQT9XvEwQ5SXCDAvxDj3qMA0GCSqGSIb3DQEBBQUAA4IBAQCipmjgVAotwveL91R9bKfhQMmOlR4cRin1vlE0Weqb40YNFJD2nEAqdGiq/JzcIq+LGDdrjmZQRuHuciGLXwov3uQRBZil6H1at+/2vUFCqNnt7k4lAJ7G/3jCbQeVLAav+zeBvUfxqk/1aJzAQKKIyC1dCUPqCpaIws/62b6ok1Yd5v/pmz0fmXsBjDKIPa3r7YBKLeH6Tl7HCN+5d2zzYM53Vy8PbKfXY2NhnpYPwBuBkehjF7GYrId35t86T4Chu1DYEMyDEnn2WY8428M25cpYq21oEJBsNRBWlwwHFPITquw51lhLa7RXs4TyTh+50eypsrvhNDSa+UksDFXH</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDRzCCAi+gAwIBAgIJAOW09FoKjdI5MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNVBAMTGmxvZ2luLmFwcmlrb3MucGluZ3BvbmcubmV0MB4XDTExMDUwMjE5MDEzNVoXDTIxMDQyOTE5MDEzNVowJTEjMCEGA1UEAxMabG9naW4uYXByaWtvcy5waW5ncG9uZy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCm002qjfHdEw17+20j/VWTTCcTFgyul/s33R7QmynGkNUTpE+m0tMygiwq/ATLKWFC5QMHoeXB1/At6pCIhC6+BjF8Qz0N4i+u4ZREse2nbZ5r7W5V2CxMIt2exe0uWrBjSecDsk0JdianpFVTABJoSGpuUVPwuRvTg+73NNXXZdmaDqS4uzP6z3czyzIlNz1rSgIO0ZPBNu5bf9YGL+5mirS4diEDPmOkWZmieVjfsMbqYAmhUVZ2z2Tg8Y4E0AeWVHD23iaZeasywtX4KsEUbisUToyeicsrn9w1SAGVwgAXKwR0TTrZVSkrLnNjZ0aGWgu8C2UNH9b/f5iCVMi7AgMBAAGjejB4MFcGA1UdEQRQME6CGmxvZ2luLmFwcmlrb3MucGluZ3BvbmcubmV0hjBodHRwczovL2xvZ2luLmFwcmlrb3MucGluZ3BvbmcubmV0L3NpbXBsZXNhbWxwaHAwHQYDVR0OBBYEFPGwBGNlQT9XvEwQ5SXCDAvxDj3qMA0GCSqGSIb3DQEBBQUAA4IBAQCipmjgVAotwveL91R9bKfhQMmOlR4cRin1vlE0Weqb40YNFJD2nEAqdGiq/JzcIq+LGDdrjmZQRuHuciGLXwov3uQRBZil6H1at+/2vUFCqNnt7k4lAJ7G/3jCbQeVLAav+zeBvUfxqk/1aJzAQKKIyC1dCUPqCpaIws/62b6ok1Yd5v/pmz0fmXsBjDKIPa3r7YBKLeH6Tl7HCN+5d2zzYM53Vy8PbKfXY2NhnpYPwBuBkehjF7GYrId35t86T4Chu1DYEMyDEnn2WY8428M25cpYq21oEJBsNRBWlwwHFPITquw51lhLa7RXs4TyTh+50eypsrvhNDSa+UksDFXH</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aprikoslogin.pingpong.net/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aprikoslogin.pingpong.net/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Aprikos @ Göteborgs stad</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Aprikos</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.goteborg.se/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>girgen@pingpong.net</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/fiv/testlogin.pingpong.net.xml b/fiv/testlogin.pingpong.net.xml
index 7805ab44..a717cec0 100644
--- a/fiv/testlogin.pingpong.net.xml
+++ b/fiv/testlogin.pingpong.net.xml
@@ -19,10 +19,14 @@
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://testlogin.pingpong.net/simplesaml/saml2/idp/SSOService.php"/>
   </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Göteborgs stad</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Göteborg</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.goteborg.se/</OrganizationURL>
+  </Organization>
   <ContactPerson contactType="technical">
     <GivenName>Palle</GivenName>
     <SurName>Girgensohn</SurName>
     <EmailAddress>girgen@pingpong.net</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
-
diff --git a/swamid-fiv-test.mxml b/swamid-fiv-test.mxml
index 70cb3c52..d4d9170f 100644
--- a/swamid-fiv-test.mxml
+++ b/swamid-fiv-test.mxml
@@ -5,6 +5,7 @@
    <xi:include href="swamid-1.0/idp.chalmers.se.xml"/>
    <xi:include href="fiv/aprikos.pingpong.net.xml"/>
    <xi:include href="fiv/testlogin.pingpong.net.xml"/>
-   <xi:include href="fiv/paron.pingpong.net"/>
+   <xi:include href="fiv/aprikoslogin.pingpong.net.xml"/>
+   <xi:include href="fiv/paron.pingpong.net.xml"/>
    <xi:include href="fiv/pingpong-vas-1.it.gu.se.xml"/>
 </md:EntitiesDescriptor>