Skip to content
Snippets Groups Projects
Commit d36e8186 authored by andrew.costa's avatar andrew.costa
Browse files

Fixed merge conflicts

parents d3e63550 7f8a6479
No related tags found
1 merge request!281Resolve "Onboard CircleIn Service"
Hide whitespace changes
Inline Side-by-side
Showing
with 33 additions and 33 deletions
nefed.xml
+ 33
− 33
View file @ d36e8186
......@@ -17769,33 +17769,33 @@ bHwSoBy5hLPNALaEUoa5zPDwlixwRjFQTc5XXaRpgIjy/2gsL8+Y5QRhyXnLqgO67BlLYW/GuHE=</ds
<mdui:PrivacyStatementURL xml:lang="en">https://s3.amazonaws.com/myqvo/privacy_policy.pdf</mdui:PrivacyStatementURL>
<mdui:Logo height="85" width="141" xml:lang="en">https://www.circleinapp.com/hs-fs/hubfs/Logo.png?width=440&amp;name=Logo.png</mdui:Logo>
</mdui:UIInfo>
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5" />
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160" />
<DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224" />
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384" />
<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512" />
<SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1" />
<SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256" />
<SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1" />
<SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224" />
<SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256" />
<SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384" />
<SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512" />
<SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5" />
<SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160" />
<SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
<SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224" />
<SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" />
<SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384" />
<SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512" />
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5" />
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160" />
<alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224" />
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384" />
<alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512" />
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1" />
<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/2001/04/xmldsig-more#ecdsa-sha224" />
<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-sha384" />
<alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512" />
<alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5" />
<alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160" />
<alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
<alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224" />
<alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" />
<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-sha512" />
</Extensions>
<SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true" WantAssertionsSigned="true">
<KeyDescriptor use="signing">
<KeyInfo>
<X509Data>
<X509Certificate>
<ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>
MIIDyjCCArICCQCdH2qGk5RN7zANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMC
VVMxETAPBgNVBAgMCE1hcnlsYW5kMRIwEAYDVQQHDAlCYWx0aW1vcmUxETAPBgNV
BAoMCENpcmNsZUluMREwDwYDVQQLDAhDaXJjbGVJbjEiMCAGA1UEAwwZc2l0ZWFk
......@@ -17817,14 +17817,14 @@ bHwSoBy5hLPNALaEUoa5zPDwlixwRjFQTc5XXaRpgIjy/2gsL8+Y5QRhyXnLqgO67BlLYW/GuHE=</ds
RC3sWYinAGNhcWTOp4+xSKXrthNq0+xxnylXIrO8yRE/4rO08TwFYKm3RJ1+ZIKR
OSZJXgiZ1UPx8g44MrfkgnQNtEKPMhnkZ31iWy3SQt49LEUyHVYcCK2yda70FqiY
U75g4r3vBL243kc3BKw=
</X509Certificate>
</X509Data>
</KeyInfo>
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<KeyDescriptor use="encryption">
<KeyInfo>
<X509Data>
<X509Certificate>
<ds:KeyInfo>
<ds:X509Data>
<ds:X509Certificate>
MIIDyjCCArICCQCdH2qGk5RN7zANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMC
VVMxETAPBgNVBAgMCE1hcnlsYW5kMRIwEAYDVQQHDAlCYWx0aW1vcmUxETAPBgNV
BAoMCENpcmNsZUluMREwDwYDVQQLDAhDaXJjbGVJbjEiMCAGA1UEAwwZc2l0ZWFk
......@@ -17846,9 +17846,9 @@ bHwSoBy5hLPNALaEUoa5zPDwlixwRjFQTc5XXaRpgIjy/2gsL8+Y5QRhyXnLqgO67BlLYW/GuHE=</ds
RC3sWYinAGNhcWTOp4+xSKXrthNq0+xxnylXIrO8yRE/4rO08TwFYKm3RJ1+ZIKR
OSZJXgiZ1UPx8g44MrfkgnQNtEKPMhnkZ31iWy3SQt49LEUyHVYcCK2yda70FqiY
U75g4r3vBL243kc3BKw=
</X509Certificate>
</X509Data>
</KeyInfo>
</ds:X509Certificate>
</ds:X509Data>
</ds:KeyInfo>
</KeyDescriptor>
<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://siteadmin.circleinapp.com/saml2/3bde6493-6169-4511-89ab-f259d26f3b64/logout/" />
<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment