This is an automated email from the ASF dual-hosted git repository.
robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
The following commit(s) were added to refs/heads/master by this push:
new 1de26e22 more cert cleanup
1de26e22 is described below
commit 1de26e225e2b95a3f4891b268ae2d7ba49b7a0f5
Author: Robert Lazarski <robertlazar...@gmail.com>
AuthorDate: Sat Aug 24 18:18:58 2024 -1000
more cert cleanup
---
.../src/main/java/org/apache/rampart/policy/model/CryptoConfig.java | 4 ++--
.../main/java/org/apache/rampart/policy/model/RampartConfig.java | 4 ++--
modules/rampart-integration/pom.xml | 2 +-
.../rahas/policy/service-policy-symm-binding-saml2-publicKey.xml | 4 ++--
.../resources/rahas/policy/service-policy-symm-binding-saml2.xml | 4 ++--
.../src/test/resources/rahas/policy/service-policy-symm-binding.xml | 4 ++--
.../resources/rahas/policy/service-policy-transport-binding.xml | 4 ++--
.../src/test/resources/rahas/policy/sts-policy-asymm-binding.xml | 4 ++--
.../src/test/resources/rahas/policy/sts-policy-symm-binding.xml | 4 ++--
.../test/resources/rahas/policy/sts-policy-transport-binding.xml | 4 ++--
.../src/test/resources/rampart/issuer.properties | 4 ++--
modules/rampart-integration/src/test/resources/sec.properties | 4 ++--
.../java/org/apache/rampart/policy/model/RampartPolicyTest.java | 6 +++---
modules/rampart-tests/test-resources/policy/rampart-policy-1.xml | 4 ++--
.../rampart-tests/test-resources/trust/impl/sctIssuer.properties | 4 ++--
modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java | 4 ++--
.../src/test/java/org/apache/rahas/impl/SAML2TokenIssuerTest.java | 4 ++--
modules/rampart-trust/src/test/resources/crypto.config | 4 ++--
18 files changed, 36 insertions(+), 36 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/CryptoConfig.java
b/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/CryptoConfig.java
index abe35f1c..935a10da 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/CryptoConfig.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/CryptoConfig.java
@@ -33,8 +33,8 @@ import java.util.Properties;
* Example:
<pre>
<ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
- <ramp:property name="keystoreType">JKS</ramp:property>
- <ramp:property
name="keystoreFile">/path/to/file.jks</ramp:property>
+ <ramp:property name="keystoreType">pkcs12</ramp:property>
+ <ramp:property
name="keystoreFile">/path/to/file.pkcs12</ramp:property>
<ramp:property name="keystorePassword">password</ramp:property>
</ramp:crypto>
</pre>
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/RampartConfig.java
b/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/RampartConfig.java
index bdad0698..314ed9cd 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/RampartConfig.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/RampartConfig.java
@@ -43,8 +43,8 @@ import javax.xml.stream.XMLStreamWriter;
*
* <ramp:signatureCrypto>
* <ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
- * <ramp:property
name="keystoreType">JKS</ramp:property>
- * <ramp:property
name="keystoreFile">/path/to/file.jks</ramp:property>
+ * <ramp:property
name="keystoreType">pkcs12</ramp:property>
+ * <ramp:property
name="keystoreFile">/path/to/file.pkcs12</ramp:property>
* <ramp:property
name="keystorePassword">password</ramp:property>
* </ramp:crypto>
* </ramp:signatureCrypto>
diff --git a/modules/rampart-integration/pom.xml
b/modules/rampart-integration/pom.xml
index a5d3dbab..80296bcc 100644
--- a/modules/rampart-integration/pom.xml
+++ b/modules/rampart-integration/pom.xml
@@ -161,7 +161,7 @@
<mkdir dir="target/temp-ramp" />
<mkdir dir="target/temp-ramp/META-INF" />
- <copy overwrite="yes"
file="src/test/resources/rampart/store2024.pkcs12"
tofile="target/temp-ramp/store.jks" />
+ <copy overwrite="yes"
file="src/test/resources/rampart/store2024.pkcs12"
tofile="target/temp-ramp/store2024.pkcs12" />
<!--path id="ramp.client.props"
location="test-resources/rampart"/-->
<!--maven:addPath
id="maven.dependency.classpath" refid="ramp.client.props" -->
<mkdir
dir="target/test-resources/rampart_client_repo" />
diff --git
a/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding-saml2-publicKey.xml
b/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding-saml2-publicKey.xml
index 3635aa2c..f739c48e 100644
---
a/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding-saml2-publicKey.xml
+++
b/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding-saml2-publicKey.xml
@@ -53,14 +53,14 @@
<ramp:signatureCrypto>
<ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">pkcs12</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store.jks</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store2024.pkcs12</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
</ramp:crypto>
</ramp:signatureCrypto>
<ramp:encryptionCypto>
<ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">pkcs12</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store.jks</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store2024.pkcs12</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
</ramp:crypto>
</ramp:encryptionCypto>
diff --git
a/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding-saml2.xml
b/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding-saml2.xml
index e5574ede..c9752257 100644
---
a/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding-saml2.xml
+++
b/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding-saml2.xml
@@ -53,14 +53,14 @@
<ramp:signatureCrypto>
<ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">pkcs12</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store.jks</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store2024.pkcs12</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
</ramp:crypto>
</ramp:signatureCrypto>
<ramp:encryptionCypto>
<ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">pkcs12</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store.jks</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store2024.pkcs12</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
</ramp:crypto>
</ramp:encryptionCypto>
diff --git
a/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding.xml
b/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding.xml
index 92e77fb9..ff50f972 100644
---
a/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding.xml
+++
b/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding.xml
@@ -53,14 +53,14 @@
<ramp:signatureCrypto>
<ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">pkcs12</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store.jks</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store2024.pkcs12</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
</ramp:crypto>
</ramp:signatureCrypto>
<ramp:encryptionCypto>
<ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">pkcs12</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store.jks</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store2024.pkcs12</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
</ramp:crypto>
</ramp:encryptionCypto>
diff --git
a/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-transport-binding.xml
b/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-transport-binding.xml
index 17d6f6b3..ca3962ed 100644
---
a/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-transport-binding.xml
+++
b/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-transport-binding.xml
@@ -56,14 +56,14 @@
<ramp:signatureCrypto>
<ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">pkcs12</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store.jks</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store2024.pkcs12</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
</ramp:crypto>
</ramp:signatureCrypto>
<ramp:encryptionCypto>
<ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">pkcs12</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store.jks</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store2024.pkcs12</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
</ramp:crypto>
</ramp:encryptionCypto>
diff --git
a/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-asymm-binding.xml
b/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-asymm-binding.xml
index 3093dfb4..b0dc01cb 100644
---
a/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-asymm-binding.xml
+++
b/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-asymm-binding.xml
@@ -49,14 +49,14 @@
<ramp:signatureCrypto>
<ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">pkcs12</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store.jks</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store2024.pkcs12</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
</ramp:crypto>
</ramp:signatureCrypto>
<ramp:encryptionCypto>
<ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">pkcs12</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store.jks</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store2024.pkcs12</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
</ramp:crypto>
</ramp:encryptionCypto>
diff --git
a/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-symm-binding.xml
b/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-symm-binding.xml
index dcaaa1a4..23ebf6bc 100644
---
a/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-symm-binding.xml
+++
b/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-symm-binding.xml
@@ -56,14 +56,14 @@
<ramp:signatureCrypto>
<ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">pkcs12</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store.jks</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store2024.pkcs12</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
</ramp:crypto>
</ramp:signatureCrypto>
<ramp:encryptionCypto>
<ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">pkcs12</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store.jks</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store2024.pkcs12</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
</ramp:crypto>
</ramp:encryptionCypto>
diff --git
a/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-transport-binding.xml
b/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-transport-binding.xml
index af3065d6..5c4107ce 100644
---
a/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-transport-binding.xml
+++
b/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-transport-binding.xml
@@ -46,14 +46,14 @@
<ramp:signatureCrypto>
<ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">pkcs12</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store.jks</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store2024.pkcs12</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
</ramp:crypto>
</ramp:signatureCrypto>
<ramp:encryptionCypto>
<ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">pkcs12</ramp:property>
- <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store.jks</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/rahas/policy/store2024.pkcs12</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
</ramp:crypto>
</ramp:encryptionCypto>
diff --git
a/modules/rampart-integration/src/test/resources/rampart/issuer.properties
b/modules/rampart-integration/src/test/resources/rampart/issuer.properties
index 51d7b004..c3f5773c 100755
--- a/modules/rampart-integration/src/test/resources/rampart/issuer.properties
+++ b/modules/rampart-integration/src/test/resources/rampart/issuer.properties
@@ -1,4 +1,4 @@
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.type=pkcs12
org.apache.ws.security.crypto.merlin.keystore.password=password
-org.apache.ws.security.crypto.merlin.file=rampart/store.jks
+org.apache.ws.security.crypto.merlin.file=rampart/store2024.pkcs12
diff --git a/modules/rampart-integration/src/test/resources/sec.properties
b/modules/rampart-integration/src/test/resources/sec.properties
index 3c3298d8..dbed7ff7 100755
--- a/modules/rampart-integration/src/test/resources/sec.properties
+++ b/modules/rampart-integration/src/test/resources/sec.properties
@@ -1,5 +1,5 @@
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.type=pkcs12
org.apache.ws.security.crypto.merlin.keystore.password=password
-org.apache.ws.security.crypto.merlin.file=sec.jks
+org.apache.ws.security.crypto.merlin.file=sec2024.pkcs12
diff --git
a/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java
b/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java
index da6b0dea..20d9296e 100644
---
a/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java
+++
b/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java
@@ -71,12 +71,12 @@ public class RampartPolicyTest extends TestCase {
Properties prop = sigCryptoConfig.getProp();
assertEquals("Incorrect number of properties", 3, prop.size());
- assertEquals("Incorrect property value", "JKS", prop
+ assertEquals("Incorrect property value", "pkcs12", prop
.getProperty("keystoreType"));
- assertEquals("Incorrect property value", "/path/to/file.jks", prop
+ assertEquals("Incorrect property value", "/path/to/file.pkcs12", prop
.getProperty("keystoreFile"));
assertEquals("Incorrect property value", "password", prop
.getProperty("keystorePassword"));
}
-}
\ No newline at end of file
+}
diff --git a/modules/rampart-tests/test-resources/policy/rampart-policy-1.xml
b/modules/rampart-tests/test-resources/policy/rampart-policy-1.xml
index 5f1e907c..90de3e3e 100644
--- a/modules/rampart-tests/test-resources/policy/rampart-policy-1.xml
+++ b/modules/rampart-tests/test-resources/policy/rampart-policy-1.xml
@@ -6,8 +6,8 @@
<ramp:signatureCrypto>
<ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
- <ramp:property
name="keystoreType">JKS</ramp:property>
- <ramp:property
name="keystoreFile">/path/to/file.jks</ramp:property>
+ <ramp:property
name="keystoreType">pkcs12</ramp:property>
+ <ramp:property
name="keystoreFile">/path/to/file.pkcs12</ramp:property>
<ramp:property
name="keystorePassword">password</ramp:property>
</ramp:crypto>
</ramp:signatureCrypto>
diff --git
a/modules/rampart-tests/test-resources/trust/impl/sctIssuer.properties
b/modules/rampart-tests/test-resources/trust/impl/sctIssuer.properties
index c126c57e..b8dbe55c 100755
--- a/modules/rampart-tests/test-resources/trust/impl/sctIssuer.properties
+++ b/modules/rampart-tests/test-resources/trust/impl/sctIssuer.properties
@@ -1,4 +1,4 @@
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.type=pkcs12
org.apache.ws.security.crypto.merlin.keystore.password=password
-org.apache.ws.security.crypto.merlin.file=sts.jks
+org.apache.ws.security.crypto.merlin.file=sts2024.pkcs12
diff --git
a/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
b/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
index f5f2341e..5d26a1eb 100644
--- a/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
+++ b/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
@@ -594,8 +594,8 @@ public class TrustUtil {
Process an element similar to this;
<crypto
provider="org.apache.ws.security.components.crypto.Merlin">
- <property
name="org.apache.ws.security.crypto.merlin.keystore.type">jks</property>
- <property
name="org.apache.ws.security.crypto.merlin.file">sts.jks</property>
+ <property
name="org.apache.ws.security.crypto.merlin.keystore.type">pkcs12</property>
+ <property
name="org.apache.ws.security.crypto.merlin.file">sts2024.pkcs12</property>
<property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</property>
</crypto>
*/
diff --git
a/modules/rampart-trust/src/test/java/org/apache/rahas/impl/SAML2TokenIssuerTest.java
b/modules/rampart-trust/src/test/java/org/apache/rahas/impl/SAML2TokenIssuerTest.java
index c227748c..78dab4e3 100644
---
a/modules/rampart-trust/src/test/java/org/apache/rahas/impl/SAML2TokenIssuerTest.java
+++
b/modules/rampart-trust/src/test/java/org/apache/rahas/impl/SAML2TokenIssuerTest.java
@@ -45,8 +45,8 @@ public class SAML2TokenIssuerTest extends AbstractTestCase {
"<issuerKeyAlias>apache</issuerKeyAlias>" +
"<issuerKeyPassword>password</issuerKeyPassword>" +
"<cryptoProperties><crypto
provider=\"org.apache.ws.security.components.crypto.Merlin\">" +
- "<property
name=\"org.apache.ws.security.crypto.merlin.keystore.type\">JKS</property>" +
- "<property
name=\"org.apache.ws.security.crypto.merlin.file\">src/test/resources/keystore.jks</property>"
+
+ "<property
name=\"org.apache.ws.security.crypto.merlin.keystore.type\">pkcs12</property>" +
+ "<property
name=\"org.apache.ws.security.crypto.merlin.file\">src/test/resources/apache.pkcs12</property>"
+
"<property
name=\"org.apache.ws.security.crypto.merlin.keystore.password\">password</property></crypto>"
+
"</cryptoProperties>" +
"<timeToLive>300000</timeToLive>" +
diff --git a/modules/rampart-trust/src/test/resources/crypto.config
b/modules/rampart-trust/src/test/resources/crypto.config
index fb4c2dda..3122e11b 100644
--- a/modules/rampart-trust/src/test/resources/crypto.config
+++ b/modules/rampart-trust/src/test/resources/crypto.config
@@ -1,5 +1,5 @@
org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
-org.apache.wss4j.crypto.merlin.keystore.type=jks
+org.apache.wss4j.crypto.merlin.keystore.type=pkcs12
org.apache.wss4j.crypto.merlin.keystore.password=password
org.apache.wss4j.crypto.merlin.keystore.alias=apache
-org.apache.wss4j.crypto.merlin.file=keystore.jks
+org.apache.wss4j.crypto.merlin.file=apache.pkcs12
