1 files changed, 133 insertions, 122 deletions
diff --git a/swamid-1.0/login.hgo.se.xml b/swamid-1.0/login.hgo.se.xml
index f35d6f57..1751610d 100644
--- a/swamid-1.0/login.hgo.se.xml
+++ b/swamid-1.0/login.hgo.se.xml
@@ -1,122 +1,133 @@
-<EntityDescriptor entityID="https://login.hgo.se/idp/shibboleth"
-                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">hgo.se</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIEczCCA1ugAwIBAgIQRN6OrvFTveTduwPKe0I5UzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTA5MTEwNTAwMDAwMFoXDTEyMTEwNDIzNTk1OVowUjELMAkGA1UE
-BhMCU0UxHzAdBgNVBAoMFkjDtmdza29sYW4gcMOlIEdvdGxhbmQxCzAJBgNVBAsT
-AklUMRUwEwYDVQQDEwxsb2dpbi5oZ28uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDidESls2isxbvi097prIyqvtox/KwMpMojBfkMNyYtmPmeL0md
-2oWONosAlHKBCuq1l41wkDTeudwHEFy/XOJU7Io0UrYNgRsQkCgFAZvbqBn1QmBa
-NZUT/+mwTTrf0exuaX9zQmj1qUa8r2KRLOCTSdYSOUlr43RAqAfUw/kDqo5AW9dB
-KVlnMiSJbUHt3+jxKsdVeqmEk1U3nGniYMaWVDCLUTBTaQ1OD8PHWyJ+gILd4IR5
-lVyxgd5xd0k6UquMGKTLySYHPStwO4CYXufGfw5henDI8WSz/KUgEHRYb+r+8FwI
-ZxyOD3RetjtzajVHj3UD9CsN42oAYLJOpf5hAgMBAAGjggFfMIIBWzAfBgNVHSME
-GDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUVxqMUU/3GcGHu9Cj
-12nztLbItwYwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0w
-OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFwYDVR0RBBAwDoIMbG9naW4uaGdv
-LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQAzYenhbS0WSbiahgqAtSpiyZzCjuh3ZQI2
-P360IQITez7OiPkjX8c6Q1M/fRmyB6Ccp3R7iDb7HgpUaOQSluuwXBdKJHgZAh0N
-QfZvN4JzzyC0a5Uq6WxvBEXQT4odrf8pOGAPRYyYMbpQC/Z2PStD5t7tKgQ3wEZe
-ooyl48YZg+o9/llZBk0crUWtQvPjygXKMJusuKyHCGj11WaUp4wMreHoB63I8REa
-QE3c9r8gBZEuuAvMoNbGciSC/gIPrcLdSg/hM82+ucqDbpiJ/0lyqjw1jIev00Bq
-DvZgOd28CP4JMrqAydD3/fsE4F/1pU48DwLqn1EXyd0praxo505z
-
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-        
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
-                                   Location="https://login.hgo.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
-                                   index="1"/>
-
-        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                                   Location="https://login.hgo.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" 
-                                   index="2"/>
-                                   
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-
-        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" 
-                             Location="https://login.hgo.se/idp/profile/Shibboleth/SSO" />
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
-                             Location="https://login.hgo.se/idp/profile/SAML2/POST/SSO" />
-
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
-                             Location="https://login.hgo.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
-        
-        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
-                             Location="https://login.hgo.se/idp/profile/SAML2/Redirect/SSO" />
-    </IDPSSODescriptor>
-
-    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-
-        <Extensions>
-            <shibmd:Scope regexp="false">hgo.se</shibmd:Scope>
-        </Extensions>
-
-        <KeyDescriptor>
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>
-MIIEczCCA1ugAwIBAgIQRN6OrvFTveTduwPKe0I5UzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTA5MTEwNTAwMDAwMFoXDTEyMTEwNDIzNTk1OVowUjELMAkGA1UE
-BhMCU0UxHzAdBgNVBAoMFkjDtmdza29sYW4gcMOlIEdvdGxhbmQxCzAJBgNVBAsT
-AklUMRUwEwYDVQQDEwxsb2dpbi5oZ28uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDidESls2isxbvi097prIyqvtox/KwMpMojBfkMNyYtmPmeL0md
-2oWONosAlHKBCuq1l41wkDTeudwHEFy/XOJU7Io0UrYNgRsQkCgFAZvbqBn1QmBa
-NZUT/+mwTTrf0exuaX9zQmj1qUa8r2KRLOCTSdYSOUlr43RAqAfUw/kDqo5AW9dB
-KVlnMiSJbUHt3+jxKsdVeqmEk1U3nGniYMaWVDCLUTBTaQ1OD8PHWyJ+gILd4IR5
-lVyxgd5xd0k6UquMGKTLySYHPStwO4CYXufGfw5henDI8WSz/KUgEHRYb+r+8FwI
-ZxyOD3RetjtzajVHj3UD9CsN42oAYLJOpf5hAgMBAAGjggFfMIIBWzAfBgNVHSME
-GDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUVxqMUU/3GcGHu9Cj
-12nztLbItwYwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0w
-OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFwYDVR0RBBAwDoIMbG9naW4uaGdv
-LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQAzYenhbS0WSbiahgqAtSpiyZzCjuh3ZQI2
-P360IQITez7OiPkjX8c6Q1M/fRmyB6Ccp3R7iDb7HgpUaOQSluuwXBdKJHgZAh0N
-QfZvN4JzzyC0a5Uq6WxvBEXQT4odrf8pOGAPRYyYMbpQC/Z2PStD5t7tKgQ3wEZe
-ooyl48YZg+o9/llZBk0crUWtQvPjygXKMJusuKyHCGj11WaUp4wMreHoB63I8REa
-QE3c9r8gBZEuuAvMoNbGciSC/gIPrcLdSg/hM82+ucqDbpiJ/0lyqjw1jIev00Bq
-DvZgOd28CP4JMrqAydD3/fsE4F/1pU48DwLqn1EXyd0praxo505z
-
-                    </ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </KeyDescriptor>
-
-        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
-                          Location="https://login.hgo.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
-        
-        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
-                          Location="https://login.hgo.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
-        
-        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-        
-    </AttributeAuthorityDescriptor>
-    
-</EntityDescriptor>    
+<EntityDescriptor entityID="https://login.hgo.se/idp/shibboleth"
+                  xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+                  xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+                  xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+        <Extensions>
+            <shibmd:Scope regexp="false">hgo.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIEczCCA1ugAwIBAgIQRN6OrvFTveTduwPKe0I5UzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTA5MTEwNTAwMDAwMFoXDTEyMTEwNDIzNTk1OVowUjELMAkGA1UE
+BhMCU0UxHzAdBgNVBAoMFkjDtmdza29sYW4gcMOlIEdvdGxhbmQxCzAJBgNVBAsT
+AklUMRUwEwYDVQQDEwxsb2dpbi5oZ28uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDidESls2isxbvi097prIyqvtox/KwMpMojBfkMNyYtmPmeL0md
+2oWONosAlHKBCuq1l41wkDTeudwHEFy/XOJU7Io0UrYNgRsQkCgFAZvbqBn1QmBa
+NZUT/+mwTTrf0exuaX9zQmj1qUa8r2KRLOCTSdYSOUlr43RAqAfUw/kDqo5AW9dB
+KVlnMiSJbUHt3+jxKsdVeqmEk1U3nGniYMaWVDCLUTBTaQ1OD8PHWyJ+gILd4IR5
+lVyxgd5xd0k6UquMGKTLySYHPStwO4CYXufGfw5henDI8WSz/KUgEHRYb+r+8FwI
+ZxyOD3RetjtzajVHj3UD9CsN42oAYLJOpf5hAgMBAAGjggFfMIIBWzAfBgNVHSME
+GDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUVxqMUU/3GcGHu9Cj
+12nztLbItwYwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYw
+FAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0w
+OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFwYDVR0RBBAwDoIMbG9naW4uaGdv
+LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQAzYenhbS0WSbiahgqAtSpiyZzCjuh3ZQI2
+P360IQITez7OiPkjX8c6Q1M/fRmyB6Ccp3R7iDb7HgpUaOQSluuwXBdKJHgZAh0N
+QfZvN4JzzyC0a5Uq6WxvBEXQT4odrf8pOGAPRYyYMbpQC/Z2PStD5t7tKgQ3wEZe
+ooyl48YZg+o9/llZBk0crUWtQvPjygXKMJusuKyHCGj11WaUp4wMreHoB63I8REa
+QE3c9r8gBZEuuAvMoNbGciSC/gIPrcLdSg/hM82+ucqDbpiJ/0lyqjw1jIev00Bq
+DvZgOd28CP4JMrqAydD3/fsE4F/1pU48DwLqn1EXyd0praxo505z
+
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+                                   Location="https://login.hgo.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" 
+                                   index="1"/>
+
+        <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                                   Location="https://login.hgo.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" 
+                                   index="2"/>
+                                   
+        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+
+        <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" 
+                             Location="https://login.hgo.se/idp/profile/Shibboleth/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" 
+                             Location="https://login.hgo.se/idp/profile/SAML2/POST/SSO" />
+
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" 
+                             Location="https://login.hgo.se/idp/profile/SAML2/POST-SimpleSign/SSO" />
+        
+        <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" 
+                             Location="https://login.hgo.se/idp/profile/SAML2/Redirect/SSO" />
+    </IDPSSODescriptor>
+
+    <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+
+        <Extensions>
+            <shibmd:Scope regexp="false">hgo.se</shibmd:Scope>
+        </Extensions>
+
+        <KeyDescriptor>
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>
+MIIEczCCA1ugAwIBAgIQRN6OrvFTveTduwPKe0I5UzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTA5MTEwNTAwMDAwMFoXDTEyMTEwNDIzNTk1OVowUjELMAkGA1UE
+BhMCU0UxHzAdBgNVBAoMFkjDtmdza29sYW4gcMOlIEdvdGxhbmQxCzAJBgNVBAsT
+AklUMRUwEwYDVQQDEwxsb2dpbi5oZ28uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDidESls2isxbvi097prIyqvtox/KwMpMojBfkMNyYtmPmeL0md
+2oWONosAlHKBCuq1l41wkDTeudwHEFy/XOJU7Io0UrYNgRsQkCgFAZvbqBn1QmBa
+NZUT/+mwTTrf0exuaX9zQmj1qUa8r2KRLOCTSdYSOUlr43RAqAfUw/kDqo5AW9dB
+KVlnMiSJbUHt3+jxKsdVeqmEk1U3nGniYMaWVDCLUTBTaQ1OD8PHWyJ+gILd4IR5
+lVyxgd5xd0k6UquMGKTLySYHPStwO4CYXufGfw5henDI8WSz/KUgEHRYb+r+8FwI
+ZxyOD3RetjtzajVHj3UD9CsN42oAYLJOpf5hAgMBAAGjggFfMIIBWzAfBgNVHSME
+GDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUVxqMUU/3GcGHu9Cj
+12nztLbItwYwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYw
+FAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0w
+OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFwYDVR0RBBAwDoIMbG9naW4uaGdv
+LnNlMA0GCSqGSIb3DQEBBQUAA4IBAQAzYenhbS0WSbiahgqAtSpiyZzCjuh3ZQI2
+P360IQITez7OiPkjX8c6Q1M/fRmyB6Ccp3R7iDb7HgpUaOQSluuwXBdKJHgZAh0N
+QfZvN4JzzyC0a5Uq6WxvBEXQT4odrf8pOGAPRYyYMbpQC/Z2PStD5t7tKgQ3wEZe
+ooyl48YZg+o9/llZBk0crUWtQvPjygXKMJusuKyHCGj11WaUp4wMreHoB63I8REa
+QE3c9r8gBZEuuAvMoNbGciSC/gIPrcLdSg/hM82+ucqDbpiJ/0lyqjw1jIev00Bq
+DvZgOd28CP4JMrqAydD3/fsE4F/1pU48DwLqn1EXyd0praxo505z
+
+                    </ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+
+        <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" 
+                          Location="https://login.hgo.se:8443/idp/profile/SAML1/SOAP/AttributeQuery" />
+        
+        <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"
+                          Location="https://login.hgo.se:8443/idp/profile/SAML2/SOAP/AttributeQuery" />
+        
+        <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+        
+    </AttributeAuthorityDescriptor>
+ 
+    <Organization>
+    <OrganizationName xml:lang="en">HGO</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Högskolan på Gottland</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.hgo.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Joacim</GivenName>
+    <SurName>Breiler</SurName>
+    <EmailAddress>joacim.breiler@hgo.se</EmailAddress>
+  </ContactPerson>
+    
+</EntityDescriptor>