1 files changed, 7 insertions, 16 deletions
diff --git a/fiv/login.hjarntorget.net-simplesaml-saml2-idp-metadata.php.xml b/fiv/login.hjarntorget.net-simplesaml-saml2-idp-metadata.php.xml
index de06d622..4719806f 100644
--- a/fiv/login.hjarntorget.net-simplesaml-saml2-idp-metadata.php.xml
+++ b/fiv/login.hjarntorget.net-simplesaml-saml2-idp-metadata.php.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-entityID="https://login.hjarntorget.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">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.hjarntorget.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>MIIFMDCCBBigAwIBAgIQE0OBgn2Ai6BKmdwive6MkTANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAxMYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA5MTAwODAwMDAwMFoXDTExMTAwODIzNTk1OVowge8xCzAJBgNVBAYTAlNFMQ8wDQYDVQQREwY0MDMgMzExETAPBgNVBAgTCEdvdGVib3JnMREwDwYDVQQHEwhHb3RlYm9yZzEaMBgGA1UECRMRUm9zZW5sdW5kc2dhdGFuIDQxFzAVBgNVBAoTDkdvdGVib3JncyBzdGFkMRUwEwYDVQQLEwxJbnRyYXNlcnZpY2UxITAfBgNVBAsTGEhvc3RlZCBieSBQS0ktUGFydG5lciBBQjEaMBgGA1UECxMRQ29tb2RvIFByZW1pdW1TU0wxHjAcBgNVBAMTFWxvZ2luLmhqYXJudG9yZ2V0Lm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqVAL1EI9DLyFbS3I6J+oiKh3fBDrbYQyP0/EMcJ9tYR8h8vLexFrrLeXrojs/kMWyiHbxfvUDD1M2W13mzefA8MncMJGycY+Fwa8YfOZjA8UGseiAGv+lxMWdBliKrmjILPmcRRzNX0wQXySz3qk4ZITNQu1VPNx6QcNxDVE4B8CAwEAAaOCAb0wggG5MB8GA1UdIwQYMBaAFDBD3GTNGVyp8xnSNwmWkZ4M6NY9MB0GA1UdDgQWBBRk8ybJcwP9JXz5tPrY+skAJmvl+DAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQ
+          <ds:X509Certificate>MIIFMDCCBBigAwIBAgIQE0OBgn2Ai6BKmdwive6MkTANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAxMYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA5MTAwODAwMDAwMFoXDTExMTAwODIzNTk1OVowge8xCzAJBgNVBAYTAlNFMQ8wDQYDVQQREwY0MDMgMzExETAPBgNVBAgTCEdvdGVib3JnMREwDwYDVQQHEwhHb3RlYm9yZzEaMBgGA1UECRMRUm9zZW5sdW5kc2dhdGFuIDQxFzAVBgNVBAoTDkdvdGVib3JncyBzdGFkMRUwEwYDVQQLEwxJbnRyYXNlcnZpY2UxITAfBgNVBAsTGEhvc3RlZCBieSBQS0ktUGFydG5lciBBQjEaMBgGA1UECxMRQ29tb2RvIFByZW1pdW1TU0wxHjAcBgNVBAMTFWxvZ2luLmhqYXJudG9yZ2V0Lm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqVAL1EI9DLyFbS3I6J+oiKh3fBDrbYQyP0/EMcJ9tYR8h8vLexFrrLeXrojs/kMWyiHbxfvUDD1M2W13mzefA8MncMJGycY+Fwa8YfOZjA8UGseiAGv+lxMWdBliKrmjILPmcRRzNX0wQXySz3qk4ZITNQu1VPNx6QcNxDVE4B8CAwEAAaOCAb0wggG5MB8GA1UdIwQYMBaAFDBD3GTNGVyp8xnSNwmWkZ4M6NY9MB0GA1UdDgQWBBRk8ybJcwP9JXz5tPrY+skAJmvl+DAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQ
 cDAQYIKwYBBQUHAwIwRgYDVR0gBD8wPTA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLm5ldC9DUFMwfwYDVR0fBHgwdjA6oDigNoY0aHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNlc18yLmNybDA4oDagNIYyaHR0cDovL2NybC5jb21vZG8ubmV0L0FBQUNlcnRpZmljYXRlU2VydmljZXNfMi5jcmwwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wOwYDVR0RBDQwMoIVbG9naW4uaGphcm50b3JnZXQubmV0ghl3d3cubG9naW4uaGphcm50b3JnZXQubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQCD2Tg3b1HVk8jzQAJOPlorQ3LPv2VWA9pLtAHzWiqO/9l3tGFS3rwu0YQB0kwqPX85AmCHAPJILCBn49tujoXuAme/e/cLIiUgBqjsUWnBAutLVmzx6r28smaQkBbSOXyaFQSpfykzJ24WjWWSK3/ughOWzX1gR9gbsR+lhSwjwwiB93xZa6c3Hj3wQmMEn27W4+FSLHG4CYkBwvy5N8QPL86dxnQ7MKlQgtVd0f70UPwE0gp0HO5n+gl6nWtKY8BJ88vzYm2qvDRKid4dvohtoZ6Z/Qyg9e7M92ooy92dRIJ4hI3NHEHHPhYM5oqAFrtQ8HKESPzF2dB2CCPEM99j</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -15,20 +12,14 @@ cDAQYIKwYBBQUHAwIwRgYDVR0gBD8wPTA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cH
     <KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-
