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 ddff746b Fix some JKS / pkcs12 mismatches from a previous commit
ddff746b is described below
commit ddff746ba1ede3326f14b5992a277c5f11806657
Author: Robert Lazarski <robertlazar...@gmail.com>
AuthorDate: Tue Oct 22 13:43:15 2024 -1000
Fix some JKS / pkcs12 mismatches from a previous commit
---
modules/rampart-samples/policy/sample02/policy.xml | 4 ++--
modules/rampart-samples/policy/sample02/services.xml | 2 +-
modules/rampart-samples/policy/sample03/policy.xml | 4 ++--
modules/rampart-samples/policy/sample03/services.xml | 4 ++--
modules/rampart-samples/policy/sample04/policy.xml | 6 +++---
modules/rampart-samples/policy/sample04/services.xml | 8 ++++----
modules/rampart-samples/policy/sample05/policy.xml | 2 +-
modules/rampart-samples/policy/sample05/services.xml | 6 +++---
modules/rampart-samples/policy/sample05/sts_policy.xml | 2 +-
modules/rampart-samples/policy/sample06/sts_policy.xml | 2 +-
modules/rampart-samples/policy/sample08/services.xml | 2 +-
11 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/modules/rampart-samples/policy/sample02/policy.xml
b/modules/rampart-samples/policy/sample02/policy.xml
index b8835960..38e82a26 100644
--- a/modules/rampart-samples/policy/sample02/policy.xml
+++ b/modules/rampart-samples/policy/sample02/policy.xml
@@ -75,7 +75,7 @@
<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.keystore.type">JKS</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.file">client.jks</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache
</ramp:property>
@@ -85,4 +85,4 @@
</wsp:All>
</wsp:ExactlyOne>
-</wsp:Policy>
\ No newline at end of file
+</wsp:Policy>
diff --git a/modules/rampart-samples/policy/sample02/services.xml
b/modules/rampart-samples/policy/sample02/services.xml
index d0f060e9..223ae982 100644
--- a/modules/rampart-samples/policy/sample02/services.xml
+++ b/modules/rampart-samples/policy/sample02/services.xml
@@ -86,7 +86,7 @@
<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.keystore.type">JKS</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.file">service.jks</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache
</ramp:property>
diff --git a/modules/rampart-samples/policy/sample03/policy.xml
b/modules/rampart-samples/policy/sample03/policy.xml
index 76f5081f..72e85aca 100644
--- a/modules/rampart-samples/policy/sample03/policy.xml
+++ b/modules/rampart-samples/policy/sample03/policy.xml
@@ -80,7 +80,7 @@
<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.keystore.type">JKS</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.file">client.jks</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache
</ramp:property>
@@ -88,7 +88,7 @@
</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.keystore.type">JKS</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.file">client.jks</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache
</ramp:property>
diff --git a/modules/rampart-samples/policy/sample03/services.xml
b/modules/rampart-samples/policy/sample03/services.xml
index 3fa080a3..b41d8c3f 100644
--- a/modules/rampart-samples/policy/sample03/services.xml
+++ b/modules/rampart-samples/policy/sample03/services.xml
@@ -89,7 +89,7 @@
<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.keystore.type">JKS</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.file">service.jks</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache
</ramp:property>
@@ -97,7 +97,7 @@
</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.keystore.type">JKS</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.file">service.jks</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache
</ramp:property>
diff --git a/modules/rampart-samples/policy/sample04/policy.xml
b/modules/rampart-samples/policy/sample04/policy.xml
index 6a2bcd0b..dbd15fe4 100644
--- a/modules/rampart-samples/policy/sample04/policy.xml
+++ b/modules/rampart-samples/policy/sample04/policy.xml
@@ -131,14 +131,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.keystore.type">JKS</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.file">client.jks</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache</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.keystore.type">JKS</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.file">client.jks</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
</ramp:crypto>
@@ -147,4 +147,4 @@
</ramp:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
-</wsp:Policy>
\ No newline at end of file
+</wsp:Policy>
diff --git a/modules/rampart-samples/policy/sample04/services.xml
b/modules/rampart-samples/policy/sample04/services.xml
index 27481355..b94c4613 100644
--- a/modules/rampart-samples/policy/sample04/services.xml
+++ b/modules/rampart-samples/policy/sample04/services.xml
@@ -141,14 +141,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.keystore.type">JKS</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.file">service.jks</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache</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.keystore.type">JKS</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.file">service.jks</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
</ramp:crypto>
@@ -163,8 +163,8 @@
<sct-issuer-config>
<cryptoProperties>
<crypto
provider="org.apache.ws.security.components.crypto.Merlin">
- <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.type">JKS</property>
+ <property
name="org.apache.ws.security.crypto.merlin.file">sts.jks</property>
<property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</property>
</crypto>
</cryptoProperties>
diff --git a/modules/rampart-samples/policy/sample05/policy.xml
b/modules/rampart-samples/policy/sample05/policy.xml
index b03cd9e0..6fd65f32 100755
--- a/modules/rampart-samples/policy/sample05/policy.xml
+++ b/modules/rampart-samples/policy/sample05/policy.xml
@@ -75,7 +75,7 @@
<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.keystore.type">JKS</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.file">client.jks</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
</ramp:crypto>
diff --git a/modules/rampart-samples/policy/sample05/services.xml
b/modules/rampart-samples/policy/sample05/services.xml
index 81a7c905..e626e2ce 100644
--- a/modules/rampart-samples/policy/sample05/services.xml
+++ b/modules/rampart-samples/policy/sample05/services.xml
@@ -28,7 +28,7 @@
<issuerKeyPassword>apache</issuerKeyPassword>
<cryptoProperties>
<crypto
provider="org.apache.ws.security.components.crypto.Merlin">
- <property
name="org.apache.ws.security.crypto.merlin.keystore.type">pkcs12</property>
+ <property
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</property>
<property
name="org.apache.ws.security.crypto.merlin.file">service.jks</property>
<property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache</property>
</crypto>
@@ -115,7 +115,7 @@
<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.keystore.type">JKS</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.file">service.jks</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
</ramp:crypto>
@@ -216,7 +216,7 @@
<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.keystore.type">JKS</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.file">service.jks</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
</ramp:crypto>
diff --git a/modules/rampart-samples/policy/sample05/sts_policy.xml
b/modules/rampart-samples/policy/sample05/sts_policy.xml
index 550adad8..a656287d 100644
--- a/modules/rampart-samples/policy/sample05/sts_policy.xml
+++ b/modules/rampart-samples/policy/sample05/sts_policy.xml
@@ -71,7 +71,7 @@
<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.keystore.type">JKS</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.file">client.jks</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
</ramp:crypto>
diff --git a/modules/rampart-samples/policy/sample06/sts_policy.xml
b/modules/rampart-samples/policy/sample06/sts_policy.xml
index c11a3537..3d1b6b5a 100644
--- a/modules/rampart-samples/policy/sample06/sts_policy.xml
+++ b/modules/rampart-samples/policy/sample06/sts_policy.xml
@@ -52,7 +52,7 @@
<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.keystore.type">JKS</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.file">client.jks</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
</ramp:crypto>
diff --git a/modules/rampart-samples/policy/sample08/services.xml
b/modules/rampart-samples/policy/sample08/services.xml
index 8c4e2fa9..b45ec9ca 100644
--- a/modules/rampart-samples/policy/sample08/services.xml
+++ b/modules/rampart-samples/policy/sample08/services.xml
@@ -114,7 +114,7 @@
<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.keystore.type">JKS</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.file">service.jks</ramp:property>
<ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
</ramp:crypto>
