diff --git a/.gitignore b/.gitignore index 67a3e1439..3666fd005 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ javadoc .idea/workspace.xml .idea/uiDesigner.xml .idea/dictionaries/xp.xml +.idea/libraries *.log utility-package-lib zip-package-lib diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 4148e866e..2ee81e710 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,4 +1,11 @@ DigiDoc4J Java library release notes +------------------------------------ +Release 1.0.7.2 +------------------ +Summary of the major changes since 1.0.7.1 +------------------------------------------ +* Prevent XXE(XML External Entity) processing (switching to sd-dss-5.0.d4j.5). + ------------------------------------ Release 1.0.7.1 ------------------ @@ -7,6 +14,11 @@ Summary of the major changes since 1.0.7 * Fixed signing problem when encryption algorithm is ECDSA and signature profile LT_TM. * Updated the pre-calculated policy digest value. +Known issues +------------ +* Signing with ID-card and using PKCS11SignatureToken class have still a problem +when encryption algorithm is ECDSA and signature profile LT_TM. + ------------------------------------ Release 1.0.7 ------------------ diff --git a/digidoc4j.iml b/digidoc4j.iml index c804fc300..e79bdb966 100644 --- a/digidoc4j.iml +++ b/digidoc4j.iml @@ -60,28 +60,28 @@ - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index eb2db4a01..7bdeed334 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.digidoc4j digidoc4j jar - 1.0.7.1.RC.1 + 1.0.7.2 DigiDoc4j DigiDoc4j is a Java library for digitally signing documents and creating digital signature containers of signed documents https://github.com/open-eid/digidoc4j @@ -98,7 +98,7 @@ 1.54 4.11 org.digidoc4j.dss - 5.0.d4j.4 + 5.0.d4j.5 ${project.basedir}/build/ ${project.basedir}/utility-package-lib ${project.basedir}/zip-package-lib diff --git a/src/org/digidoc4j/signers/PKCS11SignatureToken.java b/src/org/digidoc4j/signers/PKCS11SignatureToken.java index 04ea02963..badd102d6 100644 --- a/src/org/digidoc4j/signers/PKCS11SignatureToken.java +++ b/src/org/digidoc4j/signers/PKCS11SignatureToken.java @@ -10,29 +10,18 @@ package org.digidoc4j.signers; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.security.NoSuchProviderException; -import java.security.PrivateKey; -import java.security.SignatureException; import java.security.cert.X509Certificate; import java.util.List; -import org.apache.commons.lang3.ArrayUtils; -import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.digidoc4j.DigestAlgorithm; import org.digidoc4j.SignatureToken; -import org.digidoc4j.exceptions.TechnicalException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import eu.europa.esig.dss.DSSUtils; -import eu.europa.esig.dss.EncryptionAlgorithm; import eu.europa.esig.dss.SignatureValue; import eu.europa.esig.dss.ToBeSigned; import eu.europa.esig.dss.token.AbstractSignatureTokenConnection; import eu.europa.esig.dss.token.DSSPrivateKeyEntry; -import eu.europa.esig.dss.token.KSPrivateKeyEntry; import eu.europa.esig.dss.token.PasswordInputCallback; import eu.europa.esig.dss.token.Pkcs11SignatureToken; diff --git a/test/org/digidoc4j/SignatureBuilderTest.java b/test/org/digidoc4j/SignatureBuilderTest.java index a3a3d1e2a..fa80991c7 100644 --- a/test/org/digidoc4j/SignatureBuilderTest.java +++ b/test/org/digidoc4j/SignatureBuilderTest.java @@ -40,6 +40,7 @@ import org.digidoc4j.testutils.TestSigningHelper; import org.digidoc4j.utils.TokenAlgorithmSupport; import org.junit.After; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder;