cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject git commit: Fixing the JWE tests failing in Java 6 builds
Date Tue, 07 Oct 2014 20:25:23 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 3ac8156da -> f3012dc1f


Fixing the JWE tests failing in Java 6 builds


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

Branch: refs/heads/3.0.x-fixes
Commit: f3012dc1f948c4f6f487d88ccd81090994b3f8fd
Parents: 3ac8156
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Tue Oct 7 21:24:59 2014 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Tue Oct 7 21:24:59 2014 +0100

----------------------------------------------------------------------
 .../java/org/apache/cxf/common/util/crypto/CryptoUtils.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f3012dc1/core/src/main/java/org/apache/cxf/common/util/crypto/CryptoUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/crypto/CryptoUtils.java b/core/src/main/java/org/apache/cxf/common/util/crypto/CryptoUtils.java
index 260c203..7b6a8a6 100644
--- a/core/src/main/java/org/apache/cxf/common/util/crypto/CryptoUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/crypto/CryptoUtils.java
@@ -46,12 +46,14 @@ import java.security.spec.ECPublicKeySpec;
 import java.security.spec.RSAPrivateCrtKeySpec;
 import java.security.spec.RSAPrivateKeySpec;
 import java.security.spec.RSAPublicKeySpec;
+import java.util.logging.Logger;
 import javax.crypto.Cipher;
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.common.logging.LogUtils; 
 import org.apache.cxf.common.util.Base64UrlUtility;
 import org.apache.cxf.common.util.CompressionUtils;
 import org.apache.cxf.helpers.IOUtils;
@@ -62,6 +64,8 @@ import org.apache.cxf.helpers.IOUtils;
  */
 public final class CryptoUtils {
     
+    private static final Logger LOG = LogUtils.getL7dLogger(CryptoUtils.class);     
+    
     private CryptoUtils() {
     }
     
@@ -547,7 +551,7 @@ public final class CryptoUtils {
                     Method m = Cipher.class.getMethod("updateAAD", new Class[]{byte[].class});
                     m.invoke(c, new Object[]{keyProps.getAdditionalData()});
                 } catch (NoSuchMethodException ex) {
-                    throw new SecurityException(ex);
+                    LOG.fine(ex.getMessage()); 
                 }
             }
             return c;


Mime
View raw message