Using newer crypto syntax
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ff956909 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ff956909 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ff956909 Branch: refs/heads/master Commit: ff956909f7e8d107407f7eb11e5459e7c658f5ab Parents: e25a917 Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Jun 19 11:16:32 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Jun 19 12:29:05 2015 +0100 ---------------------------------------------------------------------- .../src/test/resources/alice-enc.properties | 10 +++++----- .../ws-security/src/test/resources/alice.properties | 10 +++++----- .../src/test/resources/bob-enc.properties | 10 +++++----- .../ws-security/src/test/resources/bob.properties | 10 +++++----- .../ws-security/src/test/resources/cxfca.properties | 10 +++++----- .../src/test/resources/morpit.properties | 10 +++++----- .../apache/cxf/systest/ws/security/alice.properties | 10 +++++----- .../apache/cxf/systest/ws/security/bob.properties | 10 +++++----- .../cxf/systest/ws/security/revocation.properties | 16 ++++++++-------- 9 files changed, 48 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/ff956909/systests/ws-security/src/test/resources/alice-enc.properties ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/alice-enc.properties b/systests/ws-security/src/test/resources/alice-enc.properties index bd65b62..41744da 100644 --- a/systests/ws-security/src/test/resources/alice-enc.properties +++ b/systests/ws-security/src/test/resources/alice-enc.properties @@ -14,8 +14,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin -org.apache.ws.security.crypto.merlin.keystore.type=jks -org.apache.ws.security.crypto.merlin.keystore.password=ENC(mC9pTqoZ9n1dW2wETrJEpHHDmgXn1e7T) -org.apache.ws.security.crypto.merlin.keystore.alias=alice -org.apache.ws.security.crypto.merlin.keystore.file=certs/alice.jks +org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin +org.apache.wss4j.crypto.merlin.keystore.type=jks +org.apache.wss4j.crypto.merlin.keystore.password=ENC(mC9pTqoZ9n1dW2wETrJEpHHDmgXn1e7T) +org.apache.wss4j.crypto.merlin.keystore.alias=alice +org.apache.wss4j.crypto.merlin.keystore.file=certs/alice.jks http://git-wip-us.apache.org/repos/asf/cxf/blob/ff956909/systests/ws-security/src/test/resources/alice.properties ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/alice.properties b/systests/ws-security/src/test/resources/alice.properties index 1b9111d..2cff960 100644 --- a/systests/ws-security/src/test/resources/alice.properties +++ b/systests/ws-security/src/test/resources/alice.properties @@ -14,8 +14,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin -org.apache.ws.security.crypto.merlin.keystore.type=jks -org.apache.ws.security.crypto.merlin.keystore.password=password -org.apache.ws.security.crypto.merlin.keystore.alias=alice -org.apache.ws.security.crypto.merlin.keystore.file=certs/alice.jks +org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin +org.apache.wss4j.crypto.merlin.keystore.type=jks +org.apache.wss4j.crypto.merlin.keystore.password=password +org.apache.wss4j.crypto.merlin.keystore.alias=alice +org.apache.wss4j.crypto.merlin.keystore.file=certs/alice.jks http://git-wip-us.apache.org/repos/asf/cxf/blob/ff956909/systests/ws-security/src/test/resources/bob-enc.properties ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/bob-enc.properties b/systests/ws-security/src/test/resources/bob-enc.properties index c26bb02..d017be7 100644 --- a/systests/ws-security/src/test/resources/bob-enc.properties +++ b/systests/ws-security/src/test/resources/bob-enc.properties @@ -14,8 +14,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin -org.apache.ws.security.crypto.merlin.keystore.type=jks -org.apache.ws.security.crypto.merlin.keystore.password=ENC(eAsmYazOvgvygJmuMzWG5uvRBmkvXf5G) -org.apache.ws.security.crypto.merlin.keystore.alias=bob -org.apache.ws.security.crypto.merlin.keystore.file=certs/bob.jks +org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin +org.apache.wss4j.crypto.merlin.keystore.type=jks +org.apache.wss4j.crypto.merlin.keystore.password=ENC(eAsmYazOvgvygJmuMzWG5uvRBmkvXf5G) +org.apache.wss4j.crypto.merlin.keystore.alias=bob +org.apache.wss4j.crypto.merlin.keystore.file=certs/bob.jks http://git-wip-us.apache.org/repos/asf/cxf/blob/ff956909/systests/ws-security/src/test/resources/bob.properties ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/bob.properties b/systests/ws-security/src/test/resources/bob.properties index 8df0ee0..6be229b 100644 --- a/systests/ws-security/src/test/resources/bob.properties +++ b/systests/ws-security/src/test/resources/bob.properties @@ -14,8 +14,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin -org.apache.ws.security.crypto.merlin.keystore.type=jks -org.apache.ws.security.crypto.merlin.keystore.password=password -org.apache.ws.security.crypto.merlin.keystore.alias=bob -org.apache.ws.security.crypto.merlin.keystore.file=certs/bob.jks +org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin +org.apache.wss4j.crypto.merlin.keystore.type=jks +org.apache.wss4j.crypto.merlin.keystore.password=password +org.apache.wss4j.crypto.merlin.keystore.alias=bob +org.apache.wss4j.crypto.merlin.keystore.file=certs/bob.jks http://git-wip-us.apache.org/repos/asf/cxf/blob/ff956909/systests/ws-security/src/test/resources/cxfca.properties ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/cxfca.properties b/systests/ws-security/src/test/resources/cxfca.properties index 50d1d48..3869bb0 100644 --- a/systests/ws-security/src/test/resources/cxfca.properties +++ b/systests/ws-security/src/test/resources/cxfca.properties @@ -14,10 +14,10 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin -org.apache.ws.security.crypto.merlin.keystore.type=jks -org.apache.ws.security.crypto.merlin.keystore.password=password -org.apache.ws.security.crypto.merlin.keystore.alias=cxfca -org.apache.ws.security.crypto.merlin.keystore.file=certs/cxfca.jks +org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin +org.apache.wss4j.crypto.merlin.keystore.type=jks +org.apache.wss4j.crypto.merlin.keystore.password=password +org.apache.wss4j.crypto.merlin.keystore.alias=cxfca +org.apache.wss4j.crypto.merlin.keystore.file=certs/cxfca.jks http://git-wip-us.apache.org/repos/asf/cxf/blob/ff956909/systests/ws-security/src/test/resources/morpit.properties ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/morpit.properties b/systests/ws-security/src/test/resources/morpit.properties index a955507..25732d9 100644 --- a/systests/ws-security/src/test/resources/morpit.properties +++ b/systests/ws-security/src/test/resources/morpit.properties @@ -14,8 +14,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin -org.apache.ws.security.crypto.merlin.keystore.type=jks -org.apache.ws.security.crypto.merlin.keystore.password=password -org.apache.ws.security.crypto.merlin.keystore.alias=morpit -org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/Morpit.jks +org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin +org.apache.wss4j.crypto.merlin.keystore.type=jks +org.apache.wss4j.crypto.merlin.keystore.password=password +org.apache.wss4j.crypto.merlin.keystore.alias=morpit +org.apache.wss4j.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/Morpit.jks http://git-wip-us.apache.org/repos/asf/cxf/blob/ff956909/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/alice.properties ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/alice.properties b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/alice.properties index 20b2bbf..74b56e2 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/alice.properties +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/alice.properties @@ -16,8 +16,8 @@ # specific language governing permissions and limitations # under the License. # -org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin -org.apache.ws.security.crypto.merlin.keystore.type=jks -org.apache.ws.security.crypto.merlin.keystore.password=password -org.apache.ws.security.crypto.merlin.keystore.alias=alice -org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/alice.jks +org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin +org.apache.wss4j.crypto.merlin.keystore.type=jks +org.apache.wss4j.crypto.merlin.keystore.password=password +org.apache.wss4j.crypto.merlin.keystore.alias=alice +org.apache.wss4j.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/alice.jks http://git-wip-us.apache.org/repos/asf/cxf/blob/ff956909/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/bob.properties ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/bob.properties b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/bob.properties index edd3f27..0a2c4d1 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/bob.properties +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/bob.properties @@ -16,8 +16,8 @@ # specific language governing permissions and limitations # under the License. # -org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin -org.apache.ws.security.crypto.merlin.keystore.type=jks -org.apache.ws.security.crypto.merlin.keystore.password=password -org.apache.ws.security.crypto.merlin.keystore.alias=bob -org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/bob.jks +org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin +org.apache.wss4j.crypto.merlin.keystore.type=jks +org.apache.wss4j.crypto.merlin.keystore.password=password +org.apache.wss4j.crypto.merlin.keystore.alias=bob +org.apache.wss4j.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/bob.jks http://git-wip-us.apache.org/repos/asf/cxf/blob/ff956909/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/revocation.properties ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/revocation.properties b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/revocation.properties index e29d2e6..dd76fe4 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/revocation.properties +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/revocation.properties @@ -16,11 +16,11 @@ # specific language governing permissions and limitations # under the License. # -org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin -org.apache.ws.security.crypto.merlin.keystore.type=jks -org.apache.ws.security.crypto.merlin.keystore.password=security -org.apache.ws.security.crypto.merlin.keystore.alias=wss40rev -org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/wss40rev.jks -org.apache.ws.security.crypto.merlin.truststore.password=security -org.apache.ws.security.crypto.merlin.truststore.file=org/apache/cxf/systest/ws/security/wss40CA.jks -org.apache.ws.security.crypto.merlin.x509crl.file=org/apache/cxf/systest/ws/security/wss40CACRL.pem +org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin +org.apache.wss4j.crypto.merlin.keystore.type=jks +org.apache.wss4j.crypto.merlin.keystore.password=security +org.apache.wss4j.crypto.merlin.keystore.alias=wss40rev +org.apache.wss4j.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/wss40rev.jks +org.apache.wss4j.crypto.merlin.truststore.password=security +org.apache.wss4j.crypto.merlin.truststore.file=org/apache/cxf/systest/ws/security/wss40CA.jks +org.apache.wss4j.crypto.merlin.x509crl.file=org/apache/cxf/systest/ws/security/wss40CACRL.pem
