diff options
| -rw-r--r-- | swamid-edugain/weblogin.uu.se-idp-shibboleth.xml | 44 |
1 files changed, 20 insertions, 24 deletions
diff --git a/swamid-edugain/weblogin.uu.se-idp-shibboleth.xml b/swamid-edugain/weblogin.uu.se-idp-shibboleth.xml index a5230e74..6ac2d1aa 100644 --- a/swamid-edugain/weblogin.uu.se-idp-shibboleth.xml +++ b/swamid-edugain/weblogin.uu.se-idp-shibboleth.xml @@ -13,6 +13,11 @@ <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support"> <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue> <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue> + <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue> + <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue> + <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue> + <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue> + <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue> </samla:Attribute> </mdattr:EntityAttributes> </md:Extensions> @@ -45,13 +50,15 @@ <mdui:IPHint>2001:6b0:B::/48</mdui:IPHint> <mdui:IPHint>2001:6b0:C::/48</mdui:IPHint> <mdui:GeolocationHint>geo:59.857583,17.629500</mdui:GeolocationHint> + <mdui:IPHint>193.11.8.0/21</mdui:IPHint> + <mdui:IPHint>212.25.152.0/22</mdui:IPHint> + <mdui:GeolocationHint>geo:57.639379,18.288630</mdui:GeolocationHint> </mdui:DiscoHints> </md:Extensions> <md:KeyDescriptor use="signing"> <ds:KeyInfo> <ds:X509Data> - <ds:X509Certificate> -MIIDJDCCAgygAwIBAgIVAInKug+xwEy0EG2M50yGgyeNRyMAMA0GCSqGSIb3DQEB + <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVAInKug+xwEy0EG2M50yGgyeNRyMAMA0GCSqGSIb3DQEB CwUAMBkxFzAVBgNVBAMMDndlYmxvZ2luLnV1LnNlMB4XDTE2MDcxMDIxMTQwNloX DTI2MDcxMDIxMTQwNlowGTEXMBUGA1UEAwwOd2VibG9naW4udXUuc2UwggEiMA0G CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCIA2BeHbxhYxkqjgv0FQn/7FTDsU5j @@ -67,16 +74,14 @@ FWIIM+XK5adY7qMc0/drTMg1jQLrvnwy9bq4vBol4M+D2i1s0xPpsauRnzL4szD4 0QCOTfTMjpSlY0tP2OeqC+dyaAL5uz5Of0ENuVrEvAioa4pZfOCuSGd6Zbwe1ZF/ vJKjAzCDovXhHnUqRk6Er9b8ljHwu1h0ibvfCaWaEguHipnKLE9cjNVRniqpAAoN 43MwXOY7v90kCFH9D/bGcQuzUWMhmP8FQJ1YDMNwE/FlOM1HGUwQpYRgsojptuGU -QyWWjWUBKLPHNYGobKHpdgm0No36NMr10RC92WyaN72cgVbjN1nmHQ== - </ds:X509Certificate> +QyWWjWUBKLPHNYGobKHpdgm0No36NMr10RC92WyaN72cgVbjN1nmHQ==</ds:X509Certificate> </ds:X509Data> </ds:KeyInfo> </md:KeyDescriptor> <md:KeyDescriptor use="signing"> <ds:KeyInfo> <ds:X509Data> - <ds:X509Certificate> -MIIDJDCCAgygAwIBAgIVAMAqC57ZiqOY9LvU7W7YjaZ2U8GtMA0GCSqGSIb3DQEB + <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVAMAqC57ZiqOY9LvU7W7YjaZ2U8GtMA0GCSqGSIb3DQEB CwUAMBkxFzAVBgNVBAMMDndlYmxvZ2luLnV1LnNlMB4XDTE2MDcxMDIwNDgxNloX DTI2MDcxMDIwNDgxNlowGTEXMBUGA1UEAwwOd2VibG9naW4udXUuc2UwggEiMA0G CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXwo9+t6G/fp7dFcap5s8vygdIGWEx @@ -92,16 +97,14 @@ l3rjpj5tpayQ1NrEbidLiyUQD4m9PBS/zTsxIB9TJ5r/Ye3jf39+9plG51tQALUq Psz27W4CGdEe0CBeiGTJ0gnlSVNqezXsRzk+EXTkzQbQ4sov9eWeWe9c/5Cbyf6l wRUoSoZ5j0Lo9+03ZiNBBD2PRpfyrXjXuIEw5xDeE2YR/2W++3J79hWjydJPlzl/ K0lTdUS/JfVbNpxufJxPp/R1iLjU4hypLi+N3fh4xh0HOdLskIV+xCPzwn6uLsPG -AbrZzItGWOuUunKpQBejEO5F+q+z1dU41x2m4oONHzdQ+3IX75GUEg== - </ds:X509Certificate> +AbrZzItGWOuUunKpQBejEO5F+q+z1dU41x2m4oONHzdQ+3IX75GUEg==</ds:X509Certificate> </ds:X509Data> </ds:KeyInfo> </md:KeyDescriptor> <md:KeyDescriptor use="encryption"> <ds:KeyInfo> <ds:X509Data> - <ds:X509Certificate> -MIIDIzCCAgugAwIBAgIUU/H0eVODSSmZoDRn6Lz3GR/1kzMwDQYJKoZIhvcNAQEL + <ds:X509Certificate>MIIDIzCCAgugAwIBAgIUU/H0eVODSSmZoDRn6Lz3GR/1kzMwDQYJKoZIhvcNAQEL BQAwGTEXMBUGA1UEAwwOd2VibG9naW4udXUuc2UwHhcNMTYwNzEwMjEwNDMzWhcN MjYwNzEwMjEwNDMzWjAZMRcwFQYDVQQDDA53ZWJsb2dpbi51dS5zZTCCASIwDQYJ KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKvjMIOzZJS4B6CpNZ2aAcMlHDPloeGm @@ -117,8 +120,7 @@ EcrQCroT1i2x2ajBkQ/4TVge2F9KHgiiKfgEG8saqdgTgwq3wP6UPGTMwgdMIlAX AN16kAibmTOZ4Kx+yqy+roFj919i9uPI998TlXJG85LpjqsX+gDoVzKw68F2fw8W Vgl9zHmoBnf765evetN8aJkQ/t2nNkqHiV83LXQ80fdtu52T2lkb6GM9nXN81jNt OiJ3wNKvx2hkOJqEs+p9ESI8IiNxjPyjdk5V9VlIl65W0WO1WfrT0qur5NhdZsl+ -nQPiHsyW3apD4+IJzI2nGQfeL4XO6MPUPVvn+7TiduFaCe+TXJQW - </ds:X509Certificate> +nQPiHsyW3apD4+IJzI2nGQfeL4XO6MPUPVvn+7TiduFaCe+TXJQW</ds:X509Certificate> </ds:X509Data> </ds:KeyInfo> </md:KeyDescriptor> @@ -141,8 +143,7 @@ nQPiHsyW3apD4+IJzI2nGQfeL4XO6MPUPVvn+7TiduFaCe+TXJQW <md:KeyDescriptor use="signing"> <ds:KeyInfo> <ds:X509Data> - <ds:X509Certificate> -MIIDJDCCAgygAwIBAgIVAInKug+xwEy0EG2M50yGgyeNRyMAMA0GCSqGSIb3DQEB + <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVAInKug+xwEy0EG2M50yGgyeNRyMAMA0GCSqGSIb3DQEB CwUAMBkxFzAVBgNVBAMMDndlYmxvZ2luLnV1LnNlMB4XDTE2MDcxMDIxMTQwNloX DTI2MDcxMDIxMTQwNlowGTEXMBUGA1UEAwwOd2VibG9naW4udXUuc2UwggEiMA0G CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCIA2BeHbxhYxkqjgv0FQn/7FTDsU5j @@ -158,16 +159,14 @@ FWIIM+XK5adY7qMc0/drTMg1jQLrvnwy9bq4vBol4M+D2i1s0xPpsauRnzL4szD4 0QCOTfTMjpSlY0tP2OeqC+dyaAL5uz5Of0ENuVrEvAioa4pZfOCuSGd6Zbwe1ZF/ vJKjAzCDovXhHnUqRk6Er9b8ljHwu1h0ibvfCaWaEguHipnKLE9cjNVRniqpAAoN 43MwXOY7v90kCFH9D/bGcQuzUWMhmP8FQJ1YDMNwE/FlOM1HGUwQpYRgsojptuGU -QyWWjWUBKLPHNYGobKHpdgm0No36NMr10RC92WyaN72cgVbjN1nmHQ== - </ds:X509Certificate> +QyWWjWUBKLPHNYGobKHpdgm0No36NMr10RC92WyaN72cgVbjN1nmHQ==</ds:X509Certificate> </ds:X509Data> </ds:KeyInfo> </md:KeyDescriptor> <md:KeyDescriptor use="signing"> <ds:KeyInfo> <ds:X509Data> - <ds:X509Certificate> -MIIDJDCCAgygAwIBAgIVAMAqC57ZiqOY9LvU7W7YjaZ2U8GtMA0GCSqGSIb3DQEB + <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVAMAqC57ZiqOY9LvU7W7YjaZ2U8GtMA0GCSqGSIb3DQEB CwUAMBkxFzAVBgNVBAMMDndlYmxvZ2luLnV1LnNlMB4XDTE2MDcxMDIwNDgxNloX DTI2MDcxMDIwNDgxNlowGTEXMBUGA1UEAwwOd2VibG9naW4udXUuc2UwggEiMA0G CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXwo9+t6G/fp7dFcap5s8vygdIGWEx @@ -183,16 +182,14 @@ l3rjpj5tpayQ1NrEbidLiyUQD4m9PBS/zTsxIB9TJ5r/Ye3jf39+9plG51tQALUq Psz27W4CGdEe0CBeiGTJ0gnlSVNqezXsRzk+EXTkzQbQ4sov9eWeWe9c/5Cbyf6l wRUoSoZ5j0Lo9+03ZiNBBD2PRpfyrXjXuIEw5xDeE2YR/2W++3J79hWjydJPlzl/ K0lTdUS/JfVbNpxufJxPp/R1iLjU4hypLi+N3fh4xh0HOdLskIV+xCPzwn6uLsPG -AbrZzItGWOuUunKpQBejEO5F+q+z1dU41x2m4oONHzdQ+3IX75GUEg== - </ds:X509Certificate> +AbrZzItGWOuUunKpQBejEO5F+q+z1dU41x2m4oONHzdQ+3IX75GUEg==</ds:X509Certificate> </ds:X509Data> </ds:KeyInfo> </md:KeyDescriptor> <md:KeyDescriptor use="encryption"> <ds:KeyInfo> <ds:X509Data> - <ds:X509Certificate> -MIIDIzCCAgugAwIBAgIUU/H0eVODSSmZoDRn6Lz3GR/1kzMwDQYJKoZIhvcNAQEL + <ds:X509Certificate>MIIDIzCCAgugAwIBAgIUU/H0eVODSSmZoDRn6Lz3GR/1kzMwDQYJKoZIhvcNAQEL BQAwGTEXMBUGA1UEAwwOd2VibG9naW4udXUuc2UwHhcNMTYwNzEwMjEwNDMzWhcN MjYwNzEwMjEwNDMzWjAZMRcwFQYDVQQDDA53ZWJsb2dpbi51dS5zZTCCASIwDQYJ KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKvjMIOzZJS4B6CpNZ2aAcMlHDPloeGm @@ -208,8 +205,7 @@ EcrQCroT1i2x2ajBkQ/4TVge2F9KHgiiKfgEG8saqdgTgwq3wP6UPGTMwgdMIlAX AN16kAibmTOZ4Kx+yqy+roFj919i9uPI998TlXJG85LpjqsX+gDoVzKw68F2fw8W Vgl9zHmoBnf765evetN8aJkQ/t2nNkqHiV83LXQ80fdtu52T2lkb6GM9nXN81jNt OiJ3wNKvx2hkOJqEs+p9ESI8IiNxjPyjdk5V9VlIl65W0WO1WfrT0qur5NhdZsl+ -nQPiHsyW3apD4+IJzI2nGQfeL4XO6MPUPVvn+7TiduFaCe+TXJQW - </ds:X509Certificate> +nQPiHsyW3apD4+IJzI2nGQfeL4XO6MPUPVvn+7TiduFaCe+TXJQW</ds:X509Certificate> </ds:X509Data> </ds:KeyInfo> </md:KeyDescriptor> |