cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/3] cxf git commit: Updating systest keys from 1024 bit to 2048 bits
Date Tue, 20 Oct 2015 12:02:57 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 4370feeee -> 3b27225eb


Updating systest keys from 1024 bit to 2048 bits


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/62d70e97
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/62d70e97
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/62d70e97

Branch: refs/heads/master
Commit: 62d70e977895ae06494730d4f4f04282f0bbeb9e
Parents: 4370fee
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue Oct 20 12:05:55 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue Oct 20 12:05:55 2015 +0100

----------------------------------------------------------------------
 rt/ws/security/src/test/resources/alice.jks     | Bin 1861 -> 3984 bytes
 rt/ws/security/src/test/resources/cxfca.jks     | Bin 1306 -> 891 bytes
 systests/kerberos/src/test/resources/alice.jks  | Bin 2428 -> 3984 bytes
 systests/kerberos/src/test/resources/bob.jks    | Bin 2422 -> 3979 bytes
 .../cxf/systest/jaxrs/security/certs/alice.jks  | Bin 2428 -> 3984 bytes
 .../cxf/systest/jaxrs/security/certs/bob.jks    | Bin 2422 -> 3979 bytes
 .../cxf/systest/jaxrs/security/certs/cxfca.jks  | Bin 1306 -> 891 bytes
 .../jaxrs/security/certs/jwkPublicSet.txt       |   4 ++--
 .../src/test/resources/keys/alice.jks           | Bin 2428 -> 3984 bytes
 .../src/test/resources/keys/bob.jks             | Bin 2422 -> 3979 bytes
 .../src/test/resources/keys/cxfca.jks           | Bin 1306 -> 891 bytes
 .../src/test/resources/keys/alice.jks           | Bin 2428 -> 3984 bytes
 .../transports/src/test/resources/keys/bob.jks  | Bin 2422 -> 3979 bytes
 .../src/test/resources/keys/cxfca.jks           | Bin 1306 -> 891 bytes
 .../ws-rm/src/test/resources/certs/alice.jks    | Bin 2428 -> 3984 bytes
 systests/ws-rm/src/test/resources/certs/bob.jks | Bin 2422 -> 3979 bytes
 .../examples/common/CommonPasswordCallback.java |   1 +
 .../src/test/resources/alice.jks                | Bin 2428 -> 3984 bytes
 .../src/test/resources/bob.jks                  | Bin 2422 -> 3979 bytes
 .../src/test/resources/cxfca.jks                | Bin 1306 -> 891 bytes
 .../cxf/systest/wssec/examples/saml/client.xml  |   4 ++--
 .../wssec/examples/sts/cxf-symmetric.xml        |   6 +++---
 .../src/test/resources/sts.jks                  | Bin 0 -> 3980 bytes
 .../src/test/resources/sts.properties           |  21 +++++++++++++++++++
 .../src/test/resources/certs/alice.jks          | Bin 2428 -> 3984 bytes
 .../src/test/resources/certs/bob.jks            | Bin 2422 -> 3979 bytes
 .../src/test/resources/certs/cxfca.jks          | Bin 1306 -> 891 bytes
 .../src/test/resources/certs/xkms/bob.crt       | Bin 540 -> 932 bytes
 .../resources/certs/xkms/trusted_cas/cxfca.crt  | Bin 537 -> 829 bytes
 .../cxf/systest/ws/action/bob-modified.jks      | Bin 0 -> 2422 bytes
 .../systest/ws/action/bob-modified.properties   |  21 +++++++++++++++++++
 .../cxf/systest/ws/action/signature-server.xml  |   3 ++-
 32 files changed, 52 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/rt/ws/security/src/test/resources/alice.jks
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/resources/alice.jks b/rt/ws/security/src/test/resources/alice.jks
index 3a788c2..9b8c450 100644
Binary files a/rt/ws/security/src/test/resources/alice.jks and b/rt/ws/security/src/test/resources/alice.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/rt/ws/security/src/test/resources/cxfca.jks
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/resources/cxfca.jks b/rt/ws/security/src/test/resources/cxfca.jks
index accd45b..2473611 100644
Binary files a/rt/ws/security/src/test/resources/cxfca.jks and b/rt/ws/security/src/test/resources/cxfca.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/kerberos/src/test/resources/alice.jks
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/alice.jks b/systests/kerberos/src/test/resources/alice.jks
index 9f47a5c..9b8c450 100644
Binary files a/systests/kerberos/src/test/resources/alice.jks and b/systests/kerberos/src/test/resources/alice.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/kerberos/src/test/resources/bob.jks
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/resources/bob.jks b/systests/kerberos/src/test/resources/bob.jks
index 26df583..6744c7c 100644
Binary files a/systests/kerberos/src/test/resources/bob.jks and b/systests/kerberos/src/test/resources/bob.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/alice.jks
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/alice.jks
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/alice.jks
index 9f47a5c..9b8c450 100644
Binary files a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/alice.jks
and b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/alice.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/bob.jks
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/bob.jks
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/bob.jks
index 26df583..6744c7c 100644
Binary files a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/bob.jks
and b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/bob.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/cxfca.jks
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/cxfca.jks
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/cxfca.jks
index accd45b..2473611 100644
Binary files a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/cxfca.jks
and b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/cxfca.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt
b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt
index e8c30d9..87f5733 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt
@@ -16,7 +16,7 @@
             "kty":"RSA",
             "kid":"AliceCert",
             "x5c": [
-             "MIICGjCCAYOgAwIBAgIESVRgATANBgkqhkiG9w0BAQUFADAzMRMwEQYDVQQKEwphcGFjaGUub3JnMQwwCgYDVQQLEwNlbmcxDjAMBgNVBAMTBWN4ZmNhMB4XDTcwMDEwMTAwMDAwMFoXDTM4MDExOTAzMTQwN1owMzETMBEGA1UEChMKYXBhY2hlLm9yZzEMMAoGA1UECxMDZW5nMQ4wDAYDVQQDEwVhbGljZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvu747/VShQ85f16DGSc4Ixh9PVpGguyEqrCsK8q9XHOYX9l9/g5wEC6ZcR2FwfNsoaHcKNPjd5sSTzVtBWmQjfBEfIqwTR7vuihOxyNTwEzVwIJzvo7p8/aYxk+VdBtQxq4UweIcf/iFkUbM1cZ1oiXRQzciRBi+C1BQCQE0qzsCAwEAAaM7MDkwIQYDVR0SBBowGIIWTk9UX0ZPUl9QUk9EVUNUSU9OX1VTRTAUBgNVHREEDTALgglsb2NhbGhvc3QwDQYJKoZIhvcNAQEFBQADgYEAhLwkm+8psKt4gnbikGzV0TgpSWGcWxWKBi+z8tI2n6hFA5v1jVHHa4G9h3s0nxQ2TewzeR/k7gmgV2sI483NgrYHmTmLKaDBWza2pAuZuDhQH8GAEhJakFtKBP++EC9rNNpZnqqHxx3qb2tW25qRtBzDmK921gg9PMomMc7uqRQ="
+              "MIIDojCCAoqgAwIBAgIBIDANBgkqhkiG9w0BAQsFADAzMRMwEQYDVQQKDAphcGFjaGUub3JnMQwwCgYDVQQLDANlbmcxDjAMBgNVBAMMBWN4ZmNhMB4XDTE1MTAyMDA5NTM1N1oXDTI1MTAxNzA5NTM1N1owMzETMBEGA1UEChMKYXBhY2hlLm9yZzEMMAoGA1UECxMDZW5nMQ4wDAYDVQQDEwVhbGljZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMSBK+IlFaDphtJa96Vjt5et9KMEw/dIzDe+OfZQjAUSkZ1FQoWDaIOkrnbXq/7jfz7dgOx0QS9AMrgh7sEMnd0NGm1tmQr12Zxb9CIkIVFKTBQseCnJGn4Qctt24GVROqlogXs8/Og2NeSa8XJhnUwJFPoVG1QDHswVANlE6jS9TOXZG6fN5TyRwZwrzRVrcbDfUxV+t+HOTBeI/hrFlrJLYfPohZsGIckZvO7AwT6BH9A32L04HfZLGHFwtIjFKTXueC2R8BJZl/HQ8ctwr50L4wytowcpiQT1viJU9gj01xMkRR9wJ+ybenpciQw22wNn2BQ48B3t749Xg8h6v1MCAwEAAaOBwDCBvTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUcKtIwhA3fgWTH49HUGN0W2Jlbj8wYwYDVR0jBFwwWoAUf9/5nypuX3z3t7Lo8QRpkvj2uGOhN6Q1MDMxEzARBgNVBAoMCmFwYWNoZS5vcmcxDDAKBgNVBAsMA2VuZzEOMAwGA1UEAwwFY3hmY2GCCQDr8Tla2IcxaDANBgkqhkiG9w0BAQsFAAOCAQEAPnReJBRXZHTyKTt1Z/k+nLjALGO5h8pejvmqoOt8/i9jMghS+5Pdjel8b9+RFofdC7i88pUHt+ZGrZ
 vYEFXl/+UJFWjPt/X/QwrWKbDT95iFPJOSJxk0XL15HS7uKqEWaF2O9EOHndg5XR6YFYuSkHLA6PSsWVXsfgQ4WhTHgcSXz7pgeh7gdp8ItLJ7mBcqN1Jk94yd5BiEfo8Woyh+TVaFoWZcIgN2MfRTk9B75EWrkw5UsUoJ6/Dpq3+kqz+81DfUfTsmKgPWoT3y4UBSnPkFhF7uWguVKd/jUb6StXiNEIrwHYDxzJzBXK1nAFPnNQl+OzDE8J1BPf1pi/acAg=="
             ]
           },
           
