diff --git a/build.xml b/build.xml index f50b9b957..10462ee1e 100644 --- a/build.xml +++ b/build.xml @@ -361,6 +361,7 @@ under the License. + diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java index 6784ef10a..85df30b3f 100644 --- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java +++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java @@ -74,7 +74,7 @@ public class SignatureConfig { private ThreadLocal provider = new ThreadLocal<>(); private List signatureFacets = new ArrayList<>(); - private HashAlgorithm digestAlgo = HashAlgorithm.sha1; + private HashAlgorithm digestAlgo = HashAlgorithm.sha256; private Date executionTime = new Date(); private PrivateKey key; private List signingCertificateChain; @@ -234,7 +234,7 @@ public class SignatureConfig { } /** - * @return the main digest algorithm, defaults to sha-1 + * @return the main digest algorithm, defaults to sha256 */ public HashAlgorithm getDigestAlgo() { return digestAlgo; diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureConfig.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureConfig.java new file mode 100644 index 000000000..4ded53bb2 --- /dev/null +++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureConfig.java @@ -0,0 +1,33 @@ +/* ==================================================================== + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +==================================================================== */ +package org.apache.poi.poifs.crypt.dsig; + +import org.apache.poi.poifs.crypt.HashAlgorithm; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class TestSignatureConfig { + + @Test + public void testDigestAlgo() throws Exception { + SignatureConfig sc = new SignatureConfig(); + assertEquals(HashAlgorithm.sha256, sc.getDigestAlgo()); + sc.setDigestAlgo(HashAlgorithm.sha1); + assertEquals(HashAlgorithm.sha1, sc.getDigestAlgo()); + } +}