From b3c3cf89e51f5a760c711a3727f2c89d621fe877 Mon Sep 17 00:00:00 2001
From: tlenz <thomas.lenz@egiz.gv.at>
Date: Tue, 20 Feb 2018 16:21:02 +0100
Subject: remove pdf-as 3.x detection from MOA-SP functionallity every
 pdf-signature that is detected but can not verified will be returned with
 minory-code 25 (unkown subfilter)

---
 moaSig/handbook/handbook/usage/usage.html                           | 4 ++--
 .../main/java/at/gv/egovernment/moa/spss/util/AdESResultUtils.java  | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/moaSig/handbook/handbook/usage/usage.html b/moaSig/handbook/handbook/usage/usage.html
index 6e42d4a..82c224f 100644
--- a/moaSig/handbook/handbook/usage/usage.html
+++ b/moaSig/handbook/handbook/usage/usage.html
@@ -1106,10 +1106,10 @@ positive Ganzzahl repr&auml;sentiert, die auf das beinhaltende <code>dsig:Manife
     <td align="center">25</td>
     <td>Die PAdES Signatur verwendet einen unbekannter SubFilter und kann somit nicht validiert werden.</td>
   </tr>
-  <tr>
+  <!--tr>
     <td align="center">26</td>
     <td>PDF-AS Signatur (nach PDF-AS &lt;= 3.x)</td>
-  </tr>
+  </tr-->
 </table>
 <p>&nbsp;</p>
 <h4><a name="webservice_xmlrequests_pruefungxml_xmldsigmanifest"></a>2.1.4.3 Pr&uuml;fung eines XMLDSIG-Manifests </h4>
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 3ac706e..5060672 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
@@ -110,8 +110,12 @@ public class AdESResultUtils {
 				minorInfo = "SUCCESS";
 			} else if (resultCode.getCode().equals(ResultCode.UNKNOWN_SUBFILTER)) {
 				minorInfo = "UNKNOWN_SUBFILTER";
+			
+			//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";
+				//minorInfo = "PDF_AS_SIGNATURE";
+				minorInfo = "UNKNOWN_SUBFILTER";
+				minorCode = ResultCode.UNKNOWN_SUBFILTER;
 			}
 				
 		}
-- 
cgit v1.2.3