From fd6e3bac107e0a472675b0c8c2b7f3c710d3e32d Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Mon, 23 Sep 2013 07:59:51 +0200
Subject: resolves SWAMIDOPS-7035

---
 ...ibboleth.msacademicverify.com-shibboleth-sp.xml | 103 +++++++++++----------
 1 file changed, 53 insertions(+), 50 deletions(-)

diff --git a/swamid-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml b/swamid-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml
index d33b494d..a2f80f67 100644
--- a/swamid-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml
+++ b/swamid-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.msacademicverify.com/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Microsoft Academic Verification Engine</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
+<EntityDescriptor entityID="https://shibboleth.msacademicverify.com/shibboleth-sp" xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+	<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+		<md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+			<mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+				<mdui:DisplayName xml:lang="en">Microsoft Academic Verification Engine</mdui:DisplayName>
+			</mdui:UIInfo>
+		</md:Extensions>
+		<md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+			<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+				<ds:X509Data>
+					<ds:X509Certificate>
 						MIIDXTCCAkWgAwIBAgIJAIPNJpzdV/nXMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
 						BAMTH3NoaWJib2xldGgubXNhY2FkZW1pY3ZlcmlmeS5jb20wHhcNMTMwNzEyMDc0
 						ODEwWhcNMTYwNzExMDc0ODEwWjAqMSgwJgYDVQQDEx9zaGliYm9sZXRoLm1zYWNh
@@ -30,42 +29,46 @@
 						oqv/H3FB0kYoLtSxthUd1GcV2kgO0brHNSobuzYi4yePTH9rkY8Kn/ZF5pDVu4SK
 						/Q==
 					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" index="1">
-      <ServiceName xml:lang="en">Microsoft Academic Verification Engine</ServiceName>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Microsoft</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Microsoft</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.microsoft.com/en/us/default.aspx</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Gerry O'Brien</GivenName>
-    <EmailAddress>Gerry.OBrien@microsoft.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Tushar Nene</GivenName>
-    <EmailAddress>Tushar.Nene@microsoft.com</EmailAddress>
-  </ContactPerson>
+				</ds:X509Data>
+			</ds:KeyInfo>
+		</md:KeyDescriptor>
+
+		<md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/SOAP"/>
+		<md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/Redirect"/>
+		<md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/POST"/>
+		<md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/Artifact"/>
+		
+		<md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML2/POST" index="1"/>
+		<md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+		<md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
+		<md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML2/ECP" index="4"/>
+		<md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML/POST" index="5"/>
+		<md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML/Artifact" index="6"/>
+
+		<AttributeConsumingService xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" index="1">
+			<ServiceName xml:lang="en">Microsoft Academic Verification Engine</ServiceName>
+			<RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+			<RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+			<RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+			<RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+		</AttributeConsumingService>
+
+	</SPSSODescriptor>
+	<Organization>
+		<OrganizationName xml:lang="en">Microsoft</OrganizationName>
+		<OrganizationDisplayName xml:lang="en">Microsoft</OrganizationDisplayName>
+		<OrganizationURL xml:lang="en">http://www.microsoft.com/en/us/default.aspx</OrganizationURL>
+	</Organization>
+	<ContactPerson contactType="technical">
+		<GivenName>AVE Support</GivenName>
+		<EmailAddress>avesupp@microsoft.com</EmailAddress>
+	</ContactPerson>
+	<ContactPerson contactType="administrative">
+		<GivenName>Tushar Nene</GivenName>
+		<EmailAddress>Tushar.Nene@microsoft.com</EmailAddress>
+	</ContactPerson>
+	<ContactPerson contactType="support">
+		<GivenName>AVE Support</GivenName>
+		<EmailAddress>avesupp@microsoft.com</EmailAddress>
+	</ContactPerson>
 </EntityDescriptor>
-- 
cgit v1.2.3