Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A2B6B10A5B for ; Mon, 8 Dec 2014 16:18:05 +0000 (UTC) Received: (qmail 52681 invoked by uid 500); 8 Dec 2014 16:18:05 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 52620 invoked by uid 500); 8 Dec 2014 16:18:05 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 52611 invoked by uid 99); 8 Dec 2014 16:18:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Dec 2014 16:18:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 27B779C2787; Mon, 8 Dec 2014 16:18:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Message-Id: <5ceb037c7b064ce88191b651b65a8d7c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Some minor merges, disable a test on IBM JDK Date: Mon, 8 Dec 2014 16:18:05 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 80b0b9e59 -> 2f2ac3797 Some minor merges, disable a test on IBM JDK Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2f2ac379 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2f2ac379 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2f2ac379 Branch: refs/heads/3.0.x-fixes Commit: 2f2ac37975fac1358f3d66d17c7d33941fac0968 Parents: 80b0b9e Author: Colm O hEigeartaigh Authored: Mon Dec 8 16:12:09 2014 +0000 Committer: Colm O hEigeartaigh Committed: Mon Dec 8 16:15:46 2014 +0000 ---------------------------------------------------------------------- .../org/apache/cxf/common/util/crypto/MessageDigestUtils.java | 6 ++---- rt/rs/security/jose/pom.xml | 2 +- .../cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java | 7 ++++++- 3 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/2f2ac379/core/src/main/java/org/apache/cxf/common/util/crypto/MessageDigestUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/util/crypto/MessageDigestUtils.java b/core/src/main/java/org/apache/cxf/common/util/crypto/MessageDigestUtils.java index 314f791..24b096b 100644 --- a/core/src/main/java/org/apache/cxf/common/util/crypto/MessageDigestUtils.java +++ b/core/src/main/java/org/apache/cxf/common/util/crypto/MessageDigestUtils.java @@ -43,7 +43,7 @@ public final class MessageDigestUtils { public static String generate(byte[] input, String algo) { try { byte[] messageDigest = createDigest(input, algo); - StringBuffer hexString = new StringBuffer(); + StringBuilder hexString = new StringBuilder(); for (int i = 0; i < messageDigest.length; i++) { hexString.append(Integer.toHexString(0xFF & messageDigest[i])); } @@ -66,9 +66,7 @@ public final class MessageDigestUtils { public static byte[] createDigest(byte[] input, String algo) throws NoSuchAlgorithmException { MessageDigest md = MessageDigest.getInstance(algo); - md.reset(); - md.update(input); - return md.digest(); + return md.digest(input); } } http://git-wip-us.apache.org/repos/asf/cxf/blob/2f2ac379/rt/rs/security/jose/pom.xml ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose/pom.xml b/rt/rs/security/jose/pom.xml index 952dc8f..2223b98 100644 --- a/rt/rs/security/jose/pom.xml +++ b/rt/rs/security/jose/pom.xml @@ -51,7 +51,7 @@ bcprov-ext-jdk15on ${cxf.bcprov.version} provided - true + true http://git-wip-us.apache.org/repos/asf/cxf/blob/2f2ac379/rt/rs/security/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java b/rt/rs/security/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java index 41063f7..abf6e5a 100644 --- a/rt/rs/security/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java +++ b/rt/rs/security/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java @@ -31,7 +31,6 @@ import org.apache.cxf.rs.security.jose.JoseConstants; import org.apache.cxf.rs.security.jose.jwa.Algorithm; import org.apache.cxf.rs.security.jose.jws.JwsCompactReaderWriterTest; import org.bouncycastle.jce.provider.BouncyCastleProvider; - import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -117,6 +116,12 @@ public class JweCompactReaderWriterTest extends Assert { } @Test public void testEncryptDecryptAesGcmWrapA128CBCHS256() throws Exception { + // + // This test fails with the IBM JDK + // + if ("IBM Corporation".equals(System.getProperty("java.vendor"))) { + return; + } final String specPlainText = "Live long and prosper."; JweHeaders headers = new JweHeaders(); headers.setAlgorithm(JoseConstants.A128GCMKW_ALGO);