From 31c71be7839743cdecb1fdd0b0df01577659dfdd Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Thu, 8 Mar 2012 08:07:14 +0100
Subject: prylar till palle

---
 fiv/idp-test.pingpong.net.xml            | 26 +++++++++++++++++++
 fiv/pingpong-vas-1.it.gu.se.xml          | 44 --------------------------------
 fiv/pingpongtest-vir-1.test.it.gu.se.xml | 39 ++++++++++++++++++++++++++++
 fiv/testlogin.pingpong.net.xml           | 32 -----------------------
 swamid-fiv-test.mxml                     |  4 +--
 5 files changed, 67 insertions(+), 78 deletions(-)
 create mode 100644 fiv/idp-test.pingpong.net.xml
 delete mode 100644 fiv/pingpong-vas-1.it.gu.se.xml
 create mode 100644 fiv/pingpongtest-vir-1.test.it.gu.se.xml
 delete mode 100644 fiv/testlogin.pingpong.net.xml

diff --git a/fiv/idp-test.pingpong.net.xml b/fiv/idp-test.pingpong.net.xml
new file mode 100644
index 00000000..62494766
--- /dev/null
+++ b/fiv/idp-test.pingpong.net.xml
@@ -0,0 +1,26 @@
+<?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://idp-test.pingpong.net/simplesaml/saml2/idp/metadata.php" ID="pfx773d331c-cb6b-f8f7-417b-712dde923e23"><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="#pfx773d331c-cb6b-f8f7-417b-712dde923e23"><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>xZ2fWNzLSRJ4gn+D0U43Tz1zeH8=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>h3rtketkU0/2whPMWLdYKtnDApGsnhkxoTzfUjWdOAihdwtUOwrNTbroPyNGD2uMPYx5/xXXkxqP6stOEbmI8sUwuX2NawsFr5b19brBZEafKzkTnIvUCLIVKPXNxLN6NSgKnKtkKFGgogqtYkGKM1GfnuLtjgecT/MVIFE2Pa8=</ds:SignatureValue>
+<ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIDLjCCApegAwIBAgIJAIFnn3T1mLG2MA0GCSqGSIb3DQEBBQUAMG4xCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEVMBMGA1UEChMMUGluZyBQb25nIEFCMSAwHgYDVQQDExdsb2dpbi10ZXN0LnBpbmdwb25nLm5ldDAeFw0xMjAzMDcyMzUxMTZaFw0yMjAzMDUyMzUxMTZaMG4xCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEVMBMGA1UEChMMUGluZyBQb25nIEFCMSAwHgYDVQQDExdsb2dpbi10ZXN0LnBpbmdwb25nLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0tb1PexfPrbTwBefFTXsEXCz3w3ps1XLvHZjRce9Hx46+ajF+5tTzTYPaztXxKbr9d56bS2WZSXgDtk9PdqxXR6HAjz62ZaPhMAY5b212Qjhs3roDyCn5NUU2VqVNL9gVdVMyVHtyL/TMHYmqr5CUxG9RURRwarindpZusWjcwcCAwEAAaOB0zCB0DAdBgNVHQ4EFgQUc1hWiOHRtW205ujOQ3myJiXyAvgwgaAGA1UdIwSBmDCBlYAUc1hWiOHRtW205ujOQ3myJiXyAvihcqRwMG4xCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEVMBMGA1UEChMMUGluZyBQb25nIEFCMSAwHgYDVQQDExdsb2dpbi10ZXN0LnBpbmdwb25nLm5ldIIJAIFnn3T1mLG2MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAcVAhw2AGQMaQo1HKkyGnAOpBiyOeW8JMIWy5WL4ddIv/6xNxeWQpJTfM8iu2zlcSo9GkJuSrbWM+LuFurHC+DvzrgJpsUjYhU04iQzxfKQFc4eHljxbBT+VAWqixRo61ZNkNriGPdUtiea98cIOh4Z87i9s8YFYPxydOL2Hz9fU=</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>MIIDLjCCApegAwIBAgIJAIFnn3T1mLG2MA0GCSqGSIb3DQEBBQUAMG4xCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEVMBMGA1UEChMMUGluZyBQb25nIEFCMSAwHgYDVQQDExdsb2dpbi10ZXN0LnBpbmdwb25nLm5ldDAeFw0xMjAzMDcyMzUxMTZaFw0yMjAzMDUyMzUxMTZaMG4xCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEVMBMGA1UEChMMUGluZyBQb25nIEFCMSAwHgYDVQQDExdsb2dpbi10ZXN0LnBpbmdwb25nLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0tb1PexfPrbTwBefFTXsEXCz3w3ps1XLvHZjRce9Hx46+ajF+5tTzTYPaztXxKbr9d56bS2WZSXgDtk9PdqxXR6HAjz62ZaPhMAY5b212Qjhs3roDyCn5NUU2VqVNL9gVdVMyVHtyL/TMHYmqr5CUxG9RURRwarindpZusWjcwcCAwEAAaOB0zCB0DAdBgNVHQ4EFgQUc1hWiOHRtW205ujOQ3myJiXyAvgwgaAGA1UdIwSBmDCBlYAUc1hWiOHRtW205ujOQ3myJiXyAvihcqRwMG4xCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEVMBMGA1UEChMMUGluZyBQb25nIEFCMSAwHgYDVQQDExdsb2dpbi10ZXN0LnBpbmdwb25nLm5ldIIJAIFnn3T1mLG2MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAcVAhw2AGQMaQo1HKkyGnAOpBiyOeW8JMIWy5WL4ddIv/6xNxeWQpJTfM8iu2zlcSo9GkJuSrbWM+LuFurHC+DvzrgJpsUjYhU04iQzxfKQFc4eHljxbBT+VAWqixRo61ZNkNriGPdUtiea98cIOh4Z87i9s8YFYPxydOL2Hz9fU=</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>MIIDLjCCApegAwIBAgIJAIFnn3T1mLG2MA0GCSqGSIb3DQEBBQUAMG4xCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEVMBMGA1UEChMMUGluZyBQb25nIEFCMSAwHgYDVQQDExdsb2dpbi10ZXN0LnBpbmdwb25nLm5ldDAeFw0xMjAzMDcyMzUxMTZaFw0yMjAzMDUyMzUxMTZaMG4xCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEVMBMGA1UEChMMUGluZyBQb25nIEFCMSAwHgYDVQQDExdsb2dpbi10ZXN0LnBpbmdwb25nLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0tb1PexfPrbTwBefFTXsEXCz3w3ps1XLvHZjRce9Hx46+ajF+5tTzTYPaztXxKbr9d56bS2WZSXgDtk9PdqxXR6HAjz62ZaPhMAY5b212Qjhs3roDyCn5NUU2VqVNL9gVdVMyVHtyL/TMHYmqr5CUxG9RURRwarindpZusWjcwcCAwEAAaOB0zCB0DAdBgNVHQ4EFgQUc1hWiOHRtW205ujOQ3myJiXyAvgwgaAGA1UdIwSBmDCBlYAUc1hWiOHRtW205ujOQ3myJiXyAvihcqRwMG4xCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEVMBMGA1UEChMMUGluZyBQb25nIEFCMSAwHgYDVQQDExdsb2dpbi10ZXN0LnBpbmdwb25nLm5ldIIJAIFnn3T1mLG2MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAcVAhw2AGQMaQo1HKkyGnAOpBiyOeW8JMIWy5WL4ddIv/6xNxeWQpJTfM8iu2zlcSo9GkJuSrbWM+LuFurHC+DvzrgJpsUjYhU04iQzxfKQFc4eHljxbBT+VAWqixRo61ZNkNriGPdUtiea98cIOh4Z87i9s8YFYPxydOL2Hz9fU=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.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://idp-test.pingpong.net/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+</md:EntityDescriptor>
\ No newline at end of file
diff --git a/fiv/pingpong-vas-1.it.gu.se.xml b/fiv/pingpong-vas-1.it.gu.se.xml
deleted file mode 100644
index 84bb7f1a..00000000
--- a/fiv/pingpong-vas-1.it.gu.se.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:disco="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" entityID="https://pingpong-vas-1.it.gu.se/shibboleth">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <disco:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pingpong-vas-1.pingpong.net/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC/TCCAeWgAwIBAgIJAKOFKQX4K4GBMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEnBhcm9uLnBpbmdwb25nLm5ldDAeFw0xMTA1MDIxMjE4MjBaFw0yMTA0Mjkx
-MjE4MjBaMB0xGzAZBgNVBAMTEnBhcm9uLnBpbmdwb25nLm5ldDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALrvtI1zxoJwch9/7LPOYqGSGfjX71s1zZOO
-I6pSBwNR6U1IcUWWDt/V+hIw07asEkqMwebYv4GeHS5f/rdbvIiYtot5Av8nDtq/
-WPmuDUUBlQpdUMScH4L7lQ0We3cLYbBHb6h/IeO5IOw8bPT4hmbOssRO5Mi9UE82
-UK3aUcy4578cDkJhZvXWd8jh4/CRFEBbi3jT2oCw/YXkdtI/Hal9ADFTFCvE0eAX
-liaLFfLkwy2NGNaTAcK8ESeO/MtQfCvvLdUwLNhQO7RAWoD3B02ZSub5D4iLD7+L
-HCwIoQQD0OLoxp5nniMxWJ6cYdtaqqBdZCK2Q7me+bwHqEcKM40CAwEAAaNAMD4w
-HQYDVR0RBBYwFIIScGFyb24ucGluZ3BvbmcubmV0MB0GA1UdDgQWBBQVWmGhu1rs
-rMFBaUgXzlQjEqOYTDANBgkqhkiG9w0BAQUFAAOCAQEAh7YEOOXSlCSZyhM7a24i
-ECR2mQDwI6CFXaB3gJYksQqrd4PAAINsowS9L1rgLLZaKBFpl9nTFwEzfQPchzHb
-9HeebW83S7bVZmfbk/rmK9jllPLIC3o57qAP/zvVkBA0tutSO6U70WusGGskqPg2
-UT30hMSD1dCddkYhiJTL459NpQjFKVO6aFKi2NoSjtmyKjuR8zXvQGk8RndxiloT
-F6vKUWbdF+raXt9lDcXQYUrxgWtfvU9W4OsXKNtoTvRcBqyP/CiuuOnzDNIQCNTq
-oZCg59HLKBmS3SvE0pB1QhRYZBfmUI9iWVp21LbuIgR4qlojy+lmQHNEKY+MZAGi
-Ug==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pingpong-vas-1.pingpong.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pingpong-vas-1.pingpong.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingpong-vas-1.pingpong.net/Shibboleth.sso/SLO/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pingpong-vas-1.pingpong.net/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pingpong-vas-1.pingpong.net/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingpong-vas-1.pingpong.net/Shibboleth.sso/NIM/POST"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingpong-vas-1.pingpong.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pingpong-vas-1.pingpong.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pingpong-vas-1.pingpong.net/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pingpong-vas-1.pingpong.net/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pingpong-vas-1.pingpong.net/Shibboleth.sso/SAML2/ECP" index="5"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
-
diff --git a/fiv/pingpongtest-vir-1.test.it.gu.se.xml b/fiv/pingpongtest-vir-1.test.it.gu.se.xml
new file mode 100644
index 00000000..8f8e14c3
--- /dev/null
+++ b/fiv/pingpongtest-vir-1.test.it.gu.se.xml
@@ -0,0 +1,39 @@
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:disco="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" entityID="https://pingpongtest-vir-1.test.it.gu.se/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <disco:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pingpongtest-vir-1.test.it.gu.se/Shibboleth.sso/DS" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIJAOTgXj+okBbHMA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
+BAMTIHBpbmdwb25ndGVzdC12aXItMS50ZXN0Lml0Lmd1LnNlMB4XDTEyMDMwNzIz
+MjMyOVoXDTIyMDMwNTIzMjMyOVowKzEpMCcGA1UEAxMgcGluZ3Bvbmd0ZXN0LXZp
+ci0xLnRlc3QuaXQuZ3Uuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCra/+sYTtrKKUzP5lv77VGv9b9mYE9K1561UUoONamlQuIkgcprengyyLCcerD
+IEFSwkntvgE0dteTNbqExbVQe1EY/kVTJYHCCSDaX0DmG7GQrBBTcPVXxxJHMYyG
+zcWcammYFuAQ+b7SH4mWJ1p2VUNayf88RgUv7sfofMthTWVxEBu7iPLqpAyDxpD3
+FN5dMaQOW+1MTfc9dTwtTmT46Fq2krrfAWBVD4vS33cLpBGOBomFhTb0tj5CWc4r
+Ze/Zn3JBioiU76o9In/zxhkd0g/griRM2dHQxN8nXrKNRvrIYlbynWCDYxqxgMud
+BbX5Xt+jt6ZecvTACauQFtnFAgMBAAGjTjBMMCsGA1UdEQQkMCKCIHBpbmdwb25n
+dGVzdC12aXItMS50ZXN0Lml0Lmd1LnNlMB0GA1UdDgQWBBQqGBPG7o0kzKHWB6Pp
+qUNyvIGj4jANBgkqhkiG9w0BAQUFAAOCAQEAN8dSLx7WoQrzOsRdagTx9CHLWv9i
+xdS7KpOQEtHhUEmhJdPN/LQy0K3LXrv3yZl7EVaZWUBKuWBioXnVm5hAcB4qC1L0
+Aaxm3Dvwqt/64UriY8yJMx2qzOp8Da4H8GvT4wg4fAZmP4UPUheQiuWxzn7yoNel
+s6ymozXX0Mp/2MPaaZmZ2oX/st0xhjYzaAj4YDO/E1K3hoDwj6Rm5PZ/dlqsnVqU
+lNKoaYWV8tLi3vGC67JPlqMhvnAqPZN7/V/ZmPGOIfkDckhFuq4yo1ilfABV8sV6
+pBDpJv9APi9RYwb3xtZGS8U8k0qm+/Knfhyl/8jJoc9eiFRwTD5EbV3OMA==
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pingpongtest-vir-1.test.it.gu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pingpongtest-vir-1.test.it.gu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingpongtest-vir-1.test.it.gu.se/Shibboleth.sso/SLO/POST"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingpongtest-vir-1.test.it.gu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pingpongtest-vir-1.test.it.gu.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pingpongtest-vir-1.test.it.gu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
+
diff --git a/fiv/testlogin.pingpong.net.xml b/fiv/testlogin.pingpong.net.xml
deleted file mode 100644
index a717cec0..00000000
--- a/fiv/testlogin.pingpong.net.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://testlogin.pingpong.net/simplesaml/saml2/idp/metadata.php">
-  <IDPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICUTCCAboCCQCcT+Ku9qrbaDANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xFTATBgNVBAoTDFBpbmcgUG9uZyBBQjEfMB0GA1UEAxMWdGVzdGxvZ2luLnBpbmdwb25nLm5ldDAeFw0wOTEwMjMxNDQzMzJaFw0zNzAzMDkxNDQzMzJaMG0xCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEVMBMGA1UEChMMUGluZyBQb25nIEFCMR8wHQYDVQQDExZ0ZXN0bG9naW4ucGluZ3BvbmcubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6dhooZcjE/oW7x5ZaNVwI1LJkbTiteSL4MEXIzKON30KqIE6N6eJx/0WDiWnUUfki5AK+XmmF9SdWPZCa8KNKNgI5rSyfe3D0h/lj1TmU9yZTwmUJMjzrbedg+aJE4lRcNgom9DGAzSORv7XALOgVt1Al3s2c2vcTWQLjqHEFlwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAEF1gFqvHAbKGyRba1AtKpnkcKqJ9uLQfpwMNhSXHZ5PyPt6Tmqu68dyJ8uIoEIIP5bjJKSayWSP2xhZnRJrRR8M4B/4mSRkMW02qzabDc7dqzozELjjwZQf8SA1h5UNZqIVMP4uLAeUwCTHW0wK7Pc6Jp2zQvb/zJqzixi/LNgu</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICUTCCAboCCQCcT+Ku9qrbaDANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xFTATBgNVBAoTDFBpbmcgUG9uZyBBQjEfMB0GA1UEAxMWdGVzdGxvZ2luLnBpbmdwb25nLm5ldDAeFw0wOTEwMjMxNDQzMzJaFw0zNzAzMDkxNDQzMzJaMG0xCzAJBgNVBAYTAlNFMRIwEAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEVMBMGA1UEChMMUGluZyBQb25nIEFCMR8wHQYDVQQDExZ0ZXN0bG9naW4ucGluZ3BvbmcubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6dhooZcjE/oW7x5ZaNVwI1LJkbTiteSL4MEXIzKON30KqIE6N6eJx/0WDiWnUUfki5AK+XmmF9SdWPZCa8KNKNgI5rSyfe3D0h/lj1TmU9yZTwmUJMjzrbedg+aJE4lRcNgom9DGAzSORv7XALOgVt1Al3s2c2vcTWQLjqHEFlwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAEF1gFqvHAbKGyRba1AtKpnkcKqJ9uLQfpwMNhSXHZ5PyPt6Tmqu68dyJ8uIoEIIP5bjJKSayWSP2xhZnRJrRR8M4B/4mSRkMW02qzabDc7dqzozELjjwZQf8SA1h5UNZqIVMP4uLAeUwCTHW0wK7Pc6Jp2zQvb/zJqzixi/LNgu</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://testlogin.pingpong.net/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <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 25d6fc39..13accbdb 100644
--- a/swamid-fiv-test.mxml
+++ b/swamid-fiv-test.mxml
@@ -4,8 +4,8 @@
    <xi:include href="swamid-1.0/idptest.test.it.gu.se.xml"/>
    <xi:include href="swamid-1.0/flax.nettst.chalmers.se.xml"/>
    <xi:include href="fiv/aprikos.pingpong.net.xml"/>
-   <xi:include href="fiv/testlogin.pingpong.net.xml"/>
    <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"/>
+   <xi:include href="fiv/pingpongtest-vir-1.test.it.gu.se.xml"/>
+   <xi:include href="fiv/idp-test.pingpong.net.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3