From c36ee4048353973998d015b525ee874c6960ed08 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Mon, 19 Jun 2017 12:41:33 +0200
Subject: Resolved SWAMID-100

---
 .../beta-bibliometrics.kib.ki.se-shibboleth.xml    | 78 ++++++++++++++++++++++
 swamid-ki-sll-1.0.mxml                             |  1 +
 swamid-sp-2.0.mxml                                 |  1 +
 3 files changed, 80 insertions(+)
 create mode 100644 swamid-2.0/beta-bibliometrics.kib.ki.se-shibboleth.xml

diff --git a/swamid-2.0/beta-bibliometrics.kib.ki.se-shibboleth.xml b/swamid-2.0/beta-bibliometrics.kib.ki.se-shibboleth.xml
new file mode 100644
index 00000000..fc7f1217
--- /dev/null
+++ b/swamid-2.0/beta-bibliometrics.kib.ki.se-shibboleth.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta-bibliometrics.kib.ki.se/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://beta-bibliometrics.kib.ki.se/Shibboleth.sso/Login/KI"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://beta-bibliometrics.kib.ki.se/Shibboleth.sso/Login/int.sll.se"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://beta-bibliometrics.kib.ki.se/Shibboleth.sso/Login/acc.sll.se"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://beta-bibliometrics.kib.ki.se/Shibboleth.sso/Login/idp.sll.se"/>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>beta-bibliometrics.kib.ki.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=beta-bibliometrics.kib.ki.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIJANDqp3TjFQDzMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
+BAMTHGJldGEtYmlibGlvbWV0cmljcy5raWIua2kuc2UwHhcNMTcwNjE2MDcyMTM2
+WhcNMjcwNjE0MDcyMTM2WjAnMSUwIwYDVQQDExxiZXRhLWJpYmxpb21ldHJpY3Mu
+a2liLmtpLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvVjsEco8
++9ssXpxVafR3PgShlz8VwbvV3eDbDHSSVQmcQzg0GkqUlairkvU94nJcm1kTX3Pd
++VIojgRxTFkrGoU+X+VOLk8vyEmCSCnIwMJqqxJ4aVBsPVdSeJ2mMTHx01QIiSgI
+OlaqUQDXODy24DWaywm2nY3PqdDiBwGf4l7nPVW4hiblaeZjgG8RHPCOV5fV9mRY
+Gr348cBIJBqN990jMSyIuhgV9GxDul5TnB+BTH3safIK5jwriGeFCFYVuOfk89Hl
+G5FlXdYPYkt9IjTog+FViNiC81TGfoTntFvt6utRxLY2UG7oMH2d7v0iDEtgC94B
+DFAi1MgkDtDsrwIDAQABo0owSDAnBgNVHREEIDAeghxiZXRhLWJpYmxpb21ldHJp
+Y3Mua2liLmtpLnNlMB0GA1UdDgQWBBTGmbQ8kWo7b34bBKyqoqjr/J9z3TANBgkq
+hkiG9w0BAQUFAAOCAQEAoZJVUhfWUBxdCdQ0QvJAO/Jkz5c59cmzEG+9YAHyjxeO
+6c2AOwn2SAnPZl34Eh1n69ZgBiMn/832IKYThcFArSEWm/g01VlwHubtikx9q0Sk
+pqNhg5GUfMN1R71FH1Tfvve9x63JC1rgUme+R2wJQmJNoxI8dpmV3nUUkX7oJIBo
+OTRG4YRI4Ul3fPXaTgN0TrbmbRnRShHkmyfVpx2pwHuNjhtSVgcpEy6+QH8BFbLp
+7FYDAUCfuHAr9eyp34GxX6yh/7MNO33gmrabS+Murq2LvfDtTItWBTn9BL9ufcZh
+Q+yuodlrIJz97uWf2/BrLomKkY8v2rh8mscTwGIm+Q==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta-bibliometrics.kib.ki.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta-bibliometrics.kib.ki.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://beta-bibliometrics.kib.ki.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta-bibliometrics.kib.ki.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta-bibliometrics.kib.ki.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta-bibliometrics.kib.ki.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://beta-bibliometrics.kib.ki.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta-bibliometrics.kib.ki.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta-bibliometrics.kib.ki.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta-bibliometrics.kib.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta-bibliometrics.kib.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://beta-bibliometrics.kib.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta-bibliometrics.kib.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta-bibliometrics.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-ki-sll-1.0.mxml b/swamid-ki-sll-1.0.mxml
index 7af18f6d..3140c0ef 100644
--- a/swamid-ki-sll-1.0.mxml
+++ b/swamid-ki-sll-1.0.mxml
@@ -8,4 +8,5 @@
   <xi:include href="swamid-ki-sll-1.0/beta.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-ki-sll-1.0/pubtest.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-ki-sll-1.0/idpext.test.ek.sll.se-neas.xml"/>
+  <xi:include href="swamid-2.0/beta-bibliometrics.kib.ki.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index b44ab4e7..c5cbf125 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -653,4 +653,5 @@
   <xi:include href="swamid-2.0/medlem.disk.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml"/>
   <xi:include href="swamid-2.0/crowd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml"/>
   <xi:include href="swamid-2.0/juridicum.blackboard.com-auth-saml-saml-SSO.xml"/>
+  <xi:include href="swamid-2.0/beta-bibliometrics.kib.ki.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3