cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Minor updatew to JweUtils
Date Thu, 04 Aug 2016 12:18:05 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 2bc15f89b -> 21f50ebda


Minor updatew to JweUtils


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/21f50ebd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/21f50ebd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/21f50ebd

Branch: refs/heads/3.1.x-fixes
Commit: 21f50ebda6a66a4ae3860dd95b63add684546ced
Parents: 2bc15f8
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Thu Aug 4 13:15:23 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Thu Aug 4 13:17:42 2016 +0100

----------------------------------------------------------------------
 .../org/apache/cxf/rs/security/jose/jwe/JweUtils.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/21f50ebd/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 92038f3..aa53f27 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
@@ -508,6 +508,11 @@ public final class JweUtils {
     }
     public static JweEncryptionProvider createJweEncryptionProvider(PublicKey key,
                                                                     KeyAlgorithm keyAlgo,
+                                                                    ContentAlgorithm contentEncryptionAlgo)
{
+        return createJweEncryptionProvider(key, keyAlgo, contentEncryptionAlgo, null);
+    }
+    public static JweEncryptionProvider createJweEncryptionProvider(PublicKey key,
+                                                                    KeyAlgorithm keyAlgo,
                                                                     ContentAlgorithm contentEncryptionAlgo,
                                                                     String compression) {
         KeyEncryptionProvider keyEncryptionProvider = getPublicKeyEncryptionProvider(key,
keyAlgo);
@@ -520,6 +525,11 @@ public final class JweUtils {
     }
     public static JweEncryptionProvider createJweEncryptionProvider(SecretKey key,
                                                                     KeyAlgorithm keyAlgo,
+                                                                    ContentAlgorithm contentEncryptionAlgo)
{
+        return createJweEncryptionProvider(key, keyAlgo, contentEncryptionAlgo, null);
+    }
+    public static JweEncryptionProvider createJweEncryptionProvider(SecretKey key,
+                                                                    KeyAlgorithm keyAlgo,
                                                                     ContentAlgorithm contentEncryptionAlgo,
                                                                     String compression) {
         KeyEncryptionProvider keyEncryptionProvider = getSecretKeyEncryptionAlgorithm(key,
keyAlgo);
@@ -531,6 +541,10 @@ public final class JweUtils {
         return createJweEncryptionProvider(keyEncryptionProvider, headers);
     }
     public static JweEncryptionProvider createJweEncryptionProvider(JsonWebKey key,
+                                                                    ContentAlgorithm contentEncryptionAlgo)
{
+        return createJweEncryptionProvider(key, contentEncryptionAlgo, null);
+    }
+    public static JweEncryptionProvider createJweEncryptionProvider(JsonWebKey key,
                                                                     ContentAlgorithm contentEncryptionAlgo,
                                                                     String compression) {
         KeyEncryptionProvider keyEncryptionProvider = getKeyEncryptionProvider(key);


Mime
View raw message