This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch 4.0.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 51ddd04cb1ef92ff6849765bece77a455a94ac51 Author: Andriy Redko <[email protected]> AuthorDate: Tue Nov 4 08:43:18 2025 -0500 Fix expired certificates (#2707) (cherry picked from commit db236dfd5732c931e9972e0773446d439442422d) --- .../client/integration/SSLNettyClientTest.java | 2 +- .../http/netty/client/integration/ServerConfig.xml | 2 +- .../server/integration/SSLNettyServerTest.java | 2 +- .../server/integration/ApplicationContext.xml | 2 +- .../http/netty/server/integration/ServerConfig.xml | 2 +- .../cxf/sts/common/PasswordCallbackHandler.java | 4 ++-- .../cxf/sts/operation/IssueSamlUnitTest.java | 23 ++++++++++++++++++++- .../sts/token/provider/JWTTokenProviderTest.java | 6 +++--- .../systest/sts/common/CommonCallbackHandler.java | 6 +++--- .../cxf/systest/sts/basic_auth/cxf-service.xml | 4 ++-- .../systest/sts/basic_auth/stax-cxf-service.xml | 4 ++-- .../cxf/systest/sts/batch/cxf-client-unit.xml | 2 +- .../org/apache/cxf/systest/sts/batch/cxf-sts.xml | 2 +- .../apache/cxf/systest/sts/batch/stax-cxf-sts.xml | 2 +- .../sts/binarysecuritytoken/cxf-service.xml | 2 +- .../sts/binarysecuritytoken/stax-cxf-service.xml | 2 +- .../systest/sts/caching/cxf-caching-service.xml | 4 ++-- .../apache/cxf/systest/sts/caching/cxf-client.xml | 2 +- .../apache/cxf/systest/sts/caching/cxf-service.xml | 4 ++-- .../cxf/systest/sts/claims/cxf-bad-client.xml | 2 +- .../systest/sts/claims/cxf-client-cbhandler.xml | 2 +- .../systest/sts/claims/cxf-client-cbhandler2.xml | 2 +- .../apache/cxf/systest/sts/claims/cxf-client.xml | 2 +- .../apache/cxf/systest/sts/claims/cxf-service.xml | 2 +- .../cxf/systest/sts/claims/stax-cxf-service.xml | 2 +- .../cxf/systest/sts/cross_domain/cxf-client-b.xml | 2 +- .../systest/sts/cross_domain/cxf-client-mex.xml | 2 +- .../cxf/systest/sts/cross_domain/cxf-client.xml | 2 +- .../cxf/systest/sts/cross_domain/cxf-service.xml | 2 +- .../cxf/systest/sts/cross_domain/cxf-sts-saml1.xml | 2 +- .../cxf/systest/sts/cross_domain/cxf-sts-saml2.xml | 2 +- .../apache/cxf/systest/sts/custom/cxf-client.xml | 2 +- .../apache/cxf/systest/sts/custom/cxf-service.xml | 2 +- .../org/apache/cxf/systest/sts/custom/cxf-sts.xml | 2 +- .../systest/sts/custom_onbehalfof/cxf-client.xml | 2 +- .../systest/sts/custom_onbehalfof/cxf-service.xml | 4 ++-- .../cxf/systest/sts/custom_onbehalfof/cxf-sts.xml | 2 +- .../sts/defaultstsprovider/cxf-client-unit.xml | 2 +- .../cxf/systest/sts/defaultstsprovider/cxf-sts.xml | 2 +- .../apache/cxf/systest/sts/deployment/cxf-sts.xml | 2 +- .../cxf/systest/sts/deployment/stax-cxf-sts.xml | 2 +- .../systest/sts/distributed_caching/cxf-client.xml | 2 +- .../sts/distributed_caching/cxf-service.xml | 4 ++-- .../systest/sts/distributed_caching/cxf-sts-1.xml | 2 +- .../systest/sts/distributed_caching/cxf-sts-2.xml | 2 +- .../org/apache/cxf/systest/sts/jwt/cxf-client.xml | 2 +- .../org/apache/cxf/systest/sts/jwt/cxf-service.xml | 2 +- .../sts/kerberos/cxf-intermediary-client.xml | 2 +- .../sts/kerberos/cxf-intermediary-jaxrs-client.xml | 2 +- .../cxf/systest/sts/kerberos/cxf-intermediary.xml | 4 ++-- .../cxf/systest/sts/kerberos/cxf-service.xml | 2 +- .../apache/cxf/systest/sts/realms/cxf-client.xml | 2 +- .../apache/cxf/systest/sts/realms/cxf-service.xml | 4 ++-- .../cxf/systest/sts/realms/cxf-sts-saml1.xml | 2 +- .../cxf/systest/sts/realms/cxf-sts-saml2.xml | 2 +- .../cxf/systest/sts/realms/stsstore_realms.jks | Bin 4557 -> 8108 bytes .../cxf/systest/sts/renew/cxf-client-unit.xml | 2 +- .../apache/cxf/systest/sts/renew/cxf-client.xml | 2 +- .../apache/cxf/systest/sts/renew/cxf-service.xml | 2 +- .../apache/cxf/systest/sts/renew/cxf-sts-pop.xml | 2 +- .../org/apache/cxf/systest/sts/renew/cxf-sts.xml | 2 +- .../apache/cxf/systest/sts/renew/stax-cxf-sts.xml | 2 +- .../cxf/systest/sts/secure_conv/cxf-client.xml | 2 +- .../cxf/systest/sts/secure_conv/cxf-service.xml | 4 ++-- .../apache/cxf/systest/sts/secure_conv/cxf-sts.xml | 2 +- .../cxf/systest/sts/secure_conv/stax-cxf-sts.xml | 2 +- .../apache/cxf/systest/sts/soap12/cxf-client.xml | 2 +- .../apache/cxf/systest/sts/soap12/cxf-service.xml | 4 ++-- .../cxf/systest/sts/soap12/stax-cxf-service.xml | 4 ++-- .../cxf/systest/sts/transformation/cxf-service.xml | 4 ++-- .../cxf/systest/sts/usernametoken/cxf-service.xml | 4 ++-- .../systest/sts/usernametoken/stax-cxf-service.xml | 4 ++-- .../cxf/systest/sts/TLSClientParametersUtils.java | 2 +- .../systest/sts/common/CommonCallbackHandler.java | 6 +++--- .../sts/sendervouches/Saml2CallbackHandler.java | 2 +- .../apache/cxf/systest/sts/bearer/cxf-client.xml | 2 +- .../apache/cxf/systest/sts/bearer/cxf-service.xml | 2 +- .../cxf/systest/sts/bearer/cxf-stax-service.xml | 2 +- .../cxf/systest/sts/bearer/cxf-unsigned-client.xml | 2 +- .../cxf/systest/sts/delegation/cxf-client.xml | 2 +- .../systest/sts/delegation/cxf-sts-transport.xml | 2 +- .../cxf/systest/sts/deployment/cxf-transport.xml | 2 +- .../systest/sts/deployment/stax-cxf-transport.xml | 2 +- .../cxf-intermediary-caching.xml | 4 ++-- .../cxf-intermediary.xml | 4 ++-- .../intermediary_transformation/cxf-service.xml | 2 +- .../apache/cxf/systest/sts/issuer/cxf-client.xml | 2 +- .../sts/issuer/cxf-issuer-sts-transport.xml | 2 +- .../apache/cxf/systest/sts/issuer/cxf-service.xml | 2 +- .../org/apache/cxf/systest/sts/jaas/cxf-client.xml | 2 +- .../apache/cxf/systest/sts/jaas/cxf-service.xml | 4 ++-- .../apache/cxf/systest/sts/jaas/cxf-service2.xml | 2 +- .../apache/cxf/systest/sts/jaas/cxf-sts-client.xml | 2 +- .../apache/cxf/systest/sts/rest/cxf-rest-sts.xml | 2 +- .../systest/sts/sendervouches/cxf-intermediary.xml | 4 ++-- .../cxf/systest/sts/sendervouches/cxf-service.xml | 2 +- .../sts/sendervouches/cxf-stax-intermediary.xml | 4 ++-- .../systest/sts/sendervouches/cxf-stax-service.xml | 2 +- .../cxf/systest/sts/stsclient/cxf-client-name.xml | 2 +- .../systest/sts/stsclient/cxf-default-client.xml | 2 +- .../cxf/systest/sts/stsclient/cxf-service.xml | 2 +- .../apache/cxf/systest/sts/template/cxf-client.xml | 2 +- .../cxf/systest/sts/template/cxf-service.xml | 2 +- .../cxf/systest/sts/template/cxf-stax-service.xml | 2 +- .../cxf/systest/sts/transport/cxf-bad-client.xml | 2 +- .../cxf/systest/sts/transport/cxf-client.xml | 2 +- .../cxf/systest/sts/transport/cxf-service.xml | 2 +- .../cxf/systest/sts/transport/cxf-stax-service.xml | 2 +- .../kerberos/common/KeystorePasswordCallback.java | 6 +++--- .../cxf/systest/kerberos/wssec/kerberos/server.xml | 2 +- .../systest/kerberos/wssec/kerberos/sts-client.xml | 2 +- .../cxf/systest/kerberos/wssec/sts/cxf-sts.xml | 2 +- .../systest/kerberos/wssec/sts/stax-cxf-sts.xml | 2 +- testutils/src/test/resources/keys/README.md | 11 ++++++++++ testutils/src/test/resources/keys/clientstore.jks | Bin 4559 -> 8098 bytes testutils/src/test/resources/keys/servicestore.jks | Bin 3475 -> 6356 bytes testutils/src/test/resources/keys/stsstore.jks | Bin 4557 -> 8108 bytes 117 files changed, 172 insertions(+), 140 deletions(-) diff --git a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/SSLNettyClientTest.java b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/SSLNettyClientTest.java index b5379e49105..a914779659c 100644 --- a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/SSLNettyClientTest.java +++ b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/SSLNettyClientTest.java @@ -128,7 +128,7 @@ public class SSLNettyClientTest extends AbstractBusClientServerTestBase { NettyHttpConduit httpConduit = (NettyHttpConduit) ClientProxy.getClient(port).getConduit(); TLSClientParameters tlsCP = new TLSClientParameters(); - String keyPassword = "ckpass"; + String keyPassword = "cspass"; KeyStore keyStore = KeyStore.getInstance("JKS"); keyStore.load(SSLNettyClientTest.class.getResourceAsStream(keyStoreLoc), "cspass".toCharArray()); KeyManager[] myKeyManagers = getKeyManagers(keyStore, keyPassword); diff --git a/rt/transports/http-netty/netty-client/src/test/resources/org/apache/cxf/transport/http/netty/client/integration/ServerConfig.xml b/rt/transports/http-netty/netty-client/src/test/resources/org/apache/cxf/transport/http/netty/client/integration/ServerConfig.xml index 5be3543e7be..86d46dff9e0 100644 --- a/rt/transports/http-netty/netty-client/src/test/resources/org/apache/cxf/transport/http/netty/client/integration/ServerConfig.xml +++ b/rt/transports/http-netty/netty-client/src/test/resources/org/apache/cxf/transport/http/netty/client/integration/ServerConfig.xml @@ -32,7 +32,7 @@ <httpj:engine-factory> <httpj:engine port="${SSLNettyClientTest.port}"> <httpj:tlsServerParameters sniHostCheck="false"> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettyServerTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettyServerTest.java index 0773edcfae4..d6d748e2d58 100644 --- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettyServerTest.java +++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettyServerTest.java @@ -116,7 +116,7 @@ public class SSLNettyServerTest extends AbstractBusClientServerTestBase { HTTPConduit httpConduit = (HTTPConduit) ClientProxy.getClient(port).getConduit(); TLSClientParameters tlsCP = new TLSClientParameters(); - String keyPassword = "ckpass"; + String keyPassword = "cspass"; KeyStore keyStore = KeyStore.getInstance("JKS"); keyStore.load(SSLNettyServerTest.class.getResourceAsStream(keyStoreLoc), "cspass".toCharArray()); KeyManager[] myKeyManagers = getKeyManagers(keyStore, keyPassword); diff --git a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ApplicationContext.xml b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ApplicationContext.xml index 26f4c443680..36432ddae9f 100644 --- a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ApplicationContext.xml +++ b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ApplicationContext.xml @@ -36,7 +36,7 @@ <httpn:engine-factory> <httpn:engine port="${SSLNettySpringServerTest.port}"> <httpn:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ServerConfig.xml b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ServerConfig.xml index fe6ecac5b07..8761fd356df 100644 --- a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ServerConfig.xml +++ b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ServerConfig.xml @@ -32,7 +32,7 @@ <httpn:engine-factory> <httpn:engine port="${SSLNettyServerTest.port}"> <httpn:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/PasswordCallbackHandler.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/PasswordCallbackHandler.java index e0c76d97a37..25332449390 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/PasswordCallbackHandler.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/common/PasswordCallbackHandler.java @@ -40,10 +40,10 @@ public class PasswordCallbackHandler implements CallbackHandler { pc.setPassword("trombone"); break; } else if ("mystskey".equals(pc.getIdentifier())) { - pc.setPassword("stskpass"); + pc.setPassword("stsspass"); break; } else if ("myservicekey".equals(pc.getIdentifier())) { - pc.setPassword("skpass"); + pc.setPassword("stsspass"); break; } } diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java index b10fefa1258..8ae39dae99d 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java @@ -61,6 +61,7 @@ import org.apache.wss4j.common.WSS4JConstants; import org.apache.wss4j.common.crypto.Crypto; import org.apache.wss4j.common.crypto.CryptoFactory; import org.apache.wss4j.common.crypto.CryptoType; +import org.apache.wss4j.common.ext.WSPasswordCallback; import org.apache.wss4j.common.principal.CustomTokenPrincipal; import org.apache.wss4j.common.saml.SAMLKeyInfo; import org.apache.wss4j.common.saml.SamlAssertionWrapper; @@ -884,7 +885,27 @@ public class IssueSamlUnitTest { properties.put("org.apache.wss4j.crypto.merlin.keystore.file", "keys/servicestore.jks"); data.setDecCrypto(CryptoFactory.getInstance(properties)); - data.setCallbackHandler(new PasswordCallbackHandler()); + // Different store and key passwords not supported for PKCS12 KeyStores + data.setCallbackHandler(callbacks -> { + for (int i = 0; i < callbacks.length; i++) { + if (callbacks[i] instanceof WSPasswordCallback) { // CXF + WSPasswordCallback pc = (WSPasswordCallback) callbacks[i]; + if ("alice".equals(pc.getIdentifier())) { + pc.setPassword("clarinet"); + break; + } else if ("bob".equals(pc.getIdentifier())) { + pc.setPassword("trombone"); + break; + } else if ("mystskey".equals(pc.getIdentifier())) { + pc.setPassword("sspass"); + break; + } else if ("myservicekey".equals(pc.getIdentifier())) { + pc.setPassword("sspass"); + break; + } + } + } + }); data.setWssConfig(WSSConfig.getNewInstance()); data.setWsDocInfo(new WSDocInfo(assertion.getOwnerDocument())); diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java index cd4a1c7a999..1fad4f31cc8 100644 --- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java +++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/token/provider/JWTTokenProviderTest.java @@ -232,7 +232,7 @@ public class JWTTokenProviderTest { KeyStore keystore = ((Merlin)decryptionCrypto).getKeyStore(); decProperties.put(JoseConstants.RSSEC_KEY_STORE, keystore); decProperties.put(JoseConstants.RSSEC_KEY_STORE_ALIAS, "myservicekey"); - decProperties.put(JoseConstants.RSSEC_KEY_PSWD, "skpass"); + decProperties.put(JoseConstants.RSSEC_KEY_PSWD, "sspass"); JweDecryptionProvider decProvider = JweUtils.loadDecryptionProvider(decProperties, jwtConsumer.getHeaders()); @@ -282,7 +282,7 @@ public class JWTTokenProviderTest { KeyStore keystore = ((Merlin)decryptionCrypto).getKeyStore(); decProperties.put(JoseConstants.RSSEC_KEY_STORE, keystore); decProperties.put(JoseConstants.RSSEC_KEY_STORE_ALIAS, "myservicekey"); - decProperties.put(JoseConstants.RSSEC_KEY_PSWD, "skpass"); + decProperties.put(JoseConstants.RSSEC_KEY_PSWD, "sspass"); decProperties.put(JoseConstants.RSSEC_ENCRYPTION_CONTENT_ALGORITHM, ContentAlgorithm.A128CBC_HS256.name()); @@ -329,7 +329,7 @@ public class JWTTokenProviderTest { KeyStore keystore = ((Merlin)decryptionCrypto).getKeyStore(); decProperties.put(JoseConstants.RSSEC_KEY_STORE, keystore); decProperties.put(JoseConstants.RSSEC_KEY_STORE_ALIAS, "myservicekey"); - decProperties.put(JoseConstants.RSSEC_KEY_PSWD, "skpass"); + decProperties.put(JoseConstants.RSSEC_KEY_PSWD, "sspass"); JweDecryptionProvider decProvider = JweUtils.loadDecryptionProvider(decProperties, jwtConsumer.getHeaders()); diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java index a91406c48d3..cdbdf0d79fa 100644 --- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java +++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java @@ -34,10 +34,10 @@ public class CommonCallbackHandler implements CallbackHandler { if (callbacks[i] instanceof WSPasswordCallback) { // CXF WSPasswordCallback pc = (WSPasswordCallback) callbacks[i]; if ("myclientkey".equals(pc.getIdentifier())) { - pc.setPassword("ckpass"); + pc.setPassword("cspass"); break; } else if ("myservicekey".equals(pc.getIdentifier())) { - pc.setPassword("skpass"); + pc.setPassword("sspass"); break; } else if ("alice".equals(pc.getIdentifier())) { pc.setPassword("clarinet"); @@ -49,7 +49,7 @@ public class CommonCallbackHandler implements CallbackHandler { pc.setPassword("evekpass"); break; } else if ("mystskey".equals(pc.getIdentifier())) { - pc.setPassword("stskpass"); + pc.setPassword("stsspass"); break; } } diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml index 422ac004289..8f9c84837d0 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml @@ -74,7 +74,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="false" required="false"/> @@ -86,7 +86,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml index 5d4b7c1ad64..2a873a3017c 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml @@ -76,7 +76,7 @@ <httpj:engine-factory id="StaxClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.StaxDoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="false" required="false"/> @@ -88,7 +88,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-client-unit.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-client-unit.xml index b314da5a77e..36508b83e4b 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-client-unit.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-client-unit.xml @@ -35,7 +35,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml index 531a4bb5a17..a75c32e9087 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml @@ -114,7 +114,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml index aa3001f960b..cb1763f8ff9 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml @@ -120,7 +120,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml index b536c229d84..68987951321 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/cxf-service.xml @@ -62,7 +62,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml index 3e5d2499ed2..0a3d534c2ec 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/binarysecuritytoken/stax-cxf-service.xml @@ -64,7 +64,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml index a2d3b04e3bc..4c8e62856d8 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml @@ -87,7 +87,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> @@ -102,7 +102,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml index eab92388f9b..052397da17b 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-client.xml @@ -77,7 +77,7 @@ </jaxws:client> <http:conduit name="https://localhost:.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml index 4399e29bda8..7d45cb6658c 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml @@ -47,7 +47,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> @@ -62,7 +62,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml index 0562b77c151..0c510da350e 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-bad-client.xml @@ -56,7 +56,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml index aae0a408181..1e55c54c30c 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler.xml @@ -59,7 +59,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler2.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler2.xml index f55f083de36..86d34012143 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler2.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client-cbhandler2.xml @@ -61,7 +61,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml index 25be1de14a3..58f8dc34d76 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-client.xml @@ -77,7 +77,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml index 00b5e34405c..779de3bcb7f 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml @@ -83,7 +83,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml index d9884934381..120ce703700 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml @@ -89,7 +89,7 @@ <httpj:engine-factory id="StaxClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.StaxDoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client-b.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client-b.xml index 5ee284b76f3..8763431a872 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client-b.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client-b.xml @@ -57,7 +57,7 @@ <http:conduit name="https://localhost:.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client-mex.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client-mex.xml index 5596f4e6490..77b4c870966 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client-mex.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client-mex.xml @@ -57,7 +57,7 @@ <http:conduit name="https://localhost:.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml index c1ebbd734f5..e0e7a2979bf 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-client.xml @@ -66,7 +66,7 @@ <http:conduit name="https://localhost:.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml index 3179b86048f..e3e1348223f 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml @@ -48,7 +48,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml index cd6ee2a24bf..90a9e9027bf 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml @@ -82,7 +82,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml index 54a4bfa78b2..db77e0e11fe 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml @@ -81,7 +81,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-client.xml index 75f972057ce..ef904b6fb4a 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-client.xml @@ -43,7 +43,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-service.xml index 7c7ab9cab7c..f48d684ed6c 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-service.xml @@ -41,7 +41,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-sts.xml index 0595f3c6758..22cbb364746 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-sts.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom/cxf-sts.xml @@ -65,7 +65,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="false"/> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml index 1a1fcf09e29..b9680c61499 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-client.xml @@ -61,7 +61,7 @@ <http:conduit name="https://localhost:.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml index 05d928e173f..a8d5cdbd134 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml @@ -73,7 +73,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> @@ -88,7 +88,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml index 19e6c45d80a..db69775a2b5 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml @@ -142,7 +142,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-client-unit.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-client-unit.xml index b314da5a77e..36508b83e4b 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-client-unit.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-client-unit.xml @@ -35,7 +35,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-sts.xml index 28e48cfb1df..1aac14a2e4c 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-sts.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-sts.xml @@ -37,7 +37,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml index 192063df936..c72445d86a7 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml @@ -48,7 +48,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-sts.xml index 2982cc14e0f..41c6d78801c 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-sts.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-sts.xml @@ -55,7 +55,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml index 34ab078ac3b..6269c5ab2d4 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-client.xml @@ -62,7 +62,7 @@ </jaxws:client> <http:conduit name="https://localhost:.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml index deccad61668..27160ac9ece 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml @@ -84,7 +84,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> @@ -99,7 +99,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml index 9c4c3f5a21d..04aab42fd99 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml @@ -138,7 +138,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml index a5a4d32a149..b19141299a2 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml @@ -131,7 +131,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-client.xml index 038450b0212..cc127a30a73 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-client.xml @@ -36,7 +36,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-service.xml index 011ab0fb8f3..bddf41afd32 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/jwt/cxf-service.xml @@ -51,7 +51,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="false" required="false"/> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-client.xml index 5b5ed6d664d..63ce0d41d4e 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-client.xml @@ -45,7 +45,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-jaxrs-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-jaxrs-client.xml index 364e2e0d4b3..b29def6e348 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-jaxrs-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary-jaxrs-client.xml @@ -36,7 +36,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml index b6d8f9e5d7f..da10e4ef9d3 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml @@ -89,7 +89,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.Intermediary}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="false" required="false"/> @@ -102,7 +102,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml index 9bbbd2cf142..f73f81bd1fa 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml @@ -40,7 +40,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="spass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="false" required="false"/> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml index 6e5ad9fc6f8..746c2d8c865 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-client.xml @@ -116,7 +116,7 @@ </jaxws:client> <http:conduit name="https://localhost:.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml index b63e28e90dc..0579741ed96 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml @@ -126,7 +126,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> @@ -141,7 +141,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml index eac6a553814..045dc1addaa 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml @@ -105,7 +105,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml index 31feb190c42..7c8d8de4fc1 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml @@ -98,7 +98,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsstore_realms.jks b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsstore_realms.jks index 51f131f2233..48d0eb1fe20 100644 Binary files a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsstore_realms.jks and b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsstore_realms.jks differ diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client-unit.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client-unit.xml index b314da5a77e..36508b83e4b 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client-unit.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client-unit.xml @@ -35,7 +35,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml index a57906595cc..82010ca9139 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-client.xml @@ -165,7 +165,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml index d6e929d7f61..5599633e470 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml @@ -64,7 +64,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="false" required="false"/> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml index 67439b61d7d..530b870912c 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml @@ -140,7 +140,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml index 213eb935a54..756289118bb 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml @@ -122,7 +122,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml index d9e018a0d02..ef23183043d 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml @@ -125,7 +125,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml index e0241062f1d..43064958871 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-client.xml @@ -66,7 +66,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml index c7d52b19e89..81e72cf3805 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml @@ -89,7 +89,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> @@ -104,7 +104,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml index c8e552c3391..68456c994d7 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml @@ -152,7 +152,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml index 9ce83864b1c..e3336ca22b3 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml @@ -159,7 +159,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml index b31a4daffed..85b5b6084cf 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-client.xml @@ -53,7 +53,7 @@ </jaxws:client> <http:conduit name="https://localhost:.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml index be025c558eb..189e5da9a2d 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml @@ -57,7 +57,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> @@ -72,7 +72,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml index d135c56ab22..f3903c7311f 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml @@ -59,7 +59,7 @@ <httpj:engine-factory id="StaxClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.StaxDoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> @@ -74,7 +74,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml index 44b4aa53351..da5f9c1affb 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml @@ -84,7 +84,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="false" required="false"/> @@ -96,7 +96,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml index 289ccab35e5..cefe17dcac4 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml @@ -100,7 +100,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="false" required="false"/> @@ -112,7 +112,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml index ec05224ceff..1f3438233b0 100644 --- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml +++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml @@ -58,7 +58,7 @@ <httpj:engine-factory id="StaxClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.StaxDoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="false" required="false"/> @@ -70,7 +70,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/TLSClientParametersUtils.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/TLSClientParametersUtils.java index f60eb8dc025..b483215693d 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/TLSClientParametersUtils.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/TLSClientParametersUtils.java @@ -34,7 +34,7 @@ public final class TLSClientParametersUtils { private static final String CLIENTSTORE = "/keys/clientstore.jks"; private static final String KEYSTORE_PASS = "cspass"; - private static final String KEY_PASS = "ckpass"; + private static final String KEY_PASS = "cspass"; private TLSClientParametersUtils() { } diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java index a91406c48d3..cdbdf0d79fa 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/CommonCallbackHandler.java @@ -34,10 +34,10 @@ public class CommonCallbackHandler implements CallbackHandler { if (callbacks[i] instanceof WSPasswordCallback) { // CXF WSPasswordCallback pc = (WSPasswordCallback) callbacks[i]; if ("myclientkey".equals(pc.getIdentifier())) { - pc.setPassword("ckpass"); + pc.setPassword("cspass"); break; } else if ("myservicekey".equals(pc.getIdentifier())) { - pc.setPassword("skpass"); + pc.setPassword("sspass"); break; } else if ("alice".equals(pc.getIdentifier())) { pc.setPassword("clarinet"); @@ -49,7 +49,7 @@ public class CommonCallbackHandler implements CallbackHandler { pc.setPassword("evekpass"); break; } else if ("mystskey".equals(pc.getIdentifier())) { - pc.setPassword("stskpass"); + pc.setPassword("stsspass"); break; } } diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/Saml2CallbackHandler.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/Saml2CallbackHandler.java index 7cca9cb6a71..2ff79388358 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/Saml2CallbackHandler.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/sendervouches/Saml2CallbackHandler.java @@ -77,7 +77,7 @@ public class Saml2CallbackHandler implements CallbackHandler { Crypto crypto = CryptoFactory.getInstance(file); callback.setIssuerCrypto(crypto); callback.setIssuerKeyName("myservicekey"); - callback.setIssuerKeyPassword("skpass"); + callback.setIssuerKeyPassword("sspass"); callback.setSignAssertion(true); } catch (WSSecurityException e) { throw new IOException(e); diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml index 793e0b83f87..e98d0c64a3d 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-client.xml @@ -56,7 +56,7 @@ </jaxws:client> <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml index 6307b137d1b..62d3a3e1b84 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml @@ -43,7 +43,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml index 7df3fea2440..cbada951ab9 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml @@ -45,7 +45,7 @@ <httpj:engine-factory id="StaxClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.StaxDoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml index 87eae22162c..31a66832ee7 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-unsigned-client.xml @@ -35,7 +35,7 @@ </jaxws:client> <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-client.xml index 472184fcf2a..280b646eded 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-client.xml @@ -32,7 +32,7 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml index 013f77af332..1135ca64132 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml @@ -130,7 +130,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.STSServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml index cea7459680a..5ea9c128cb9 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml @@ -43,7 +43,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.STSServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml index 4b865fbc48d..352cfb52e0a 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml @@ -45,7 +45,7 @@ <httpj:engine-factory id="StaxClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.StaxSTSServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml index 91a55023b92..24c08277674 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml @@ -41,7 +41,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="false" required="false"/> @@ -73,7 +73,7 @@ </jaxws:client> <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml index 0387ba2aee6..14a10529144 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml @@ -41,7 +41,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="false" required="false"/> @@ -74,7 +74,7 @@ </jaxws:client> <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml index a6356922166..b0b49e45a3d 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml @@ -45,7 +45,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings.2" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer.2}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml index b6fed748573..85a6f9dc831 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml @@ -70,7 +70,7 @@ </jaxws:client> <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-issuer-sts-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-issuer-sts-transport.xml index acc5473f895..7bd0936a5fa 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-issuer-sts-transport.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-issuer-sts-transport.xml @@ -42,7 +42,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.IssuerSTSServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml index a396d55a025..0292a048ef1 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml @@ -57,7 +57,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-client.xml index 711dc7f9428..1d8a5a0f409 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-client.xml @@ -32,7 +32,7 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml index 1560782389a..e3c41023f81 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml @@ -123,7 +123,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> @@ -136,7 +136,7 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service2.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service2.xml index 18ed71b24e9..6697710edd6 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service2.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service2.xml @@ -63,7 +63,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings.2" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer.2}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-sts-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-sts-client.xml index 928c2efdbfe..9e3e7a4ffd0 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-sts-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-sts-client.xml @@ -29,7 +29,7 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml index a45be2ecc25..210b8c06b12 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/rest/cxf-rest-sts.xml @@ -151,7 +151,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.STSRESTServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml index 54fd52b738b..22fa12fac84 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml @@ -42,7 +42,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="false" required="false"/> @@ -54,7 +54,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml index 23b54cc786a..6e22e0147a8 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml @@ -43,7 +43,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml index 6d18bddae46..f92fb800840 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml @@ -43,7 +43,7 @@ <httpj:engine-factory id="StaxClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.StaxDoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="false" required="false"/> @@ -60,7 +60,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml index 0e05a6b1044..93165544eee 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-service.xml @@ -44,7 +44,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml index 3c939b81783..dc8696ade18 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-client-name.xml @@ -53,7 +53,7 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml index 8f3946894bf..2848ff75d53 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-default-client.xml @@ -53,7 +53,7 @@ <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-service.xml index 82d4680cd91..60df26e81c5 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/stsclient/cxf-service.xml @@ -35,7 +35,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml index 4dea76c8ff8..8eb64f20c4a 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-client.xml @@ -45,7 +45,7 @@ </jaxws:client> <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-service.xml index 2ba4df3fb0d..71bbb622c35 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-service.xml @@ -43,7 +43,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-stax-service.xml index a23dd9014c8..d802f81009c 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-stax-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/template/cxf-stax-service.xml @@ -45,7 +45,7 @@ <httpj:engine-factory id="StaxClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.StaxDoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml index a61638561df..7cc556e88df 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-bad-client.xml @@ -77,7 +77,7 @@ </jaxws:client> <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml index 7b9f52dbc56..d2c67d08545 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml @@ -105,7 +105,7 @@ </jaxws:client> <http:conduit name="https://localhost.*";> <http:tlsClientParameters disableCNCheck="true"> - <sec:keyManagers keyPassword="ckpass"> + <sec:keyManagers keyPassword="cspass"> <sec:keyStore type="jks" password="cspass" resource="keys/clientstore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml index 18c0bf58ace..17e9a21b2ac 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml @@ -76,7 +76,7 @@ <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.DoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml index 620269b8a24..0f6d2c378a4 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml @@ -85,7 +85,7 @@ <httpj:engine-factory id="StaxClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.StaxDoubleItServer}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:trustManagers> diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KeystorePasswordCallback.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KeystorePasswordCallback.java index 7b472d966d9..36f04bbb249 100644 --- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KeystorePasswordCallback.java +++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/KeystorePasswordCallback.java @@ -45,9 +45,9 @@ public class KeystorePasswordCallback implements CallbackHandler { passwords.put("abcd", "dcba"); passwords.put("6e0e88f36ebb8744d470f62f604d03ea4ebe5094", "password"); passwords.put("wss40rev", "security"); - passwords.put("myclientkey", "ckpass"); - passwords.put("myservicekey", "skpass"); - passwords.put("mystskey", "stskpass"); + passwords.put("myclientkey", "cspass"); + passwords.put("myservicekey", "sspass"); + passwords.put("mystskey", "stsspass"); } /** diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml index 8670fd58051..3e72c3af7b0 100644 --- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml +++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml @@ -239,7 +239,7 @@ <httpj:engine-factory id="STSClientAuthHttpsSettings" bus="cxf"> <httpj:engine port="${testutil.ports.Server.3}"> <httpj:tlsServerParameters> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="false" required="false"/> diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml index daee8dd9ed9..dbe01c4a63e 100644 --- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml +++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/sts-client.xml @@ -68,7 +68,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="skpass"> + <sec:keyManagers keyPassword="sspass"> <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/> </sec:keyManagers> </http:tlsClientParameters> diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml index 4591236cf91..54edc220d4d 100644 --- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml +++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml @@ -94,7 +94,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml index cb15bc26a28..6060ef9f712 100644 --- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml +++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml @@ -99,7 +99,7 @@ <sec:trustManagers> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:trustManagers> - <sec:keyManagers keyPassword="stskpass"> + <sec:keyManagers keyPassword="stsspass"> <sec:keyStore type="jks" password="stsspass" resource="keys/stsstore.jks"/> </sec:keyManagers> <sec:clientAuthentication want="true" required="true"/> diff --git a/testutils/src/test/resources/keys/README.md b/testutils/src/test/resources/keys/README.md index 833fb49f04b..9ad9eaf4101 100644 --- a/testutils/src/test/resources/keys/README.md +++ b/testutils/src/test/resources/keys/README.md @@ -9,3 +9,14 @@ How to create / update certs and truststores 5. `keytool -importkeystore -srckeystore keyStore.p12 -srcstoretype pkcs12 -destalias <alias> -srcalias 1 -destkeystore <keystore.jks>` + + +How to create / update stsstore.jks, clientstore.jks and servicestore.jks +### + +1. `openssl req -x509 -newkey rsa:4096 -keyout myclientkey.pem -out myclientkey.cert -days 3650 -nodes` +2. `keytool -import -alias myclientkey -file myclientkey.cert -keystore stsstore.jks -trustcacerts` +3. `openssl req -x509 -newkey rsa:4096 -keyout myservicekey.pem -out myservicekey.cert -days 3650 -nodes` +4. `openssl pkcs12 -export -out mystskey.p12 -inkey myservicekey.pem -in myservicekey.cert -name mystskey` +5. `keytool -importkeystore -deststorepass stsspass -destkeystore clientstore.jks -srckeystore mystskey.p12 -srcstoretype PKCS12 -alias mystskey -destkeypass stspass` +6. `keytool -import -alias myservicekey -file myservicekey.cert -keystore stsstore.jks -trustcacerts` \ No newline at end of file diff --git a/testutils/src/test/resources/keys/clientstore.jks b/testutils/src/test/resources/keys/clientstore.jks index f734f87b3a8..ed9466aa793 100644 Binary files a/testutils/src/test/resources/keys/clientstore.jks and b/testutils/src/test/resources/keys/clientstore.jks differ diff --git a/testutils/src/test/resources/keys/servicestore.jks b/testutils/src/test/resources/keys/servicestore.jks index 999ee824c32..9f5b75af99c 100644 Binary files a/testutils/src/test/resources/keys/servicestore.jks and b/testutils/src/test/resources/keys/servicestore.jks differ diff --git a/testutils/src/test/resources/keys/stsstore.jks b/testutils/src/test/resources/keys/stsstore.jks index 51f131f2233..48d0eb1fe20 100644 Binary files a/testutils/src/test/resources/keys/stsstore.jks and b/testutils/src/test/resources/keys/stsstore.jks differ
