SIVA-629 Remove SecureRandom32OctetNonceSource and use SecureRandomNo…

…nceSource from DSS
open-eid · Mar 28, 2024 · fe01914 · fe01914
1 parent ad6afc1
commit fe01914
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 41 deletions.
diff --git a/...eneid/validation/service/generic/configuration/GenericValidationServiceConfiguration.java b/...eneid/validation/service/generic/configuration/GenericValidationServiceConfiguration.java
@@ -24,7 +24,6 @@
 import ee.openeid.validation.service.generic.configuration.properties.TLevelSignatureFilterProperties;
 import ee.openeid.validation.service.generic.validator.RevocationFreshnessValidator;
 import ee.openeid.validation.service.generic.validator.RevocationFreshnessValidatorFactory;
-import ee.openeid.validation.service.generic.validator.SecureRandom32OctetNonceSource;
 import ee.openeid.validation.service.generic.validator.TLevelSignatureOfNonListedCountryPredicate;
 import ee.openeid.validation.service.generic.validator.container.AsicContainerDataFileSizeValidator;
 import ee.openeid.validation.service.generic.validator.container.ContainerValidator;
@@ -42,6 +41,7 @@
 import eu.europa.esig.dss.enumerations.ASiCContainerType;
 import eu.europa.esig.dss.enumerations.DigestAlgorithm;
 import eu.europa.esig.dss.model.x509.CertificateToken;
+import eu.europa.esig.dss.service.SecureRandomNonceSource;
 import eu.europa.esig.dss.service.http.commons.OCSPDataLoader;
 import eu.europa.esig.dss.service.ocsp.OnlineOCSPSource;
 import eu.europa.esig.dss.spi.tsl.TrustedListsCertificateSource;
@@ -139,7 +139,7 @@ private static boolean isAsicContainer(Reports validationReports) {
 
     private static OnlineOCSPSource createOnlineOCSPSource() {
         OnlineOCSPSource onlineOCSPSource = new OnlineOCSPSource(new OCSPDataLoader());
-        onlineOCSPSource.setNonceSource(new SecureRandom32OctetNonceSource());
+        onlineOCSPSource.setNonceSource(new SecureRandomNonceSource());
         onlineOCSPSource.setCertIDDigestAlgorithm(DigestAlgorithm.SHA1);
         return onlineOCSPSource;
     }

diff --git a/.../java/ee/openeid/validation/service/generic/validator/SecureRandom32OctetNonceSource.java b/.../java/ee/openeid/validation/service/generic/validator/SecureRandom32OctetNonceSource.java