aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDominik Stadler <centic@apache.org>2015-10-22 15:21:25 +0000
committerDominik Stadler <centic@apache.org>2015-10-22 15:21:25 +0000
commitcdb8a029315f8a625d022c75c2bf1890d3dd36c9 (patch)
treed4d735070c72e45211fe89cebe5165f6607aac52 /src
parent3b43effa4be26053ed9e9ff86a817ca10091a549 (diff)
downloadpoi-cdb8a029315f8a625d022c75c2bf1890d3dd36c9.tar.gz
poi-cdb8a029315f8a625d022c75c2bf1890d3dd36c9.zip
Set newer curvesapi-version in .classpath as well and update some third-party libs for the password-protection-code to the latest versions
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1710032 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
-rw-r--r--src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java6
-rw-r--r--src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
index 9526c968b8..49c6828e93 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
+++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
@@ -162,9 +162,9 @@ import org.w3c.dom.events.EventTarget;
* <p>To use SignatureInfo and its sibling classes, you'll need to have the following libs
* in the classpath:</p>
* <ul>
- * <li>BouncyCastle bcpkix and bcprov (tested against 1.51)</li>
- * <li>Apache Santuario "xmlsec" (tested against 2.0.1)</li>
- * <li>and slf4j-api (tested against 1.7.7)</li>
+ * <li>BouncyCastle bcpkix and bcprov (tested against 1.53)</li>
+ * <li>Apache Santuario "xmlsec" (tested against 2.0.5)</li>
+ * <li>and slf4j-api (tested against 1.7.12)</li>
* </ul>
*/
public class SignatureInfo implements SignatureConfigurable {
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
index 2427f09fd1..61d61cf810 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
+++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
@@ -249,7 +249,7 @@ public class XAdESXLSignatureFacet extends SignatureFacet {
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();