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 3DB4F17EA1 for ; Mon, 7 Sep 2015 15:41:45 +0000 (UTC) Received: (qmail 26684 invoked by uid 500); 7 Sep 2015 15:41:23 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 26629 invoked by uid 500); 7 Sep 2015 15:41:22 -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 26618 invoked by uid 99); 7 Sep 2015 15:41:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Sep 2015 15:41:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CB7E5E00D8; Mon, 7 Sep 2015 15:41:22 +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 Date: Mon, 07 Sep 2015 15:41:22 -0000 Message-Id: <4b4c4473eefd4feea68c576439446c28@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/4] cxf git commit: Fixing bug with setting the signature digest algorithm for the SymmetricBinding Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 66eac9bc0 -> fea7b4dc8 Fixing bug with setting the signature digest algorithm for the SymmetricBinding Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/edb79aaa Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/edb79aaa Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/edb79aaa Branch: refs/heads/3.0.x-fixes Commit: edb79aaae7672449bb0a1e3e9c48caa4791694c6 Parents: 66eac9b Author: Colm O hEigeartaigh Authored: Mon Sep 7 12:08:19 2015 +0100 Committer: Colm O hEigeartaigh Committed: Mon Sep 7 15:51:11 2015 +0100 ---------------------------------------------------------------------- .../ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java | 2 ++ .../ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/edb79aaa/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java index 0bbcff7..d8ec26a 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java @@ -2015,6 +2015,8 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle sig.setCustomTokenId(sigTokId); sig.setSecretKey(tok.getSecret()); sig.setSignatureAlgorithm(binding.getAlgorithmSuite().getSymmetricSignature()); + AlgorithmSuiteType algType = binding.getAlgorithmSuite().getAlgorithmSuiteType(); + sig.setDigestAlgo(algType.getDigest()); sig.setSigCanonicalization(binding.getAlgorithmSuite().getC14n().getValue()); sig.prepare(doc, getSignatureCrypto(), secHeader); http://git-wip-us.apache.org/repos/asf/cxf/blob/edb79aaa/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java index 9437a59..979d170 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java @@ -845,6 +845,8 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder { sig.setCustomTokenId(sigTokId); sig.setSecretKey(tok.getSecret()); sig.setSignatureAlgorithm(sbinding.getAlgorithmSuite().getSymmetricSignature()); + AlgorithmSuiteType algType = sbinding.getAlgorithmSuite().getAlgorithmSuiteType(); + sig.setDigestAlgo(algType.getDigest()); sig.setSigCanonicalization(sbinding.getAlgorithmSuite().getC14n().getValue()); Crypto crypto = null; if (sbinding.getProtectionToken() != null) {