diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2018-04-13 10:12:45 +0200 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2018-04-13 10:12:45 +0200 |
| commit | c718e99d469309e27b664ef828367a94aaf7532a (patch) | |
| tree | fca0f0c5f4721429e58ebdffbcb1e8009c52e087 | |
| parent | f9ba5ca142bbb2322529b3c370db32dd59a53612 (diff) | |
| parent | b3c3cf89e51f5a760c711a3727f2c89d621fe877 (diff) | |
| download | moa-sig-c718e99d469309e27b664ef828367a94aaf7532a.tar.gz moa-sig-c718e99d469309e27b664ef828367a94aaf7532a.tar.bz2 moa-sig-c718e99d469309e27b664ef828367a94aaf7532a.zip | |
Merge branch 'nightlybuild' of gitlab.iaik.tugraz.at:egiz/moa-sig into nightlybuild
| -rw-r--r-- | moaSig/handbook/handbook/usage/usage.html | 4 | ||||
| -rw-r--r-- | moaSig/moa-sig-lib/src/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ä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 <= 3.x)</td> - </tr> + </tr--> </table> <p> </p> <h4><a name="webservice_xmlrequests_pruefungxml_xmldsigmanifest"></a>2.1.4.3 Prü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; } } |