You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2016/02/29 18:01:09 UTC
cxf git commit: [CXF-6808] Making it a bit easier to deal with many
signature/encryption properties in a single endpoint
Repository: cxf
Updated Branches:
refs/heads/master 92c11f07e -> 8f8291937
[CXF-6808] Making it a bit easier to deal with many signature/encryption properties in a single endpoint
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8f829193
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8f829193
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8f829193
Branch: refs/heads/master
Commit: 8f8291937fd23062e5dbdfc337792f7ed5fc2e4e
Parents: 92c11f0
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon Feb 29 17:00:51 2016 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Mon Feb 29 17:00:51 2016 +0000
----------------------------------------------------------------------
.../main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java | 5 +++++
.../main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java | 5 +++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8f829193/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
index d92b8d1..92038f3 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
@@ -822,6 +822,11 @@ public final class JweUtils {
JoseConstants.RSSEC_ENCRYPTION_PROPS);
}
+
+ public static Properties loadEncryptionProperties(String propertiesName, boolean required) {
+ Message m = PhaseInterceptorChain.getCurrentMessage();
+ return KeyManagementUtils.loadStoreProperties(m, required, propertiesName, null);
+ }
public static void checkEncryptionKeySize(Key key) {
if (key instanceof RSAKey && ((RSAKey)key).getModulus().bitLength() < 2048) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8f829193/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java
index ff3e77d..da4641a 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java
@@ -240,6 +240,11 @@ public final class JwsUtils {
JoseConstants.RSSEC_SIGNATURE_PROPS);
}
+ public static Properties loadSignatureProperties(String propertiesName, boolean required) {
+ Message m = PhaseInterceptorChain.getCurrentMessage();
+ return KeyManagementUtils.loadStoreProperties(m, required, propertiesName, null);
+
+ }
public static JwsSignatureVerifier loadSignatureVerifier(boolean required) {
return loadSignatureVerifier(null, required);
}