[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/rel...

[noreply at shibboleth.net]

Author: rdw
Date: Mon May  5 08:55:07 2014
New Revision: 5837

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5837&view=rev
Log:
IDP-390 As per discussion 5/5/14 inline certificates are Base64Encoded DER with no header/footer.  Fix failing tests

Modified:
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-inline.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicit.xml

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-inline.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-inline.xml?rev=5837&r1=5836&r2=5837&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-inline.xml (original)
+++ trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch-metadata-inline.xml Mon May  5 08:55:07 2014
@@ -9,12 +9,10 @@
     
     <metadata:MetadataFilter xsi:type="metadata:SignatureValidation" >
     <metadata:PublicKey>
-    -----BEGIN PUBLIC KEY-----
 MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCybIFg1nyYpi613JBKHO46CdXE
 M/VQFkT7ntLY5FmDWqLgkTE4kQ+e+Ie6HocRqOWOEAwYfGvrnqloOl9eSYar9huT
 fGZfLYVOcUamMWllRXp1j+gnzau97bsL81VzBnDadhGXkLloIKDH9CVawFPD733v
 bXjX7AEMft1eUn5QaQIDAQAB
------END PUBLIC KEY-----
     </metadata:PublicKey>
     </metadata:MetadataFilter>
 

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch.xml?rev=5837&r1=5836&r2=5837&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch.xml (original)
+++ trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/switch.xml Mon May  5 08:55:07 2014
@@ -6,7 +6,7 @@
 >
 <security:Credential 
     id="IdPCredential" xsi:type="security:X509Inline">
-    <security:Certificate>-----BEGIN CERTIFICATE-----
+    <security:Certificate>
 MIICrzCCAhgCAQAwDQYJKoZIhvcNAQEEBQAwgZ8xCzAJBgNVBAYTAkNIMUAwPgYDVQQKEzdTV0lU
 Q0ggLSBUZWxlaW5mb3JtYXRpa2RpZW5zdGUgZnVlciBMZWhyZSB1bmQgRm9yc2NodW5nMQwwCgYD
 VQQLEwNBQUkxIjAgBgNVBAMTGVNXSVRDSGFhaSBNZXRhZGF0YSBTaWduZXIxHDAaBgkqhkiG9w0B
@@ -20,7 +20,6 @@
 fhBlVCIuTixR1R6mYu/+4KUJWtHlRCOUZhSLFept8HxEvfwnuX9xm+Q6Ju/sOgmI1INuSstUGWwV
 y0AbpCphUDDmIh9A85ye8DrVaBHQrj5b/JEjCvkY0zhLJzgDzZ6btT40TuCnk2GpdAClu5SyCTiy
 56+zDYqPqg==
------END CERTIFICATE-----
     </security:Certificate>
 </security:Credential>
     </security:TrustEngine>

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicit.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicit.xml?rev=5837&r1=5836&r2=5837&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicit.xml (original)
+++ trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/security/trustengine/staticExplicit.xml Mon May  5 08:55:07 2014
@@ -1,33 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<security:TrustEngine id="testBean" xsi:type="security:StaticExplicitKeySignature" 
-xmlns:security="urn:mace:shibboleth:2.0:security"
+<security:TrustEngine id="testBean"
+	xsi:type="security:StaticExplicitKeySignature" xmlns:security="urn:mace:shibboleth:2.0:security"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd"
->
-<security:Credential 
-	id="IdPCredential" xsi:type="security:X509Inline">
-	<security:Certificate>-----BEGIN CERTIFICATE-----
-MIIDtTCCAp2gAwIBAgIJAPmsD+VGldyPMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
-BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
-aWRnaXRzIFB0eSBMdGQwHhcNMTQwNDExMTMzOTE4WhcNMjQwNDA4MTMzOTE4WjBF
-MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50
-ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB

[... 46 lines stripped ...]