Return-Path: X-Original-To: apmail-poi-commits-archive@minotaur.apache.org Delivered-To: apmail-poi-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 33187102AA for ; Thu, 22 Oct 2015 15:21:37 +0000 (UTC) Received: (qmail 72750 invoked by uid 500); 22 Oct 2015 15:21:35 -0000 Delivered-To: apmail-poi-commits-archive@poi.apache.org Received: (qmail 72710 invoked by uid 500); 22 Oct 2015 15:21:35 -0000 Mailing-List: contact commits-help@poi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@poi.apache.org Delivered-To: mailing list commits@poi.apache.org Received: (qmail 72701 invoked by uid 99); 22 Oct 2015 15:21:35 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Oct 2015 15:21:35 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id E68A8C0EDB for ; Thu, 22 Oct 2015 15:21:34 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id bP0ty1sLa0Mp for ; Thu, 22 Oct 2015 15:21:26 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with ESMTP id CE9BF439C2 for ; Thu, 22 Oct 2015 15:21:25 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 6DAD8E0183 for ; Thu, 22 Oct 2015 15:21:25 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 6C3E73A024F for ; Thu, 22 Oct 2015 15:21:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1710032 - in /poi: site/src/documentation/content/xdocs/ trunk/ trunk/sonar/ooxml/ trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/ trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/ Date: Thu, 22 Oct 2015 15:21:25 -0000 To: commits@poi.apache.org From: centic@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20151022152125.6C3E73A024F@svn01-us-west.apache.org> Author: centic Date: Thu Oct 22 15:21:25 2015 New Revision: 1710032 URL: http://svn.apache.org/viewvc?rev=1710032&view=rev Log: Set newer curvesapi-version in .classpath as well and update some third-party libs for the password-protection-code to the latest versions Modified: poi/site/src/documentation/content/xdocs/encryption.xml poi/site/src/documentation/content/xdocs/overview.xml poi/trunk/.classpath poi/trunk/build.xml poi/trunk/sonar/ooxml/pom.xml poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java Modified: poi/site/src/documentation/content/xdocs/encryption.xml URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/encryption.xml?rev=1710032&r1=1710031&r2=1710032&view=diff ============================================================================== --- poi/site/src/documentation/content/xdocs/encryption.xml (original) +++ poi/site/src/documentation/content/xdocs/encryption.xml Thu Oct 22 15:21:25 2015 @@ -241,9 +241,9 @@ fos.close();

The classes have been tested against the following libraries, which need to be included additionally to the default dependencies:

    -
  • BouncyCastle bcpkix and bcprov (tested against 1.51)
    • -
  • Apache Santuario "xmlsec" (tested against 2.0.1)
    • -
  • and slf4j-api (tested against 1.7.7)
    • +
  • BouncyCastle bcpkix and bcprov (tested against 1.53)
    • +
  • Apache Santuario "xmlsec" (tested against 2.0.5)
    • +
  • and slf4j-api (tested against 1.7.12)

Depending on the configuration and the activated facets Modified: poi/site/src/documentation/content/xdocs/overview.xml URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/overview.xml?rev=1710032&r1=1710031&r2=1710032&view=diff ============================================================================== --- poi/site/src/documentation/content/xdocs/overview.xml (original) +++ poi/site/src/documentation/content/xdocs/overview.xml Thu Oct 22 15:21:25 2015 @@ -298,10 +298,10 @@ ooxml-security xmlbeans
For signing: - bcpkix-jdk15on, - bcprov-jdk15on, - xmlsec, - slf4j-api + bcpkix-jdk15on, + bcprov-jdk15on, + xmlsec, + slf4j-api ooxml-security-1.0.jar Modified: poi/trunk/.classpath URL: http://svn.apache.org/viewvc/poi/trunk/.classpath?rev=1710032&r1=1710031&r2=1710032&view=diff ============================================================================== --- poi/trunk/.classpath (original) +++ poi/trunk/.classpath Thu Oct 22 15:21:25 2015 @@ -21,14 +21,14 @@ - + - - - - + + + + Modified: poi/trunk/build.xml URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1710032&r1=1710031&r2=1710032&view=diff ============================================================================== --- poi/trunk/build.xml (original) +++ poi/trunk/build.xml Thu Oct 22 15:21:25 2015 @@ -167,14 +167,14 @@ under the License. - - - - - - - - + + + + + + + + @@ -461,8 +461,16 @@ under the License. + + + + + + + + @@ -1805,16 +1813,16 @@ under the License. - - - - + + + + - - + + - + @@ -1828,16 +1836,16 @@ under the License. - - - - + + + + - - + + - + Modified: poi/trunk/sonar/ooxml/pom.xml URL: http://svn.apache.org/viewvc/poi/trunk/sonar/ooxml/pom.xml?rev=1710032&r1=1710031&r2=1710032&view=diff ============================================================================== --- poi/trunk/sonar/ooxml/pom.xml (original) +++ poi/trunk/sonar/ooxml/pom.xml Thu Oct 22 15:21:25 2015 @@ -125,17 +125,17 @@ org.bouncycastle bcpkix-jdk15on - 1.51 + 1.53 org.bouncycastle bcprov-jdk15on - 1.51 + 1.53 org.apache.santuario xmlsec - 2.0.1 + 2.0.5 com.github.virtuald Modified: poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java?rev=1710032&r1=1710031&r2=1710032&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java Thu Oct 22 15:21:25 2015 @@ -162,9 +162,9 @@ import org.w3c.dom.events.EventTarget; *

To use SignatureInfo and its sibling classes, you'll need to have the following libs * in the classpath:

*
    - *
  • BouncyCastle bcpkix and bcprov (tested against 1.51)
    • - *
  • Apache Santuario "xmlsec" (tested against 2.0.1)
    • - *
  • and slf4j-api (tested against 1.7.7)
    • + *
  • BouncyCastle bcpkix and bcprov (tested against 1.53)
    • + *
  • Apache Santuario "xmlsec" (tested against 2.0.5)
    • + *
  • and slf4j-api (tested against 1.7.12)
    • *
*/ public class SignatureInfo implements SignatureConfigurable { Modified: poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java?rev=1710032&r1=1710031&r2=1710032&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java Thu Oct 22 15:21:25 2015 @@ -249,7 +249,7 @@ public class XAdESXLSignatureFacet exten ResponderIDType responderId = ocspIdentifier.addNewResponderID(); RespID respId = basicOcspResp.getResponderId(); - ResponderID ocspResponderId = respId.toASN1Object(); + ResponderID ocspResponderId = respId.toASN1Primitive(); DERTaggedObject derTaggedObject = (DERTaggedObject)ocspResponderId.toASN1Primitive(); if (2 == derTaggedObject.getTagNo()) { ASN1OctetString keyHashOctetString = (ASN1OctetString)derTaggedObject.getObject(); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org For additional commands, e-mail: commits-help@poi.apache.org