Merge branch 'master' of https://gitlab.iaik.tugraz.at/egiz/moa-sig

1 files changed, 21 insertions, 16 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java
index 5ada287..f4121b0 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java
@@ -151,28 +151,33 @@ public class VerifyCMSSignatureResponseBuilder {
       result.getCertificateValidationResult();
     int signatureCheckCode =
       result.getSignatureValueVerificationCode().intValue();
-    int certificateCheckCode = certResult.getValidationResultCode().intValue();
-         
+    
     VerifyCMSSignatureResponseElement responseElement;
-    SignerInfo signerInfo;
+    SignerInfo signerInfo = null;
     CheckResult signatureCheck;
     CheckResult certificateCheck;
 
     boolean qualifiedCertificate = checkQC;
     
-    // add SignerInfo element
-    signerInfo =
-      factory.createSignerInfo(
-        (X509Certificate) certResult.getCertificateChain().get(0),
-        qualifiedCertificate,
-        qcSourceTSL,
-        certResult.isPublicAuthorityCertificate(),
-        certResult.getPublicAuthorityID(),
-        checkSSCD,
-        sscdSourceTSL,
-        issuerCountryCode,
-        result.getSigningTime(),
-        tslInfos);
+    //set code 99 if not certcheckresult exists
+    int certificateCheckCode = 99;
+    if (certResult != null) {
+    	certificateCheckCode = certResult.getValidationResultCode().intValue();
+           
+    	// add SignerInfo element
+    	signerInfo =
+    			factory.createSignerInfo(
+    					(X509Certificate) certResult.getCertificateChain().get(0),
+    					qualifiedCertificate,
+    					qcSourceTSL,
+    					certResult.isPublicAuthorityCertificate(),
+    					certResult.getPublicAuthorityID(),
+    					checkSSCD,
+    					sscdSourceTSL,
+    					issuerCountryCode,
+    					result.getSigningTime(),
+    					tslInfos);
+    }
 
     // add SignatureCheck element
     signatureCheck = factory.createCheckResult(signatureCheckCode, null);