@@ -24,7 +24,7 @@
             "kty":"RSA",
             "kid":"BobCert",
             "x5c": [
-             "MIICGDCCAYGgAwIBAgIESVRgAjANBgkqhkiG9w0BAQUFADAzMRMwEQYDVQQKEwphcGFjaGUub3JnMQwwCgYDVQQLEwNlbmcxDjAMBgNVBAMTBWN4ZmNhMB4XDTcwMDEwMTAwMDAwMFoXDTM4MDExOTAzMTQwN1owMTETMBEGA1UEChMKYXBhY2hlLm9yZzEMMAoGA1UECxMDZW5nMQwwCgYDVQQDEwNib2IwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAIUcy5V9ow7xb1GOI+5ub1YIApEvw7JSySBdYv9eeVFVG/c0Sxoqcwmlc0tJcxF1K2hEcXL4Na9hWkzmLO3QAzEKGseLsXXTGinFaXW3RL7lOXuJ6bbWsosF+YIv0fHqS1ZHREd2KAou1GWiAP9Stu0JiOQF211eRo+RZisQkDwvAgMBAAGjOzA5MCEGA1UdEgQaMBiCFk5PVF9GT1JfUFJPRFVDVElPTl9VU0UwFAYDVR0RBA0wC4IJbG9jYWxob3N0MA0GCSqGSIb3DQEBBQUAA4GBAFncwiuc44aCHD8IJ8/t4hmCZzqi+2O33E7OkHQz83R5Vs9YHt+ZkIO9vvnwhq1vcq68HNlG1e+wbeIyde58zYLcUZN5qZxHNchj0Hb70BmBQqYEd7C9SXtluJDguinQpkSTyJ1Nt0tx7ropBq/l43LGuca5isD4yx/JAhnm1469"
+              "MIIDoDCCAoigAwIBAgIBIjANBgkqhkiG9w0BAQsFADAzMRMwEQYDVQQKDAphcGFjaGUub3JnMQwwCgYDVQQLDANlbmcxDjAMBgNVBAMMBWN4ZmNhMB4XDTE1MTAyMDA5NTYyNloXDTI1MTAxNzA5NTYyNlowMTETMBEGA1UEChMKYXBhY2hlLm9yZzEMMAoGA1UECxMDZW5nMQwwCgYDVQQDEwNib2IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEjgfe3UUVEr7CVA+one1q/CCyU/1gN0jUpXf15hroR45Mhq0yEiStFMjIEfJJKyjRuwnfPrRf8FVMjRPLo9NLe1r1HMcVLaepZzhD1WgqRjAk0nymBN3zpFQDxyc5BGYiZLjgzmM7wlHW7XE+QSSlfjdH0EEoGXgHJitosQ78rq3iJlBgriN7OQuJynkHgRjMM9aKwHRs/y/03BmnMh1yq2PG1ptuWl/GspXrvgY9dfEGWppm1cC9FBPZcF8Y/l0I9kYArtbAGNcfcRpG2pQwSB+sKJAOHrm6ofzIEv+eJW7EX9GfQo5ab99CBDwC5iOSPPSfSW5eKn6+737tFTFPAgMBAAGjgcAwgb0wCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFFEs/7YrIfooE4HF8GgOoZ+N84rbMGMGA1UdIwRcMFqAFH/f+Z8qbl9897ey6PEEaZL49rhjoTekNTAzMRMwEQYDVQQKDAphcGFjaGUub3JnMQwwCgYDVQQLDANlbmcxDjAMBgNVBAMMBWN4ZmNhggkA6/E5WtiHMWgwDQYJKoZIhvcNAQELBQADggEBAEdkew5qevvF0ZcY1LWIoCcvRZwDxxJKJuNCIl25sx9iH+PLm9BZ6Dy/13gckAgguGCHkOAR3+JRnWSnjK
 w6s7uw+o8m4cIbVn3sOtJ7L5bMn4cmm4+WeQqEdQQncr1t5Q6xT6zgGTGQcnj1bxPmdrUVoCaoaGizdH9KwLOxSVR3LSZFNg3Z+g2DYNgf0B4rsUGv08Lub3tZ+G38q4r+qmjPceQy7oPA5M5aaKwRoxc66Ek+adkE+ESZb0CfiGq6PxSCxlp0i1tzXYxUE8YcgsOEN+OvCBHUh/GNqp68xBDKtkLkGzpBu8B8SPYrZ9CJH3v9pU8Y2cmv0d1i4o4z/eA="
             ]
           }
           

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/transports-ssl3/src/test/resources/keys/alice.jks
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/alice.jks b/systests/transports-ssl3/src/test/resources/keys/alice.jks
index 9f47a5c..9b8c450 100644
Binary files a/systests/transports-ssl3/src/test/resources/keys/alice.jks and b/systests/transports-ssl3/src/test/resources/keys/alice.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/transports-ssl3/src/test/resources/keys/bob.jks
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/bob.jks b/systests/transports-ssl3/src/test/resources/keys/bob.jks
index 26df583..6744c7c 100644
Binary files a/systests/transports-ssl3/src/test/resources/keys/bob.jks and b/systests/transports-ssl3/src/test/resources/keys/bob.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/transports-ssl3/src/test/resources/keys/cxfca.jks
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/keys/cxfca.jks b/systests/transports-ssl3/src/test/resources/keys/cxfca.jks
index accd45b..2473611 100644
Binary files a/systests/transports-ssl3/src/test/resources/keys/cxfca.jks and b/systests/transports-ssl3/src/test/resources/keys/cxfca.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/transports/src/test/resources/keys/alice.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/alice.jks b/systests/transports/src/test/resources/keys/alice.jks
index 9f47a5c..9b8c450 100644
Binary files a/systests/transports/src/test/resources/keys/alice.jks and b/systests/transports/src/test/resources/keys/alice.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/transports/src/test/resources/keys/bob.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/bob.jks b/systests/transports/src/test/resources/keys/bob.jks
index 26df583..6744c7c 100644
Binary files a/systests/transports/src/test/resources/keys/bob.jks and b/systests/transports/src/test/resources/keys/bob.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/transports/src/test/resources/keys/cxfca.jks
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/keys/cxfca.jks b/systests/transports/src/test/resources/keys/cxfca.jks
index accd45b..2473611 100644
Binary files a/systests/transports/src/test/resources/keys/cxfca.jks and b/systests/transports/src/test/resources/keys/cxfca.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/ws-rm/src/test/resources/certs/alice.jks
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/resources/certs/alice.jks b/systests/ws-rm/src/test/resources/certs/alice.jks
index 9f47a5c..9b8c450 100644
Binary files a/systests/ws-rm/src/test/resources/certs/alice.jks and b/systests/ws-rm/src/test/resources/certs/alice.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/ws-rm/src/test/resources/certs/bob.jks
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/resources/certs/bob.jks b/systests/ws-rm/src/test/resources/certs/bob.jks
index 26df583..6744c7c 100644
Binary files a/systests/ws-rm/src/test/resources/certs/bob.jks and b/systests/ws-rm/src/test/resources/certs/bob.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/common/CommonPasswordCallback.java
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/common/CommonPasswordCallback.java
b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/common/CommonPasswordCallback.java
index 21545a2..6c77186 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/common/CommonPasswordCallback.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/common/CommonPasswordCallback.java
@@ -42,6 +42,7 @@ public class CommonPasswordCallback implements CallbackHandler {
         passwords.put("alice", "password");
         passwords.put("bob", "password");
         passwords.put("cxfca", "password");
+        passwords.put("sts", "password");
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/ws-security-examples/src/test/resources/alice.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/alice.jks b/systests/ws-security-examples/src/test/resources/alice.jks
index b22a384..9b8c450 100644
Binary files a/systests/ws-security-examples/src/test/resources/alice.jks and b/systests/ws-security-examples/src/test/resources/alice.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/ws-security-examples/src/test/resources/bob.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/bob.jks b/systests/ws-security-examples/src/test/resources/bob.jks
index f652913..6744c7c 100644
Binary files a/systests/ws-security-examples/src/test/resources/bob.jks and b/systests/ws-security-examples/src/test/resources/bob.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/ws-security-examples/src/test/resources/cxfca.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/cxfca.jks b/systests/ws-security-examples/src/test/resources/cxfca.jks
index accd45b..2473611 100644
Binary files a/systests/ws-security-examples/src/test/resources/cxfca.jks and b/systests/ws-security-examples/src/test/resources/cxfca.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml
index a0dc1d3..9b59c35 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/client.xml
@@ -112,8 +112,8 @@
                         <map>
                             <entry key="security.username" value="alice"/>
                             <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
-                            <entry key="security.encryption.properties" value="alice.properties"/>
-                            <entry key="security.encryption.username" value="cxfca"/>
+                            <entry key="security.encryption.properties" value="sts.properties"/>
+                            <entry key="security.encryption.username" value="sts"/>
                         </map>
                     </property>
                 </bean>

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml
b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml
index 1cc7a0a..5b5de26 100644
--- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml
+++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/sts/cxf-symmetric.xml
@@ -41,8 +41,8 @@
         <value>http://localhost:(\d)*/DoubleItSamlSymmetricIssuedToken</value>
     </util:list>
     <bean id="symmetricSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
-        <property name="signaturePropertiesFile" value="cxfca.properties"/>
-        <property name="signatureUsername" value="cxfca"/>
+        <property name="signaturePropertiesFile" value="sts.properties"/>
+        <property name="signatureUsername" value="sts"/>
         <property name="callbackHandlerClass" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
         <property name="encryptionPropertiesFile" value="bob.properties"/>
         <property name="issuer" value="DoubleItSTSIssuer"/>
@@ -51,7 +51,7 @@
     <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="SymmetricSTS"
implementor="#symmetricSTSProviderBean" address="http://localhost:${testutil.ports.sts.STSServer}/SecurityTokenService/Symmetric"
wsdlLocation="src/test/resources/org/apache/cxf/systest/wssec/examples/sts/ws-trust-1.4-service.wsdl"
serviceName="ns1:SecurityTokenService" endpointName="ns1:Symmetric_Port">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.wssec.examples.common.CommonPasswordCallback"/>
-            <entry key="security.signature.properties" value="cxfca.properties"/>
+            <entry key="security.signature.properties" value="sts.properties"/>
         </jaxws:properties>
     </jaxws:endpoint>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/ws-security-examples/src/test/resources/sts.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/sts.jks b/systests/ws-security-examples/src/test/resources/sts.jks
new file mode 100644
index 0000000..3cdccfe
Binary files /dev/null and b/systests/ws-security-examples/src/test/resources/sts.jks differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/ws-security-examples/src/test/resources/sts.properties
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/resources/sts.properties b/systests/ws-security-examples/src/test/resources/sts.properties
new file mode 100644
index 0000000..678eda2
--- /dev/null
+++ b/systests/ws-security-examples/src/test/resources/sts.properties
@@ -0,0 +1,21 @@
+#    Licensed to the Apache Software Foundation (ASF) under one
+#    or more contributor license agreements. See the NOTICE file
+#    distributed with this work for additional information
+#    regarding copyright ownership. The ASF licenses this file
+#    to you under the Apache License, Version 2.0 (the
+#    "License"); you may not use this file except in compliance
+#    with the License. You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing,
+#    software distributed under the License is distributed on an
+#    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#    KIND, either express or implied. See the License for the
+#    specific language governing permissions and limitations
+#    under the License.
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=password
+org.apache.ws.security.crypto.merlin.keystore.alias=sts
+org.apache.ws.security.crypto.merlin.keystore.file=sts.jks

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/ws-security/src/test/resources/certs/alice.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/certs/alice.jks b/systests/ws-security/src/test/resources/certs/alice.jks
index 9f47a5c..9b8c450 100644
Binary files a/systests/ws-security/src/test/resources/certs/alice.jks and b/systests/ws-security/src/test/resources/certs/alice.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/ws-security/src/test/resources/certs/bob.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/certs/bob.jks b/systests/ws-security/src/test/resources/certs/bob.jks
index 26df583..6744c7c 100644
Binary files a/systests/ws-security/src/test/resources/certs/bob.jks and b/systests/ws-security/src/test/resources/certs/bob.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/ws-security/src/test/resources/certs/cxfca.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/certs/cxfca.jks b/systests/ws-security/src/test/resources/certs/cxfca.jks
index accd45b..2473611 100644
Binary files a/systests/ws-security/src/test/resources/certs/cxfca.jks and b/systests/ws-security/src/test/resources/certs/cxfca.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/ws-security/src/test/resources/certs/xkms/bob.crt
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/certs/xkms/bob.crt b/systests/ws-security/src/test/resources/certs/xkms/bob.crt
index fd560fc..af2032f 100644
Binary files a/systests/ws-security/src/test/resources/certs/xkms/bob.crt and b/systests/ws-security/src/test/resources/certs/xkms/bob.crt
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/ws-security/src/test/resources/certs/xkms/trusted_cas/cxfca.crt
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/certs/xkms/trusted_cas/cxfca.crt b/systests/ws-security/src/test/resources/certs/xkms/trusted_cas/cxfca.crt
index 6ac5069..96d6d7d 100644
Binary files a/systests/ws-security/src/test/resources/certs/xkms/trusted_cas/cxfca.crt and
b/systests/ws-security/src/test/resources/certs/xkms/trusted_cas/cxfca.crt differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/bob-modified.jks
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/bob-modified.jks
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/bob-modified.jks
new file mode 100644
index 0000000..26df583
Binary files /dev/null and b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/bob-modified.jks
differ

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/bob-modified.properties
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/bob-modified.properties
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/bob-modified.properties
new file mode 100644
index 0000000..3592376
--- /dev/null
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/bob-modified.properties
@@ -0,0 +1,21 @@
+#    Licensed to the Apache Software Foundation (ASF) under one
+#    or more contributor license agreements. See the NOTICE file
+#    distributed with this work for additional information
+#    regarding copyright ownership. The ASF licenses this file
+#    to you under the Apache License, Version 2.0 (the
+#    "License"); you may not use this file except in compliance
+#    with the License. You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing,
+#    software distributed under the License is distributed on an
+#    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#    KIND, either express or implied. See the License for the
+#    specific language governing permissions and limitations
+#    under the License.
+org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
+org.apache.wss4j.crypto.merlin.keystore.type=jks
+org.apache.wss4j.crypto.merlin.keystore.password=password
+org.apache.wss4j.crypto.merlin.keystore.alias=bob
+org.apache.wss4j.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/action/bob-modified.jks

http://git-wip-us.apache.org/repos/asf/cxf/blob/62d70e97/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-server.xml
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-server.xml
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-server.xml
index 0bfe4ad..8b917dc 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-server.xml
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/signature-server.xml
@@ -170,7 +170,8 @@
                 <constructor-arg>
                     <map>
                         <entry key="action" value="Signature"/>
-                        <entry key="signatureVerificationPropFile" value="bob.properties"/>
+                        <entry key="signatureVerificationPropFile" 
+                               value="org/apache/cxf/systest/ws/action/bob-modified.properties"/>
                     </map>
                 </constructor-arg>
             </bean>


Mime
View raw message