-<ds:X509Certificate>MIIFMDCCBBigAwIBAgIQE0OBgn2Ai6BKmdwive6MkTANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAxMYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA5MTAwODAwMDAwMFoXDTExMTAwODIzNTk1OVowge8xCzAJBgNVBAYTAlNFMQ8wDQYDVQQREwY0MDMgMzExETAPBgNVBAgTCEdvdGVib3JnMREwDwYDVQQHEwhHb3RlYm9yZzEaMBgGA1UECRMRUm9zZW5sdW5kc2dhdGFuIDQxFzAVBgNVBAoTDkdvdGVib3JncyBzdGFkMRUwEwYDVQQLEwxJbnRyYXNlcnZpY2UxITAfBgNVBAsTGEhvc3RlZCBieSBQS0ktUGFydG5lciBBQjEaMBgGA1UECxMRQ29tb2RvIFByZW1pdW1TU0wxHjAcBgNVBAMTFWxvZ2luLmhqYXJudG9yZ2V0Lm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqVAL1EI9DLyFbS3I6J+oiKh3fBDrbYQyP0/EMcJ9tYR8h8vLexFrrLeXrojs/kMWyiHbxfvUDD1M2W13mzefA8MncMJGycY+Fwa8YfOZjA8UGseiAGv+lxMWdBliKrmjILPmcRRzNX0wQXySz3qk4ZITNQu1VPNx6QcNxDVE4B8CAwEAAaOCAb0wggG5MB8GA1UdIwQYMBaAFDBD3GTNGVyp8xnSNwmWkZ4M6NY9MB0GA1UdDgQWBBRk8ybJcwP9JXz5tPrY+skAJmvl+DAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQ
+          <ds:X509Certificate>MIIFMDCCBBigAwIBAgIQE0OBgn2Ai6BKmdwive6MkTANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAxMYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA5MTAwODAwMDAwMFoXDTExMTAwODIzNTk1OVowge8xCzAJBgNVBAYTAlNFMQ8wDQYDVQQREwY0MDMgMzExETAPBgNVBAgTCEdvdGVib3JnMREwDwYDVQQHEwhHb3RlYm9yZzEaMBgGA1UECRMRUm9zZW5sdW5kc2dhdGFuIDQxFzAVBgNVBAoTDkdvdGVib3JncyBzdGFkMRUwEwYDVQQLEwxJbnRyYXNlcnZpY2UxITAfBgNVBAsTGEhvc3RlZCBieSBQS0ktUGFydG5lciBBQjEaMBgGA1UECxMRQ29tb2RvIFByZW1pdW1TU0wxHjAcBgNVBAMTFWxvZ2luLmhqYXJudG9yZ2V0Lm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqVAL1EI9DLyFbS3I6J+oiKh3fBDrbYQyP0/EMcJ9tYR8h8vLexFrrLeXrojs/kMWyiHbxfvUDD1M2W13mzefA8MncMJGycY+Fwa8YfOZjA8UGseiAGv+lxMWdBliKrmjILPmcRRzNX0wQXySz3qk4ZITNQu1VPNx6QcNxDVE4B8CAwEAAaOCAb0wggG5MB8GA1UdIwQYMBaAFDBD3GTNGVyp8xnSNwmWkZ4M6NY9MB0GA1UdDgQWBBRk8ybJcwP9JXz5tPrY+skAJmvl+DAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQ
 cDAQYIKwYBBQUHAwIwRgYDVR0gBD8wPTA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLm5ldC9DUFMwfwYDVR0fBHgwdjA6oDigNoY0aHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNlc18yLmNybDA4oDagNIYyaHR0cDovL2NybC5jb21vZG8ubmV0L0FBQUNlcnRpZmljYXRlU2VydmljZXNfMi5jcmwwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wOwYDVR0RBDQwMoIVbG9naW4uaGphcm50b3JnZXQubmV0ghl3d3cubG9naW4uaGphcm50b3JnZXQubmV0MA0GCSqGSIb3DQEBBQUAA4IBAQCD2Tg3b1HVk8jzQAJOPlorQ3LPv2VWA9pLtAHzWiqO/9l3tGFS3rwu0YQB0kwqPX85AmCHAPJILCBn49tujoXuAme/e/cLIiUgBqjsUWnBAutLVmzx6r28smaQkBbSOXyaFQSpfykzJ24WjWWSK3/ughOWzX1gR9gbsR+lhSwjwwiB93xZa6c3Hj3wQmMEn27W4+FSLHG4CYkBwvy5N8QPL86dxnQ7MKlQgtVd0f70UPwE0gp0HO5n+gl6nWtKY8BJ88vzYm2qvDRKid4dvohtoZ6Z/Qyg9e7M92ooy92dRIJ4hI3NHEHHPhYM5oqAFrtQ8HKESPzF2dB2CCPEM99j</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <SingleLogoutService
-Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
-Location="https://login.hjarntorget.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="https://login.hjarntorget.net/simplesaml/saml2/idp/SSOService.php"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.hjarntorget.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="https://login.hjarntorget.net/simplesaml/saml2/idp/SSOService.php"/>
   </IDPSSODescriptor>
   <ContactPerson contactType="technical">
     <GivenName>Palle</GivenName>