Minor refactoring of changes introduced in "Allow security provider setting for LtvVerfication/Verifier" commit for the sake of autoporting

DEVSIX-1286

Author: yulian-gaponenko

sign/src/main/java/com/itextpdf/signatures/LtvVerification.java

@@ -140,7 +140,9 @@ public enum CertificateInclusion {
      * @param document The {@link PdfDocument} to apply the validation to.
      */
     public LtvVerification(PdfDocument document) {
-        this(document,null);
+        this.document = document;
+        this.acroForm = PdfAcroForm.getAcroForm(document, true);
+        this.sgnUtil = new SignatureUtil(document);
     }
 
     /**
@@ -152,9 +154,7 @@ public LtvVerification(PdfDocument document) {
      * @param securityProviderCode Security provider to use
      */
     public LtvVerification(PdfDocument document, String securityProviderCode){
-        this.document = document;
-        this.acroForm = PdfAcroForm.getAcroForm(document, true);
-        this.sgnUtil = new SignatureUtil(document);
+        this(document);
         this.securityProviderCode = securityProviderCode;
     }
 

sign/src/main/java/com/itextpdf/signatures/LtvVerifier.java

@@ -103,12 +103,7 @@ public class LtvVerifier extends RootStoreVerifier {
      * @throws GeneralSecurityException
      */
     public LtvVerifier(PdfDocument document) throws GeneralSecurityException {
-        this(document,null);
-    }
-
-    public LtvVerifier(PdfDocument document, String securityProviderCode) throws GeneralSecurityException {
         super(null);
-        this.securityProviderCode = securityProviderCode;
         this.document = document;
         this.acroForm = PdfAcroForm.getAcroForm(document, true);
         this.sgnUtil = new SignatureUtil(document);
@@ -118,6 +113,10 @@ public LtvVerifier(PdfDocument document, String securityProviderCode) throws Gen
         pkcs7 = coversWholeDocument();
         LOGGER.info(MessageFormat.format("Checking {0}signature {1}", pkcs7.isTsp() ? "document-level timestamp " : "", signatureName));
     }
+    public LtvVerifier(PdfDocument document, String securityProviderCode) throws GeneralSecurityException {
+        this(document);
+        this.securityProviderCode = securityProviderCode;
+    }
 
     /**
      * Sets an extra verifier.

sign/src/test/java/com/itextpdf/signatures/verify/LtvVerifierTest.java

@@ -94,10 +94,9 @@ public void validLtvDocTest01() throws IOException, GeneralSecurityException {
     public void validLtvDocTest02() throws IOException, GeneralSecurityException {
         String ltvTsFileName = sourceFolder + "ltvDoc.pdf";
 
-        BouncyCastleProvider provider = new BouncyCastleProvider();
-        Security.addProvider(provider);
+        Security.addProvider(new BouncyCastleProvider());
 
-        LtvVerifier verifier = new LtvVerifier(new PdfDocument(new PdfReader(ltvTsFileName)), provider.getName());
+        LtvVerifier verifier = new LtvVerifier(new PdfDocument(new PdfReader(ltvTsFileName)), BouncyCastleProvider.PROVIDER_NAME);
         verifier.setCertificateOption(LtvVerification.CertificateOption.WHOLE_CHAIN);
         verifier.setRootStore(Pkcs12FileHelper.initStore(certsSrc + "rootStore.p12", password));
         List<VerificationOK> verificationMessages = verifier.verify(null);