aboutsummaryrefslogtreecommitdiff
path: root/moaSig/moa-sig-lib/src
diff options
context:
space:
mode:
authortlenz <thomas.lenz@egiz.gv.at>2017-06-27 10:38:31 +0200
committertlenz <thomas.lenz@egiz.gv.at>2017-06-27 10:38:31 +0200
commitd69e3b6fb1dec68c0142eda193d1302f5a1ea383 (patch)
treefaa7d6422210f3320503ddf3d3b24152e049e80c /moaSig/moa-sig-lib/src
parent997b70350b176d8e01ede2653785346555b6aca0 (diff)
parent25f28669519773054184d6695114f38c5da4e177 (diff)
downloadmoa-sig-d69e3b6fb1dec68c0142eda193d1302f5a1ea383.tar.gz
moa-sig-d69e3b6fb1dec68c0142eda193d1302f5a1ea383.tar.bz2
moa-sig-d69e3b6fb1dec68c0142eda193d1302f5a1ea383.zip
lokal merge
Merge branch 'nightlybuild' of https://gitlab.iaik.tugraz.at/egiz/moa-sig into nightlybuild
Diffstat (limited to 'moaSig/moa-sig-lib/src')
-rw-r--r--moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java9
-rw-r--r--moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/AdESResultUtils.java2
2 files changed, 9 insertions, 2 deletions
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java
index 34d6a22..188e8e2 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java
@@ -341,7 +341,7 @@ public class CMSSignatureVerificationInvoker {
ExtendedPDFSignatureVerificationResult result = (ExtendedPDFSignatureVerificationResult) resultObject;
cmsResult = result.getPDFSignatureVerificationResult();
adesResults = AdESResultUtils.getAdESResult(result.getFormVerificationResult());
-
+
if (adesResults != null) {
Iterator adesIterator = adesResults.iterator();
while (adesIterator.hasNext()) {
@@ -352,7 +352,12 @@ public class CMSSignatureVerificationInvoker {
try {
//Logger.info("Extended Validation Report: " + result.getName());
Logger.info("Extended Validation Code: " + result.getResultCode().toString());
- Logger.info("Extended Validation Info: " + result.getInfo());
+ if (result.getDetailedExtendedReport() != null)
+ Logger.info("Extended Validation Info: " + result.getDetailedExtendedReport().getMessage());
+ else
+ Logger.info("Extended Validation Info: " + result.getInfo());
+
+ Logger.debug("Full extended Validation Infos: " + result.getInfo());
extCheckResult = AdESResultUtils.getExtendedResult(result.getResultCode());
} catch (NullPointerException e) {
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 b1fee06..a28088a 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,6 +110,8 @@ public class AdESResultUtils {
minorInfo = "SUCCESS";
} else if (resultCode.getCode().equals(ResultCode.UNKNOWN_SUBFILTER)) {
minorInfo = "UNKNOWN_SUBFILTER";
+ } else if (resultCode.getCode().equals(ResultCode.PDF_AS_SIGNATURE)) {
+ minorInfo = "PDF_AS_SIGNATURE";
}
}