extended validation result

4 files changed, 74 insertions, 2 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ExtendedCertificateCheckResultImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ExtendedCertificateCheckResultImpl.java
new file mode 100644
index 0000000..f36760c
--- /dev/null
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/ExtendedCertificateCheckResultImpl.java
@@ -0,0 +1,44 @@
+package at.gv.egovernment.moa.spss.api.impl;
+
+import at.gv.egovernment.moa.spss.api.common.ExtendedCertificateCheckResult;
+
+public class ExtendedCertificateCheckResultImpl implements ExtendedCertificateCheckResult {
+	private int majorCode;
+	private String majorInfo;
+	
+	private int minorCode;
+	private String minorInfo;
+	
+	public ExtendedCertificateCheckResultImpl(int majorCode, String majorInfo) {
+		this(majorCode, majorInfo, -1, "");
+	}
+	
+	public ExtendedCertificateCheckResultImpl(int majorCode, String majorInfo, 
+		int minorCode, String minorInfo) {
+		this.majorCode = majorCode;
+		this.majorInfo = majorInfo;
+		this.minorCode = minorCode;
+		this.minorInfo = minorInfo;
+	}
+ 	
+	@Override
+	public int getMajorCode() {
+		return this.majorCode;
+	}
+
+	@Override
+	public String getMajorInfo() {
+		return this.majorInfo;
+	}
+
+	@Override
+	public int getMinorCode() {
+		return this.minorCode;
+	}
+
+	@Override
+	public String getMinorInfo() {
+		return this.minorInfo;
+	}
+
+}
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java
index 9719c29..4781b8d 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/SPSSFactoryImpl.java
@@ -45,6 +45,7 @@ import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse;
 import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponseElement;
 import at.gv.egovernment.moa.spss.api.common.CheckResult;
 import at.gv.egovernment.moa.spss.api.common.Content;
+import at.gv.egovernment.moa.spss.api.common.ExtendedCertificateCheckResult;
 import at.gv.egovernment.moa.spss.api.common.MetaInfo;
 import at.gv.egovernment.moa.spss.api.common.SignerInfo;
 import at.gv.egovernment.moa.spss.api.common.Transform;
@@ -279,12 +280,14 @@ public class SPSSFactoryImpl extends SPSSFactory {
 	}
 
 	public VerifyCMSSignatureResponseElement createVerifyCMSSignatureResponseElement(SignerInfo signerInfo,
-			CheckResult signatureCheck, CheckResult certificateCheck, List adesResult) {
+			CheckResult signatureCheck, CheckResult certificateCheck, List adesResult, 
+		    ExtendedCertificateCheckResult extendedCertificateCheckResult) {
 		VerifyCMSSignatureResponseElementImpl verifyCMSSignatureResponseElement = new VerifyCMSSignatureResponseElementImpl();
 		verifyCMSSignatureResponseElement.setSignerInfo(signerInfo);
 		verifyCMSSignatureResponseElement.setSignatureCheck(signatureCheck);
 		verifyCMSSignatureResponseElement.setCertificateCheck(certificateCheck);
 		verifyCMSSignatureResponseElement.setAdESFormResults(adesResult);
+		verifyCMSSignatureResponseElement.setExtendedCertificateCheck(extendedCertificateCheckResult);
 		return verifyCMSSignatureResponseElement;
 	}
 
@@ -375,7 +378,7 @@ public class SPSSFactoryImpl extends SPSSFactory {
 	public VerifyXMLSignatureResponse createVerifyXMLSignatureResponse(SignerInfo signerInfo, List hashInputDatas,
 			List referenceInputDatas, ReferencesCheckResult signatureCheck,
 			ReferencesCheckResult signatureManifestCheck, List xmlDsigManifestChecks, CheckResult certificateCheck,
-			List adesFormResults) {
+			List adesFormResults, ExtendedCertificateCheckResult extCheckResult) {
 		VerifyXMLSignatureResponseImpl verifyXMLSignatureResponse = new VerifyXMLSignatureResponseImpl();
 		verifyXMLSignatureResponse.setSignerInfo(signerInfo);
 		verifyXMLSignatureResponse.setHashInputDatas(hashInputDatas);
@@ -385,6 +388,7 @@ public class SPSSFactoryImpl extends SPSSFactory {
 		verifyXMLSignatureResponse.setXMLDsigManifestChecks(xmlDsigManifestChecks);
 		verifyXMLSignatureResponse.setCertificateCheck(certificateCheck);
 		verifyXMLSignatureResponse.setAdESFormResults(adesFormResults);
+		verifyXMLSignatureResponse.setExtendedCertificateCheck(extCheckResult);
 		return verifyXMLSignatureResponse;
 	}
 
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureResponseElementImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureResponseElementImpl.java
index 3d6b72a..9b7881c 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureResponseElementImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureResponseElementImpl.java
@@ -28,6 +28,7 @@ import java.util.List;
 
 import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponseElement;
 import at.gv.egovernment.moa.spss.api.common.CheckResult;
+import at.gv.egovernment.moa.spss.api.common.ExtendedCertificateCheckResult;
 import at.gv.egovernment.moa.spss.api.common.SignerInfo;
 
 /**
@@ -46,6 +47,8 @@ public class VerifyCMSSignatureResponseElementImpl
   /** Information about the certificate check. */
   private CheckResult certificateCheck;
   
+  private ExtendedCertificateCheckResult extendedResult;
+  
   private List adesResults = null;
   
   /**
@@ -94,5 +97,14 @@ public class VerifyCMSSignatureResponseElementImpl
   public List getAdESFormResults() {
 	return adesResults;
   }
+
+  public void setExtendedCertificateCheck(ExtendedCertificateCheckResult r) {
+		this.extendedResult = r;
+	}
+	
+	@Override
+	public ExtendedCertificateCheckResult getExtendedCertificateCheck() {
+		return extendedResult;
+	}
   
 }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureResponseImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureResponseImpl.java
index bfee774..60ac3be 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureResponseImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyXMLSignatureResponseImpl.java
@@ -28,6 +28,7 @@ import java.util.Collections;
 import java.util.List;
 
 import at.gv.egovernment.moa.spss.api.common.CheckResult;
+import at.gv.egovernment.moa.spss.api.common.ExtendedCertificateCheckResult;
 import at.gv.egovernment.moa.spss.api.common.SignerInfo;
 import at.gv.egovernment.moa.spss.api.xmlverify.ReferencesCheckResult;
 import at.gv.egovernment.moa.spss.api.xmlverify.VerifyXMLSignatureResponse;
@@ -40,6 +41,8 @@ public class VerifyXMLSignatureResponseImpl implements VerifyXMLSignatureRespons
 
 	/** Information about the signer certificate. */
 	private SignerInfo signerInfo;
+	
+	private ExtendedCertificateCheckResult extendedResult;
 
 	/**
 	 * The hash input data objects. The list consists of
@@ -177,4 +180,13 @@ public class VerifyXMLSignatureResponseImpl implements VerifyXMLSignatureRespons
 		return this.adesFormResults;
 	}
 
+	public void setExtendedCertificateCheck(ExtendedCertificateCheckResult r) {
+		this.extendedResult = r;
+	}
+	
+	@Override
+	public ExtendedCertificateCheckResult getExtendedCertificateCheck() {
+		return extendedResult;
+	}
+
 }