summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Berggren <jbn@klutt.se>2012-09-10 15:23:30 +0200
committerJohan Berggren <jbn@klutt.se>2012-09-10 15:23:30 +0200
commit2c58ab6d4b3e3d454dff6627fea45e455ea2ab00 (patch)
treec857fb310a7d10dfe1d8049c4c52863e32b3ad17
parent309f741c640312ca518592ea7b7b32d929d1df97 (diff)
Tagged research-and-education for ni.nordu.net
-rw-r--r--swamid-1.0/ni.nordu.net-pysaml2.xml12
-rw-r--r--swamid-testing-idp-1.0.mxml1
-rw-r--r--swamid-testing-sp-1.0.mxml1
3 files changed, 12 insertions, 2 deletions
diff --git a/swamid-1.0/ni.nordu.net-pysaml2.xml b/swamid-1.0/ni.nordu.net-pysaml2.xml
index 04749533..4a1de315 100644
--- a/swamid-1.0/ni.nordu.net-pysaml2.xml
+++ b/swamid-1.0/ni.nordu.net-pysaml2.xml
@@ -1,5 +1,15 @@
<?xml version='1.0' encoding='UTF-8'?>
-<md:EntityDescriptor entityID="https://ni.nordu.net/saml2/metadata/" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"><md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><md:KeyDescriptor><ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:X509Data><ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAI32hx6m/IFWMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+<md:EntityDescriptor entityID="https://ni.nordu.net/saml2/metadata/" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+ <md:Extensions>
+ <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+ <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion"
+ NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+ Name="http://macedir.org/entity-category">
+ <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+ </samla:Attribute>
+ </mdattr:EntityAttributes>
+ </md:Extensions>
+<md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><md:KeyDescriptor><ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:X509Data><ds:X509Certificate>MIIC6zCCAdOgAwIBAgIJAI32hx6m/IFWMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
BAMTDG5pLm5vcmR1Lm5ldDAeFw0xMjA4MzAxMjAyMTFaFw0yMjA4MjgxMjAyMTFa
MBcxFTATBgNVBAMTDG5pLm5vcmR1Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEP
ADCCAQoCggEBAKIsfzWwYgW2y9+K58VQi35/weisNzGlYYJbpYY8+AqGhtkSpB8D
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 5326e9ba..f5777649 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -86,5 +86,4 @@
<xi:include href="swamid-1.0/minastudier.ladok.umu.se-user-idp.xml"/>
<xi:include href="swamid-1.0/ladok3test.its.umu.se-user-idp.xml"/>
<xi:include href="swamid-1.0/nya-33.ladok.umu.se.xml"/>
- <xi:include href="swamid-1.0/ni.nordu.net-pysaml2.xml"/>
</EntitiesDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 9dc14d8e..a32b40a4 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -291,4 +291,5 @@
<xi:include href="swamid-1.0/ladok3-10.ladok.umu.se-user-idp.xml"/>
<xi:include href="swamid-1.0/nidev-consumer.nordu.net.xml"/>
<xi:include href="swamid-1.0/ladok3test.its.umu.se-gui-sp.xml"/>
+ <xi:include href="swamid-1.0/ni.nordu.net-pysaml2.xml"/>
</EntitiesDescriptor>