Merge branch 'nightlybuild' into 'master'HEAD3.3.0master

Nightlybuild

See merge request egiz/moa-sig!3

3 files changed, 7 insertions, 9 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/AdESResultUtils.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/AdESResultUtils.java
index 8e37b1c..8dd2a8b 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/AdESResultUtils.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/AdESResultUtils.java
@@ -21,8 +21,8 @@ import iaik.server.modules.resultcodes.ResultCodeValid;
 
 public class AdESResultUtils {
 
-  private static final int MAJORRESULTCODESKIPPED = new Integer(3);
-  private static final int MAJORRESULTCODEERROR = new Integer(4);
+  private static final int MAJORRESULTCODESKIPPED = Integer.valueOf(3);
+  private static final int MAJORRESULTCODEERROR = Integer.valueOf(4);
 
   public static Integer getResultCode(Integer adesCode) {
     return adesCode;
@@ -114,9 +114,9 @@ public class AdESResultUtils {
         minorInfo = "UNKNOWN_SUBFILTER";
       } else if (resultCode.getCode().equals(ResultCode.CODE_NO_SIGNER_CERTIFICATE_FOUND)) {
         minorInfo = "NO_SIGNER_CERTIFICATE_FOUND";
-        
-        
-        
+
+
+
         // pdf-as 3.x detection is removed from MOA-SP since 3.1.2
       } else if (resultCode.getCode().equals(ResultCode.PDF_AS_SIGNATURE)) {
         // minorInfo = "PDF_AS_SIGNATURE";
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/CertificateUtils.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/CertificateUtils.java
index b7580ac..35dca16 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/CertificateUtils.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/CertificateUtils.java
@@ -204,7 +204,6 @@ public class CertificateUtils {
           // QC evaluation flags
           boolean qc = false;
           boolean qcSourceTSL = false;
-          boolean qcDisallowedFromTSL = false;
 
           // SSCD/QSCD evaluation flags
           boolean sscd = false;
@@ -254,7 +253,6 @@ public class CertificateUtils {
                       TslConstants.SSCD_QUALIFIER_SHORT.NotQualified))) {
                 qc = false;
                 qcSourceTSL = false;
-                qcDisallowedFromTSL = true;
                 Logger.info("TSL mark this certificate explicitly as 'NotQualified'!");
 
               }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/ExternalURIVerifier.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/ExternalURIVerifier.java
index be40a9e..221c361 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/ExternalURIVerifier.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/ExternalURIVerifier.java
@@ -47,7 +47,7 @@ public class ExternalURIVerifier {
             }

           } else {

             // check host and port

-            final int iport = new Integer(bport).intValue();

+            final int iport = Integer.valueOf(bport).intValue();

             if (ip.startsWith(bhost) && iport == port) {

               Logger.debug(new LogMsg("Blacklist check: " + host + ":" + port + " (" + ip + ":" + port

                   + " blacklisted"));

@@ -75,7 +75,7 @@ public class ExternalURIVerifier {
             }

           } else {

             // check host and port

-            final int iport = new Integer(bport).intValue();

+            final int iport = Integer.valueOf(bport).intValue();

             if (ip.startsWith(bhost) && iport == port) {

               Logger.debug(new LogMsg("Whitelist check: " + host + ":" + port + " (" + ip + ":" + port

                   + " whitelisted"));