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 0F7879002 for ; Tue, 21 Feb 2012 13:29:27 +0000 (UTC) Received: (qmail 75546 invoked by uid 500); 21 Feb 2012 13:29:27 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 75479 invoked by uid 500); 21 Feb 2012 13:29:26 -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 75472 invoked by uid 99); 21 Feb 2012 13:29:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Feb 2012 13:29:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Feb 2012 13:29:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2861723889E2; Tue, 21 Feb 2012 13:29:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1291771 - in /cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml: AbstractXmlSigInHandler.java EncryptionUtils.java Date: Tue, 21 Feb 2012 13:29:04 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120221132904.2861723889E2@eris.apache.org> Author: coheigea Date: Tue Feb 21 13:29:03 2012 New Revision: 1291771 URL: http://svn.apache.org/viewvc?rev=1291771&view=rev Log: Enabling secure validation for RS-Security Modified: cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionUtils.java Modified: cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java?rev=1291771&r1=1291770&r2=1291771&view=diff ============================================================================== --- cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java (original) +++ cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlSigInHandler.java Tue Feb 21 13:29:03 2012 @@ -88,9 +88,7 @@ public class AbstractXmlSigInHandler ext boolean valid = false; Reference ref = null; try { - XMLSignature signature = new XMLSignature(signatureElement, ""); - // TODO re-enable this line once we pick up xmlsec 1.5.0 - // XMLSignature signature = new XMLSignature(signatureElement, "", true); + XMLSignature signature = new XMLSignature(signatureElement, "", true); ref = getReference(signature); Element signedElement = validateReference(root, ref); if (signedElement.hasAttributeNS(null, "ID")) { Modified: cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionUtils.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionUtils.java?rev=1291771&r1=1291770&r2=1291771&view=diff ============================================================================== --- cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionUtils.java (original) +++ cxf/trunk/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionUtils.java Tue Feb 21 13:29:03 2012 @@ -64,6 +64,7 @@ public final class EncryptionUtils { throws WSSecurityException { try { XMLCipher cipher = XMLCipher.getInstance(symEncAlgo); + cipher.setSecureValidation(true); cipher.init(mode, key); return cipher; } catch (XMLEncryptionException ex) {