diff options
author | Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> | 2015-12-02 15:48:52 +0100 |
---|---|---|
committer | Andreas Fitzek <andreas.fitzek@iaik.tugraz.at> | 2015-12-02 15:48:52 +0100 |
commit | 191ba3411f2db0a48ae8d4243926b33a063bf769 (patch) | |
tree | 944b69da205c85c16fcc710a4dc7eaf921110fe5 | |
parent | f26449517c01e456f677d3e47edf9cafad6e70e0 (diff) | |
download | moa-sig-191ba3411f2db0a48ae8d4243926b33a063bf769.tar.gz moa-sig-191ba3411f2db0a48ae8d4243926b33a063bf769.tar.bz2 moa-sig-191ba3411f2db0a48ae8d4243926b33a063bf769.zip |
IAIK Moa CAdES added, cms verification not working
115 files changed, 590 insertions, 224 deletions
diff --git a/moaSig/libs/iaik_cms.jar b/moaSig/libs/iaik_cms.jar Binary files differnew file mode 100644 index 0000000..11ae6a9 --- /dev/null +++ b/moaSig/libs/iaik_cms.jar diff --git a/moaSig/libs/iaik_cpades.jar b/moaSig/libs/iaik_cpades.jar Binary files differnew file mode 100644 index 0000000..9deb1bf --- /dev/null +++ b/moaSig/libs/iaik_cpades.jar diff --git a/moaSig/libs/iaik_eccelerate.jar b/moaSig/libs/iaik_eccelerate.jar Binary files differnew file mode 100644 index 0000000..d8369ea --- /dev/null +++ b/moaSig/libs/iaik_eccelerate.jar diff --git a/moaSig/libs/iaik_eccelerate_cms.jar b/moaSig/libs/iaik_eccelerate_cms.jar Binary files differnew file mode 100644 index 0000000..c2db15e --- /dev/null +++ b/moaSig/libs/iaik_eccelerate_cms.jar diff --git a/moaSig/libs/iaik_jce_full.jar b/moaSig/libs/iaik_jce_full.jar Binary files differnew file mode 100644 index 0000000..18cb0a0 --- /dev/null +++ b/moaSig/libs/iaik_jce_full.jar diff --git a/moaSig/libs/iaik_moa.jar b/moaSig/libs/iaik_moa.jar Binary files differnew file mode 100644 index 0000000..7ffc47e --- /dev/null +++ b/moaSig/libs/iaik_moa.jar diff --git a/moaSig/libs/iaik_pki.jar b/moaSig/libs/iaik_pki.jar Binary files differnew file mode 100644 index 0000000..9c89086 --- /dev/null +++ b/moaSig/libs/iaik_pki.jar diff --git a/moaSig/libs/iaik_pki_module.jar b/moaSig/libs/iaik_pki_module.jar Binary files differnew file mode 100644 index 0000000..01379aa --- /dev/null +++ b/moaSig/libs/iaik_pki_module.jar diff --git a/moaSig/libs/iaik_sigval.jar b/moaSig/libs/iaik_sigval.jar Binary files differnew file mode 100644 index 0000000..4aa741e --- /dev/null +++ b/moaSig/libs/iaik_sigval.jar diff --git a/moaSig/libs/iaik_sigvallib.jar b/moaSig/libs/iaik_sigvallib.jar Binary files differnew file mode 100644 index 0000000..b2d8184 --- /dev/null +++ b/moaSig/libs/iaik_sigvallib.jar diff --git a/moaSig/libs/iaik_tsl-1.1.jar b/moaSig/libs/iaik_tsl-1.1.jar Binary files differnew file mode 100644 index 0000000..6fa0fef --- /dev/null +++ b/moaSig/libs/iaik_tsl-1.1.jar diff --git a/moaSig/libs/iaik_tsp.jar b/moaSig/libs/iaik_tsp.jar Binary files differnew file mode 100644 index 0000000..b2d5ce8 --- /dev/null +++ b/moaSig/libs/iaik_tsp.jar diff --git a/moaSig/libs/iaik_xades.jar b/moaSig/libs/iaik_xades.jar Binary files differnew file mode 100644 index 0000000..73401d7 --- /dev/null +++ b/moaSig/libs/iaik_xades.jar diff --git a/moaSig/libs/iaik_xsect.jar b/moaSig/libs/iaik_xsect.jar Binary files differnew file mode 100644 index 0000000..e891231 --- /dev/null +++ b/moaSig/libs/iaik_xsect.jar diff --git a/moaSig/moa-sig-lib/build.gradle b/moaSig/moa-sig-lib/build.gradle index 7e46f0a..adb053f 100644 --- a/moaSig/moa-sig-lib/build.gradle +++ b/moaSig/moa-sig-lib/build.gradle @@ -6,6 +6,7 @@ dependencies { compile 'log4j:log4j:1.2.17' compile 'commons-logging:commons-logging:1.2' compile 'commons-io:commons-io:2.4' + compile 'commons-codec:commons-codec:1.10' compile 'org.apache.axis:axis-jaxrpc:1.4' compile 'org.xerial:sqlite-jdbc:3.8.11.2' compile 'javax.xml.bind:jaxb-api:2.2.12' diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java index b725422..d216569 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java @@ -467,7 +467,8 @@ public abstract class SPSSFactory { Date dateTime, InputStream cmsSignature, CMSDataObject dataObject, - String trustProfileID); + String trustProfileID, + boolean pdf); /** * Create a new <code>CMSDataObject</code> object from data at a given URI. @@ -543,7 +544,8 @@ public abstract class SPSSFactory { public abstract VerifyCMSSignatureResponseElement createVerifyCMSSignatureResponseElement( SignerInfo signerInfo, CheckResult signatureCheck, - CheckResult certificateCheck); + CheckResult certificateCheck, + List adesResult); // // Factory methods for verifying XML signatures diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureRequest.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureRequest.java index 225f685..3adb381 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureRequest.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureRequest.java @@ -73,4 +73,6 @@ public interface VerifyCMSSignatureRequest { * @return The profile ID of trusted certificates. */ public String getTrustProfileId(); + + public boolean isPDF(); } diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponseElement.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponseElement.java index a1135ba..8579a2f 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponseElement.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/cmsverify/VerifyCMSSignatureResponseElement.java @@ -24,6 +24,8 @@ package at.gv.egovernment.moa.spss.api.cmsverify; +import java.util.List; + import at.gv.egovernment.moa.spss.api.common.CheckResult; import at.gv.egovernment.moa.spss.api.common.SignerInfo; @@ -54,4 +56,12 @@ public interface VerifyCMSSignatureResponseElement { */ public CheckResult getCertificateCheck(); + /** + * Gets AdES Form results + * + * This might be null! + * + * @return The result of the AdES Form validation + */ + public List getAdESFormResults(); } 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 8a46219..478dcb4 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 @@ -260,7 +260,8 @@ public class SPSSFactoryImpl extends SPSSFactory { Date dateTime, InputStream cmsSignature, CMSDataObject dataObject, - String trustProfileID) { + String trustProfileID, + boolean pdf) { VerifyCMSSignatureRequestImpl verifyCMSSignatureRequest = new VerifyCMSSignatureRequestImpl(); verifyCMSSignatureRequest.setDateTime(dateTime); @@ -268,6 +269,7 @@ public class SPSSFactoryImpl extends SPSSFactory { verifyCMSSignatureRequest.setDataObject(dataObject); verifyCMSSignatureRequest.setTrustProfileId(trustProfileID); verifyCMSSignatureRequest.setSignatories(signatories); + verifyCMSSignatureRequest.setPDF(pdf); return verifyCMSSignatureRequest; } @@ -321,13 +323,14 @@ public class SPSSFactoryImpl extends SPSSFactory { public VerifyCMSSignatureResponseElement createVerifyCMSSignatureResponseElement( SignerInfo signerInfo, CheckResult signatureCheck, - CheckResult certificateCheck) { + CheckResult certificateCheck, + List adesResult) { VerifyCMSSignatureResponseElementImpl verifyCMSSignatureResponseElement = new VerifyCMSSignatureResponseElementImpl(); verifyCMSSignatureResponseElement.setSignerInfo(signerInfo); verifyCMSSignatureResponseElement.setSignatureCheck(signatureCheck); verifyCMSSignatureResponseElement.setCertificateCheck(certificateCheck); - + verifyCMSSignatureResponseElement.setAdESFormResults(adesResult); return verifyCMSSignatureResponseElement; } diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureRequestImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureRequestImpl.java index c759f5f..78d817b 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureRequestImpl.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyCMSSignatureRequestImpl.java @@ -49,6 +49,8 @@ public class VerifyCMSSignatureRequestImpl private InputStream cmsSignature; /** The date for which to verify the signature. */ private Date dateTime; + + private boolean pdf = false; /** * Sets the indexes of the signatories whose signature should be verified. @@ -114,4 +116,12 @@ public class VerifyCMSSignatureRequestImpl return trustProfileId; } + public void setPDF(boolean value) { + this.pdf = value; + } + + public boolean isPDF() { + return this.pdf; + } + } 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 f258b3b..3d6b72a 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 @@ -24,6 +24,8 @@ package at.gv.egovernment.moa.spss.api.impl; +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.SignerInfo; @@ -44,6 +46,8 @@ public class VerifyCMSSignatureResponseElementImpl /** Information about the certificate check. */ private CheckResult certificateCheck; + private List adesResults = null; + /** * Sets a SignerInfo element according to CMS. * @@ -82,5 +86,13 @@ public class VerifyCMSSignatureResponseElementImpl public CheckResult getCertificateCheck() { return certificateCheck; } + + public void setAdESFormResults(List adesResults) { + this.adesResults = adesResults; + } + + public List getAdESFormResults() { + return adesResults; + } } diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParser.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParser.java index 6b3f430..bc92b7a 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParser.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParser.java @@ -103,7 +103,8 @@ public class VerifyCMSSignatureRequestParser { dateTime, cmsSignature, dataObject, - trustProfileID); + trustProfileID, + false); } /** diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmsverify/CMSSignatureVerificationProfileImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmsverify/CMSSignatureVerificationProfileImpl.java index 972b540..9fda5e0 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmsverify/CMSSignatureVerificationProfileImpl.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmsverify/CMSSignatureVerificationProfileImpl.java @@ -21,7 +21,6 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ - package at.gv.egovernment.moa.spss.server.iaik.cmsverify; import iaik.pki.PKIProfile; @@ -35,27 +34,25 @@ import iaik.server.modules.cmsverify.CMSSignatureVerificationProfile; * @author Patrick Peck * @version $Id$ */ -public class CMSSignatureVerificationProfileImpl - implements CMSSignatureVerificationProfile { - - /** The profile for validating the certificate. */ - private PKIProfile certificateValidationProfile; +public class CMSSignatureVerificationProfileImpl implements CMSSignatureVerificationProfile { + /** The profile for validating the certificate. */ + private PKIProfile certificateValidationProfile; - /** - * @see iaik.server.modules.cmsverify.CMSSignatureVerificationProfile#getCertificateValidationProfile() - */ - public PKIProfile getCertificateValidationProfile() { - return certificateValidationProfile; - } + /** + * @see iaik.server.modules.cmsverify.CMSSignatureVerificationProfile#getCertificateValidationProfile() + */ + public PKIProfile getCertificateValidationProfile() { + return certificateValidationProfile; + } - /** - * Sets the profile for validating the signer certificate. - * - * @param certificateValidationProfile The certificate validation profile to - * set. - */ - public void setCertificateValidationProfile(PKIProfile certificateValidationProfile) { - this.certificateValidationProfile = certificateValidationProfile; - } + /** + * Sets the profile for validating the signer certificate. + * + * @param certificateValidationProfile + * The certificate validation profile to set. + */ + public void setCertificateValidationProfile(PKIProfile certificateValidationProfile) { + this.certificateValidationProfile = certificateValidationProfile; + } } diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmsverify/PDFSignatureVerificationProfileImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmsverify/PDFSignatureVerificationProfileImpl.java new file mode 100644 index 0000000..9189597 --- /dev/null +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmsverify/PDFSignatureVerificationProfileImpl.java @@ -0,0 +1,8 @@ +package at.gv.egovernment.moa.spss.server.iaik.cmsverify; + +import iaik.server.modules.cmsverify.PDFSignatureVerificationProfile; + +public class PDFSignatureVerificationProfileImpl extends CMSSignatureVerificationProfileImpl + implements PDFSignatureVerificationProfile { + +} diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java index 87dd572..ef9ddeb 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java @@ -24,6 +24,7 @@ package at.gv.egovernment.moa.spss.server.iaik.config; +import iaik.cms.IaikCCProvider; import iaik.pki.store.revocation.RevocationFactory; import iaik.pki.store.revocation.RevocationSourceStore; import iaik.pki.store.truststore.TrustStoreFactory; @@ -34,6 +35,7 @@ import iaik.server.modules.keys.KeyEntryID; import iaik.server.modules.keys.KeyModule; import iaik.server.modules.keys.KeyModuleFactory; +import java.security.Provider; import java.security.Security; import java.util.ArrayList; import java.util.Iterator; 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 aca6f58..905254e 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 @@ -24,12 +24,16 @@ package at.gv.egovernment.moa.spss.server.invoke; +import iaik.server.modules.AdESFormVerificationResult; +import iaik.server.modules.AdESVerificationResult; import iaik.server.modules.IAIKException; import iaik.server.modules.IAIKRuntimeException; +import iaik.server.modules.SignatureVerificationProfile; import iaik.server.modules.cmsverify.CMSSignatureVerificationModule; import iaik.server.modules.cmsverify.CMSSignatureVerificationModuleFactory; import iaik.server.modules.cmsverify.CMSSignatureVerificationProfile; import iaik.server.modules.cmsverify.CMSSignatureVerificationResult; +import iaik.server.modules.cmsverify.ExtendedCMSSignatureVerificationResult; import iaik.x509.X509Certificate; import java.io.ByteArrayInputStream; @@ -37,10 +41,17 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; +import java.security.MessageDigest; +import java.util.ArrayList; import java.util.Date; import java.util.Iterator; import java.util.List; +import org.apache.commons.codec.binary.Hex; +import org.apache.commons.io.HexDump; +import org.apache.commons.io.IOUtils; + +import at.gv.egovernment.moa.logging.Logger; import at.gv.egovernment.moa.logging.LoggingContext; import at.gv.egovernment.moa.logging.LoggingContextManager; import at.gv.egovernment.moa.spss.MOAApplicationException; @@ -51,6 +62,7 @@ import at.gv.egovernment.moa.spss.api.cmsverify.CMSContentReference; import at.gv.egovernment.moa.spss.api.cmsverify.CMSDataObject; import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest; import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse; +import at.gv.egovernment.moa.spss.api.impl.AdESFormResultsImpl; import at.gv.egovernment.moa.spss.server.config.TrustProfile; import at.gv.egovernment.moa.spss.server.logging.IaikLog; import at.gv.egovernment.moa.spss.server.logging.TransactionId; @@ -121,14 +133,14 @@ public class CMSSignatureVerificationInvoker { CMSSignatureVerificationProfile profile; Date signingTime; List results; - CMSSignatureVerificationResult result; + ExtendedCMSSignatureVerificationResult result; int[] signatories; InputStream input; - byte[] buf = new byte[256]; + byte[] buf = new byte[2048]; // get the signature signature = request.getCMSSignature(); - + // get the actual trustprofile TrustProfile trustProfile = context.getConfiguration().getTrustProfile(request.getTrustProfileId()); @@ -137,7 +149,11 @@ public class CMSSignatureVerificationInvoker { signedContent = getSignedContent(request); // build the profile - profile = profileFactory.createProfile(); + if(request.isPDF()) { + profile = profileFactory.createPDFProfile(); + } else { + profile = profileFactory.createProfile(); + } // get the signing time signingTime = request.getDateTime(); @@ -156,9 +172,9 @@ public class CMSSignatureVerificationInvoker { input = module.getInputStream(); while (input.read(buf) > 0); + //results = module.verifyCAdESSignature(signingTime); results = module.verifySignature(signingTime); - } catch (IAIKException e) { MOAException moaException = IaikExceptionMapper.getInstance().map(e); throw moaException; @@ -191,10 +207,29 @@ public class CMSSignatureVerificationInvoker { Iterator resultIter; for (resultIter = results.iterator(); resultIter.hasNext();) { - result = (CMSSignatureVerificationResult) resultIter.next(); + Object resultObject = resultIter.next(); + CMSSignatureVerificationResult cmsResult = null; + List adesResults = null; + if(resultObject instanceof ExtendedCMSSignatureVerificationResult) { + result = (ExtendedCMSSignatureVerificationResult) resultObject; + + adesResults = getAdESResult(result.getFormVerificationResult()); + + if (adesResults != null) { + Iterator adesIterator = adesResults.iterator(); + while (adesIterator.hasNext()) { + Logger.info("ADES Formresults: " + adesIterator.next().toString()); + } + } + } else { + cmsResult = (CMSSignatureVerificationResult)resultObject; + } + + String issuerCountryCode = null; // QC/SSCD check - List list = result.getCertificateValidationResult().getCertificateChain(); + + List list = cmsResult.getCertificateValidationResult().getCertificateChain(); if (list != null) { X509Certificate[] chain = new X509Certificate[list.size()]; @@ -213,7 +248,7 @@ public class CMSSignatureVerificationInvoker { } - responseBuilder.addResult(result, trustProfile, qcsscdresult.isQC(), qcsscdresult.isQCSourceTSL(), qcsscdresult.isSSCD(), qcsscdresult.isSSCDSourceTSL(), issuerCountryCode); + responseBuilder.addResult(cmsResult, trustProfile, qcsscdresult.isQC(), qcsscdresult.isQCSourceTSL(), qcsscdresult.isSSCD(), qcsscdresult.isSSCDSourceTSL(), issuerCountryCode, adesResults); } } else { int i; @@ -223,11 +258,23 @@ public class CMSSignatureVerificationInvoker { try { result = - (CMSSignatureVerificationResult) results.get(signatories[i] - 1); + (ExtendedCMSSignatureVerificationResult) results.get(signatories[i] - 1); String issuerCountryCode = null; + + CMSSignatureVerificationResult cmsResult = result.getCMSSignatureVerificationResult(); + + List adesResults = getAdESResult(result.getFormVerificationResult()); + + if (adesResults != null) { + Iterator adesIterator = adesResults.iterator(); + while (adesIterator.hasNext()) { + Logger.info("ADES Formresults: " + adesIterator.next().toString()); + } + } + // QC/SSCD check - List list = result.getCertificateValidationResult().getCertificateChain(); + List list = cmsResult.getCertificateValidationResult().getCertificateChain(); if (list != null) { X509Certificate[] chain = new X509Certificate[list.size()]; @@ -244,7 +291,7 @@ public class CMSSignatureVerificationInvoker { issuerCountryCode = CertificateUtils.getIssuerCountry((X509Certificate)list.get(0)); } - responseBuilder.addResult(result, trustProfile, qcsscdresult.isQC(), qcsscdresult.isQCSourceTSL(), qcsscdresult.isSSCD(), qcsscdresult.isSSCDSourceTSL(), issuerCountryCode); + responseBuilder.addResult(cmsResult, trustProfile, qcsscdresult.isQC(), qcsscdresult.isQCSourceTSL(), qcsscdresult.isSSCD(), qcsscdresult.isSSCDSourceTSL(), issuerCountryCode, adesResults); } catch (IndexOutOfBoundsException e) { throw new MOAApplicationException( "2249", @@ -368,4 +415,41 @@ public class CMSSignatureVerificationInvoker { } + + private List getAdESResult(AdESFormVerificationResult adesFormVerification) { + if (adesFormVerification == null) { + // no form information + return null; + } + + List adesList = new ArrayList(); + + checkSubResult(adesFormVerification.getSubResult(SignatureVerificationProfile.LEVEL_LTA), + SignatureVerificationProfile.LEVEL_LTA, adesList); + checkSubResult(adesFormVerification.getSubResult(SignatureVerificationProfile.LEVEL_LT), + SignatureVerificationProfile.LEVEL_LT, adesList); + checkSubResult(adesFormVerification.getSubResult(SignatureVerificationProfile.LEVEL_T), + SignatureVerificationProfile.LEVEL_T, adesList); + checkSubResult(adesFormVerification.getSubResult(SignatureVerificationProfile.LEVEL_B), + SignatureVerificationProfile.LEVEL_B, adesList); + + return adesList; + } + + private void checkSubResult(AdESVerificationResult subResult, String level, List adesList) { + if (subResult != null) { + Logger.info("Checking Level: " + level); + try { + AdESFormResultsImpl adESFormResultsImpl = new AdESFormResultsImpl(); + adESFormResultsImpl.setCode(subResult.getResultCode()); + adESFormResultsImpl.setInfo(subResult.getInfo()); + adESFormResultsImpl.setName(subResult.getName()); + + adesList.add(adESFormResultsImpl); + } catch (NullPointerException e) { + Logger.warn("Catching NullPointer Exception, of invalid? Form Results", e); + } + } + } + } diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationProfileFactory.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationProfileFactory.java index 5f459ac..74b2a89 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationProfileFactory.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationProfileFactory.java @@ -24,15 +24,15 @@ package at.gv.egovernment.moa.spss.server.invoke; -import iaik.server.modules.cmsverify.CMSSignatureVerificationProfile; - import at.gv.egovernment.moa.spss.MOAException; import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest; import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider; import at.gv.egovernment.moa.spss.server.iaik.cmsverify.CMSSignatureVerificationProfileImpl; +import at.gv.egovernment.moa.spss.server.iaik.cmsverify.PDFSignatureVerificationProfileImpl; import at.gv.egovernment.moa.spss.server.iaik.pki.PKIProfileImpl; import at.gv.egovernment.moa.spss.server.transaction.TransactionContext; import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager; +import iaik.server.modules.cmsverify.CMSSignatureVerificationProfile; /** * A factory to create a <code>CMSSignatureVerificationProfile</code> from a @@ -65,6 +65,31 @@ public class CMSSignatureVerificationProfileFactory { * <code>request</code>, based on the current configuration. * @throws MOAException An error occurred creating the profile. */ + public CMSSignatureVerificationProfile createPDFProfile() + throws MOAException { + TransactionContext context = + TransactionContextManager.getInstance().getTransactionContext(); + ConfigurationProvider config = context.getConfiguration(); + PDFSignatureVerificationProfileImpl profile = + new PDFSignatureVerificationProfileImpl(); + String trustProfileID; + + // set the certificate validation profile + trustProfileID = request.getTrustProfileId(); + profile.setCertificateValidationProfile( + new PKIProfileImpl(config, trustProfileID)); + + return profile; + } + + /** + * Create a <code>CMSSignatureVerificationProfile</code> from the given + * request and the current MOA configuration. + * + * @return The <code>CMSSignatureVerificationProfile</code> for the + * <code>request</code>, based on the current configuration. + * @throws MOAException An error occurred creating the profile. + */ public CMSSignatureVerificationProfile createProfile() throws MOAException { TransactionContext context = 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 1ea10cb..f32093a 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 @@ -79,7 +79,7 @@ public class VerifyCMSSignatureResponseBuilder { * otherwise <code>false</code>. * @throws MOAException */ - public void addResult(CMSSignatureVerificationResult result, TrustProfile trustProfile, boolean checkQC, boolean qcSourceTSL, boolean checkSSCD, boolean sscdSourceTSL, String issuerCountryCode) + public void addResult(CMSSignatureVerificationResult result, TrustProfile trustProfile, boolean checkQC, boolean qcSourceTSL, boolean checkSSCD, boolean sscdSourceTSL, String issuerCountryCode, List adesResults) throws MOAException { CertificateValidationResult certResult = @@ -118,7 +118,8 @@ public class VerifyCMSSignatureResponseBuilder { factory.createVerifyCMSSignatureResponseElement( signerInfo, signatureCheck, - certificateCheck); + certificateCheck, + adesResults); responseElements.add(responseElement); } diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLog.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLog.java index 10dc79d..dcb1397 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLog.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLog.java @@ -26,6 +26,8 @@ package at.gv.egovernment.moa.spss.server.logging; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import iaik.logging.TransactionId; @@ -40,7 +42,7 @@ public class IaikLog implements iaik.logging.Log { /** The hierarchy to log all IAIK output to. */ public static final String IAIK_LOG_HIERARCHY = "iaik.server"; /** The commons-loggin <code>Log</code> to use for logging the messages. */ - private static Log log = LogFactory.getLog(IAIK_LOG_HIERARCHY); + private static Logger log = LoggerFactory.getLogger(IAIK_LOG_HIERARCHY); /** The node ID to use. */ private String nodeId; @@ -66,7 +68,7 @@ public class IaikLog implements iaik.logging.Log { public void debug(TransactionId transactionId, Object message, Throwable t) { IaikLogMsg msg = new IaikLogMsg(transactionId, nodeId, message); - log.debug(msg, t); + log.debug(msg.toString(), t); } /** @@ -82,7 +84,7 @@ public class IaikLog implements iaik.logging.Log { public void info(TransactionId transactionId, Object message, Throwable t) { IaikLogMsg msg = new IaikLogMsg(transactionId, nodeId, message); - log.info(msg, t); + log.info(msg.toString(), t); } /** @@ -98,7 +100,7 @@ public class IaikLog implements iaik.logging.Log { public void warn(TransactionId transactionId, Object message, Throwable t) { IaikLogMsg msg = new IaikLogMsg(transactionId, nodeId, message); - log.warn(msg, t); + log.warn(msg.toString(), t); } /** @@ -114,14 +116,14 @@ public class IaikLog implements iaik.logging.Log { public void error(TransactionId transactionId, Object message, Throwable t) { IaikLogMsg msg = new IaikLogMsg(transactionId, nodeId, message); - log.error(msg, t); + log.error(msg.toString(), t); } /** * @see iaik.logging.Log#isFatalEnabled() */ public boolean isFatalEnabled() { - return log.isFatalEnabled(); + return log.isErrorEnabled(); } /** @@ -130,7 +132,7 @@ public class IaikLog implements iaik.logging.Log { public void fatal(TransactionId transactionId, Object message, Throwable t) { IaikLogMsg msg = new IaikLogMsg(transactionId, nodeId, message); - log.fatal(msg, t); + log.error(msg.toString(), t); } /** diff --git a/moaSig/moa-sig/libs/axis-1.0_IAIK_1.2.jar b/moaSig/moa-sig/libs/axis-1.0_IAIK_1.2.jar Binary files differnew file mode 100644 index 0000000..3418552 --- /dev/null +++ b/moaSig/moa-sig/libs/axis-1.0_IAIK_1.2.jar diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AllSignatoriesType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AllSignatoriesType.java index 0dd1bb4..0faa261 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AllSignatoriesType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AllSignatoriesType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AnyChildrenType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AnyChildrenType.java index c94497e..c305a51 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AnyChildrenType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/AnyChildrenType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // @@ -71,8 +71,8 @@ public class AnyChildrenType { * <p> * Objects of the following type(s) are allowed in the list * {@link Object } - * {@link Element } * {@link String } + * {@link Element } * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSContentBaseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSContentBaseType.java index a2d18f6..86b030d 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSContentBaseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSContentBaseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectInfoType.java index 75a1077..69a89bb 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectOptionalMetaType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectOptionalMetaType.java index 6fe6676..fda13bb 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectOptionalMetaType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectOptionalMetaType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectRequiredMetaType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectRequiredMetaType.java index fd0f917..b3155c2 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectRequiredMetaType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CMSDataObjectRequiredMetaType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CanonicalizationMethodType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CanonicalizationMethodType.java index fc431a8..196446d 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CanonicalizationMethodType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CanonicalizationMethodType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // @@ -70,8 +70,8 @@ public class CanonicalizationMethodType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link Object } * {@link String } + * {@link Object } * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CheckResultType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CheckResultType.java index 79ea1ee..93e4362 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CheckResultType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CheckResultType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentBaseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentBaseType.java index 272afab..692110e 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentBaseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentBaseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentExLocRefBaseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentExLocRefBaseType.java index 8062a06..7c0dd25 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentExLocRefBaseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentExLocRefBaseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentOptionalRefType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentOptionalRefType.java index 869aae6..aa09c98 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentOptionalRefType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentOptionalRefType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentRequiredRefType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentRequiredRefType.java index 1f2d7f6..09e8af8 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentRequiredRefType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ContentRequiredRefType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequest.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequest.java index 6859bea..4d166e7 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequest.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequest.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequestType.java index 6f721f7..b74132f 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequestType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureRequestType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureResponseType.java index 1964ad8..7e4d9a5 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureResponseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateCMSSignatureResponseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequest.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequest.java index 11dfc01..3ee7507 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequest.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequest.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequestType.java index baf9622..c69738c 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequestType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureRequestType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureResponseType.java index 901d242..eace92c 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureResponseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreatePDFSignatureResponseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureEnvironmentProfile.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureEnvironmentProfile.java index 1d97509..e3ee7fd 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureEnvironmentProfile.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureEnvironmentProfile.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureLocationType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureLocationType.java index 4a207b1..f5e40af 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureLocationType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateSignatureLocationType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateTransformsInfoProfile.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateTransformsInfoProfile.java index cd60ea3..74f0ad1 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateTransformsInfoProfile.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateTransformsInfoProfile.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequest.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequest.java index 4f6a6cf..3953720 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequest.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequest.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequestType.java index 8c212f2..c19c1fa 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequestType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureRequestType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureResponseType.java index a6a4aa7..fb00cd5 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureResponseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/CreateXMLSignatureResponseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DSAKeyValueType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DSAKeyValueType.java index 4a76929..e3ee203 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DSAKeyValueType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DSAKeyValueType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DataObjectInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DataObjectInfoType.java index b41ea85..f5853e5 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DataObjectInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DataObjectInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DigestMethodType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DigestMethodType.java index 1765e0b..2fc5bc8 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DigestMethodType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/DigestMethodType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // @@ -72,8 +72,8 @@ public class DigestMethodType { * <p> * Objects of the following type(s) are allowed in the list * {@link Object } - * {@link Element } * {@link String } + * {@link Element } * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ErrorResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ErrorResponseType.java index d3b53ec..29e36c8 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ErrorResponseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ErrorResponseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FinalDataMetaInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FinalDataMetaInfoType.java index 2ea54a9..829ba47 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FinalDataMetaInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FinalDataMetaInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FormResultType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FormResultType.java index 93a2dbe..dd6b787 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FormResultType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/FormResultType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/InputDataType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/InputDataType.java index 589bab5..6c24b40 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/InputDataType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/InputDataType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyInfoType.java index 0a35915..ea2b0a8 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // @@ -60,13 +60,13 @@ import org.w3c.dom.Element; public class KeyInfoType { @XmlElementRefs({ - @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), @XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) }) @XmlMixed @XmlAnyElement(lax = true) @@ -95,16 +95,16 @@ public class KeyInfoType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >} + * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >} + * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >} * {@link Element } + * {@link Object } + * {@link String } + * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >} * {@link JAXBElement }{@code <}{@link X509DataType }{@code >} * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >} - * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >} * {@link JAXBElement }{@code <}{@link String }{@code >} - * {@link String } - * {@link Object } - * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >} + * {@link JAXBElement }{@code <}{@link String }{@code >} * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyStorageType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyStorageType.java index 4188f94..de9229e 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyStorageType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyStorageType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyValueType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyValueType.java index 272f0e2..962acfd 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyValueType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/KeyValueType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // @@ -74,11 +74,11 @@ public class KeyValueType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link Element } * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} + * {@link Element } + * {@link Object } * {@link String } * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >} - * {@link Object } * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultInfoType.java index 2826af8..802500b 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultType.java index 704efa1..6cb8b6e 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestRefsCheckResultType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestType.java index 635ff83..00b879c 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ManifestType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MetaInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MetaInfoType.java index 53ffef0..5f7f52a 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MetaInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MetaInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformType.java index 262a5f6..36797df 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // @@ -50,8 +50,8 @@ import javax.xml.bind.annotation.XmlType; public class MoaTransformType { @XmlElementRefs({ - @XmlElementRef(name = "XPath", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "transformData", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "transformData", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "XPath", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class, required = false) }) @XmlMixed protected List<Serializable> content; @@ -77,9 +77,9 @@ public class MoaTransformType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link String } - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * {@link String } * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformsType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformsType.java index 6cc0cc7..e262b9c 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformsType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/MoaTransformsType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectFactory.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectFactory.java index e8d191d..5fcafb9 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectFactory.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectFactory.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // @@ -34,6 +34,7 @@ import javax.xml.namespace.QName; @XmlRegistry public class ObjectFactory { + private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath"); private final static QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature"); private final static QName _PGPData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPData"); private final static QName _DSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DSAKeyValue"); @@ -73,21 +74,21 @@ public class ObjectFactory { private final static QName _ReferringSigReference_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "ReferringSigReference"); private final static QName _RSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue"); private final static QName _MoaTransforms_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "MoaTransforms"); - private final static QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyID"); - private final static QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket"); private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp"); + private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength"); private final static QName _VerifyCMSSignatureResponseTypeSignatureCheck_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "SignatureCheck"); private final static QName _VerifyCMSSignatureResponseTypeCertificateCheck_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "CertificateCheck"); private final static QName _VerifyCMSSignatureResponseTypeSignerInfo_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "SignerInfo"); - private final static QName _MoaTransformTypeTransformData_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "transformData"); - private final static QName _MoaTransformTypeXPath_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "XPath"); + private final static QName _VerifyCMSSignatureResponseTypeFormCheckResult_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "FormCheckResult"); private final static QName _X509DataTypeX509IssuerSerial_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509IssuerSerial"); private final static QName _X509DataTypeX509Certificate_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Certificate"); private final static QName _X509DataTypeX509SKI_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SKI"); private final static QName _X509DataTypeX509SubjectName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SubjectName"); private final static QName _X509DataTypeX509CRL_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509CRL"); - private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength"); - private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath"); + private final static QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyID"); + private final static QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket"); + private final static QName _MoaTransformTypeTransformData_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "transformData"); + private final static QName _MoaTransformTypeXPath_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20151109#", "XPath"); /** * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.egiz.moasig @@ -777,6 +778,15 @@ public class ObjectFactory { } /** + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class) + public JAXBElement<String> createTransformTypeXPath(String value) { + return new JAXBElement<String>(_TransformTypeXPath_QNAME, String.class, TransformType.class, value); + } + + /** * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}} * */ @@ -1132,27 +1142,18 @@ public class ObjectFactory { * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class) - public JAXBElement<byte[]> createPGPDataTypePGPKeyID(byte[] value) { - return new JAXBElement<byte[]>(_PGPDataTypePGPKeyID_QNAME, byte[].class, PGPDataType.class, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class) - public JAXBElement<byte[]> createPGPDataTypePGPKeyPacket(byte[] value) { - return new JAXBElement<byte[]>(_PGPDataTypePGPKeyPacket_QNAME, byte[].class, PGPDataType.class, ((byte[]) value)); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class) + public JAXBElement<byte[]> createSPKIDataTypeSPKISexp(byte[] value) { + return new JAXBElement<byte[]>(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value)); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class) - public JAXBElement<byte[]> createSPKIDataTypeSPKISexp(byte[] value) { - return new JAXBElement<byte[]>(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value)); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class) + public JAXBElement<BigInteger> createSignatureMethodTypeHMACOutputLength(BigInteger value) { + return new JAXBElement<BigInteger>(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value); } /** @@ -1183,21 +1184,12 @@ public class ObjectFactory { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link FormResultType }{@code >}} * */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "transformData", scope = MoaTransformType.class) - public JAXBElement<byte[]> createMoaTransformTypeTransformData(byte[] value) { - return new JAXBElement<byte[]>(_MoaTransformTypeTransformData_QNAME, byte[].class, MoaTransformType.class, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "XPath", scope = MoaTransformType.class) - public JAXBElement<String> createMoaTransformTypeXPath(String value) { - return new JAXBElement<String>(_MoaTransformTypeXPath_QNAME, String.class, MoaTransformType.class, value); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "FormCheckResult", scope = VerifyCMSSignatureResponseType.class) + public JAXBElement<FormResultType> createVerifyCMSSignatureResponseTypeFormCheckResult(FormResultType value) { + return new JAXBElement<FormResultType>(_VerifyCMSSignatureResponseTypeFormCheckResult_QNAME, FormResultType.class, VerifyCMSSignatureResponseType.class, value); } /** @@ -1246,21 +1238,39 @@ public class ObjectFactory { } /** - * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class) - public JAXBElement<BigInteger> createSignatureMethodTypeHMACOutputLength(BigInteger value) { - return new JAXBElement<BigInteger>(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value); + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class) + public JAXBElement<byte[]> createPGPDataTypePGPKeyID(byte[] value) { + return new JAXBElement<byte[]>(_PGPDataTypePGPKeyID_QNAME, byte[].class, PGPDataType.class, ((byte[]) value)); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class) + public JAXBElement<byte[]> createPGPDataTypePGPKeyPacket(byte[] value) { + return new JAXBElement<byte[]>(_PGPDataTypePGPKeyPacket_QNAME, byte[].class, PGPDataType.class, ((byte[]) value)); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} + * + */ + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "transformData", scope = MoaTransformType.class) + public JAXBElement<byte[]> createMoaTransformTypeTransformData(byte[] value) { + return new JAXBElement<byte[]>(_MoaTransformTypeTransformData_QNAME, byte[].class, MoaTransformType.class, ((byte[]) value)); } /** * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} * */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class) - public JAXBElement<String> createTransformTypeXPath(String value) { - return new JAXBElement<String>(_TransformTypeXPath_QNAME, String.class, TransformType.class, value); + @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", name = "XPath", scope = MoaTransformType.class) + public JAXBElement<String> createMoaTransformTypeXPath(String value) { + return new JAXBElement<String>(_MoaTransformTypeXPath_QNAME, String.class, MoaTransformType.class, value); } } diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectType.java index 51b901d..0fc0943 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ObjectType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // @@ -84,8 +84,8 @@ public class ObjectType { * <p> * Objects of the following type(s) are allowed in the list * {@link Object } - * {@link Element } * {@link String } + * {@link Element } * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignatureResultType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignatureResultType.java index cf03ae7..e1567bc 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignatureResultType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignatureResultType.java @@ -2,12 +2,14 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // package at.gv.egiz.moasig; +import java.util.ArrayList; +import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; @@ -27,6 +29,7 @@ import javax.xml.bind.annotation.XmlType; * <element name="SignerInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/> * <element name="SignatureCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}CheckResultType"/> * <element name="CertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}CheckResultType"/> + * <element name="FormCheckResult" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}FormResultType" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -39,7 +42,8 @@ import javax.xml.bind.annotation.XmlType; @XmlType(name = "PDFSignatureResultType", propOrder = { "signerInfo", "signatureCheck", - "certificateCheck" + "certificateCheck", + "formCheckResult" }) public class PDFSignatureResultType { @@ -49,6 +53,8 @@ public class PDFSignatureResultType { protected CheckResultType signatureCheck; @XmlElement(name = "CertificateCheck", required = true) protected CheckResultType certificateCheck; + @XmlElement(name = "FormCheckResult") + protected List<FormResultType> formCheckResult; /** * Gets the value of the signerInfo property. @@ -122,4 +128,33 @@ public class PDFSignatureResultType { this.certificateCheck = value; } + /** + * Gets the value of the formCheckResult property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the formCheckResult property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getFormCheckResult().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link FormResultType } + * + * + */ + public List<FormResultType> getFormCheckResult() { + if (formCheckResult == null) { + formCheckResult = new ArrayList<FormResultType>(); + } + return this.formCheckResult; + } + } diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignedRepsonse.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignedRepsonse.java index 9251e54..8b18768 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignedRepsonse.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PDFSignedRepsonse.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PGPDataType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PGPDataType.java index 83e4ab1..fdade7f 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PGPDataType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PGPDataType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // @@ -54,8 +54,8 @@ import org.w3c.dom.Element; public class PGPDataType { @XmlElementRefs({ - @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) }) @XmlAnyElement(lax = true) protected List<Object> content; @@ -88,10 +88,10 @@ public class PGPDataType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * {@link Object } * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * {@link Element } - * {@link Object } + * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PublicAuthorityType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PublicAuthorityType.java index 76a5327..76049e6 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PublicAuthorityType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/PublicAuthorityType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/QualifiedCertificate.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/QualifiedCertificate.java index 8535050..9577f98 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/QualifiedCertificate.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/QualifiedCertificate.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RSAKeyValueType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RSAKeyValueType.java index fec09f9..3a7ba44 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RSAKeyValueType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RSAKeyValueType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferenceType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferenceType.java index d7822cb..cf5ff98 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferenceType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferenceType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultInfoType.java index 8c43171..f6700ce 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultType.java index 303d7a2..85c12ea 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/ReferencesCheckResultType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RetrievalMethodType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RetrievalMethodType.java index f6422e2..1ec3d68 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RetrievalMethodType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/RetrievalMethodType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SPKIDataType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SPKIDataType.java index ebbeb04..8e8e914 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SPKIDataType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SPKIDataType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SecureSignatureCreationDevice.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SecureSignatureCreationDevice.java index e821d6a..e4f8397 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SecureSignatureCreationDevice.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SecureSignatureCreationDevice.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureMethodType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureMethodType.java index d51f4f3..8a425ed 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureMethodType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureMethodType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // @@ -75,9 +75,9 @@ public class SignatureMethodType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link String } * {@link JAXBElement }{@code <}{@link BigInteger }{@code >} * {@link Object } + * {@link String } * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertiesType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertiesType.java index b7d010b..c106440 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertiesType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertiesType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertyType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertyType.java index c4a337f..8d58626 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertyType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignaturePropertyType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // @@ -81,8 +81,8 @@ public class SignaturePropertyType { * <p> * Objects of the following type(s) are allowed in the list * {@link Object } - * {@link Element } * {@link String } + * {@link Element } * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureType.java index 5931d25..b0da91b 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureValueType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureValueType.java index 0422515..efb6359 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureValueType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignatureValueType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignedInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignedInfoType.java index be08f2d..b91610b 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignedInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/SignedInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformParameterType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformParameterType.java index ed15c5e..3cbc23b 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformParameterType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformParameterType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformType.java index cf0fe66..e320b31 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // @@ -75,10 +75,10 @@ public class TransformType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link String } - * {@link Object } - * {@link JAXBElement }{@code <}{@link String }{@code >} * {@link Element } + * {@link JAXBElement }{@code <}{@link String }{@code >} + * {@link Object } + * {@link String } * * */ diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsInfoType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsInfoType.java index 8f650f0..102a762 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsInfoType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsInfoType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsType.java index 9c5806e..5ad37b8 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/TransformsType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequest.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequest.java index 5841be2..fb97464 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequest.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequest.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequestType.java index c2d6d7d..b970ca6 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequestType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureRequestType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureResponseType.java index 6727e50..ece5c9d 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureResponseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyCMSSignatureResponseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // @@ -31,6 +31,7 @@ import javax.xml.bind.annotation.XmlType; * <element name="SignerInfo" type="{http://www.w3.org/2000/09/xmldsig#}KeyInfoType"/> * <element name="SignatureCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}CheckResultType"/> * <element name="CertificateCheck" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}CheckResultType"/> + * <element name="FormCheckResult" type="{http://reference.e-government.gv.at/namespace/moa/20151109#}FormResultType" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -46,9 +47,10 @@ import javax.xml.bind.annotation.XmlType; public class VerifyCMSSignatureResponseType { @XmlElementRefs({ - @XmlElementRef(name = "SignerInfo", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class), @XmlElementRef(name = "CertificateCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class), - @XmlElementRef(name = "SignatureCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class) + @XmlElementRef(name = "SignatureCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class), + @XmlElementRef(name = "FormCheckResult", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class), + @XmlElementRef(name = "SignerInfo", namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", type = JAXBElement.class) }) protected List<JAXBElement<?>> signerInfoAndSignatureCheckAndCertificateCheck; @@ -70,6 +72,7 @@ public class VerifyCMSSignatureResponseType { * * <p> * Objects of the following type(s) are allowed in the list + * {@link JAXBElement }{@code <}{@link FormResultType }{@code >} * {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >} * {@link JAXBElement }{@code <}{@link CheckResultType }{@code >} * {@link JAXBElement }{@code <}{@link CheckResultType }{@code >} diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequest.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequest.java index 447dcdd..045e36f 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequest.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequest.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequestType.java index d513b6e..6487059 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequestType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureRequestType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureResponseType.java index dd89ec4..bf344ce 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureResponseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyPDFSignatureResponseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsDataType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsDataType.java index 9cb162b..35a5366 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsDataType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsDataType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsInfoProfile.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsInfoProfile.java index c758f7c..b015978 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsInfoProfile.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyTransformsInfoProfile.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequest.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequest.java index eaa4eb5..3187efd 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequest.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequest.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequestType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequestType.java index 2dcea3c..4e4d28d 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequestType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureRequestType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureResponseType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureResponseType.java index b6de7b9..69cac83 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureResponseType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/VerifyXMLSignatureResponseType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509DataType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509DataType.java index 0bd71d3..a7a7b97 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509DataType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509DataType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // @@ -54,9 +54,9 @@ public class X509DataType { @XmlElementRefs({ @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), + @XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), @XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) }) @XmlAnyElement(lax = true) @@ -80,12 +80,12 @@ public class X509DataType { * * <p> * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * {@link Element } - * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >} * {@link Object } * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * {@link JAXBElement }{@code <}{@link byte[]}{@code >} + * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >} + * {@link JAXBElement }{@code <}{@link byte[]}{@code >} * {@link JAXBElement }{@code <}{@link String }{@code >} * * diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509IssuerSerialType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509IssuerSerialType.java index c712093..4e066e5 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509IssuerSerialType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/X509IssuerSerialType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLDataObjectAssociationType.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLDataObjectAssociationType.java index 32aa8ad..b9b0958 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLDataObjectAssociationType.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/XMLDataObjectAssociationType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // diff --git a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/package-info.java b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/package-info.java index 2fb1752..0344afc 100644 --- a/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/package-info.java +++ b/moaSig/moa-sig/src/generated/java/at/gv/egiz/moasig/package-info.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2015.11.27 at 11:17:03 AM CET +// Generated on: 2015.11.30 at 11:32:30 AM CET // @javax.xml.bind.annotation.XmlSchema(namespace = "http://reference.e-government.gv.at/namespace/moa/20151109#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/CMSVerifySignatureBinding.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/CMSVerifySignatureBinding.java index 0cc3389..d878b26 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/CMSVerifySignatureBinding.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/CMSVerifySignatureBinding.java @@ -2,6 +2,8 @@ package at.gv.egovernment.moa.spss.server.webservice; import at.gv.egiz.moasig.VerifyCMSSignatureRequest; import at.gv.egiz.moasig.VerifyCMSSignatureResponseType; +import at.gv.egiz.moasig.VerifyPDFSignatureRequest; +import at.gv.egiz.moasig.VerifyPDFSignatureResponseType; import at.gv.egovernment.moa.spss.MOAApplicationException; import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse; @@ -9,6 +11,13 @@ public interface CMSVerifySignatureBinding { public at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest buildCMSRequest( VerifyCMSSignatureRequest verifyCMSSignatureRequest) throws MOAApplicationException; + public at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest buildPDFRequest( + VerifyPDFSignatureRequest verifyPDFSignatureRequest) throws MOAApplicationException; + public VerifyCMSSignatureResponseType buildCMSResponse(VerifyCMSSignatureResponse response) throws MOAApplicationException; + + public VerifyPDFSignatureResponseType buildPDFResponse(VerifyCMSSignatureResponse response) + throws MOAApplicationException; + } diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/SignatureCreationService.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/SignatureCreationService.java index 5da3dfc..5162f55 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/SignatureCreationService.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/SignatureCreationService.java @@ -7,17 +7,17 @@ import javax.jws.WebService; @WebService(name = "SignatureCreationService", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20151109#") public interface SignatureCreationService { - @WebMethod(action = "createXMLSignature", operationName = "createXMLSignature") + @WebMethod(action = "XMLSignatureCreate", operationName = "XMLSignatureCreate") public at.gv.egiz.moasig.CreateXMLSignatureResponseType createXMLSignature( @WebParam(name = "CreateXMLSignatureRequest") at.gv.egiz.moasig.CreateXMLSignatureRequest createXMLSignatureRequest) throws Exception; - @WebMethod(action = "createCMSSignature", operationName = "createCMSSignature") + @WebMethod(action = "CMSSignatureCreate", operationName = "CMSSignatureCreate") public at.gv.egiz.moasig.CreateCMSSignatureResponseType createCMSSignature( @WebParam(name = "CreateCMSSignatureRequest") at.gv.egiz.moasig.CreateCMSSignatureRequest createCMSSignatureRequest) throws Exception; - @WebMethod(action = "createPDFSignature", operationName = "createPDFSignature") + @WebMethod(action = "PDFSignatureCreate", operationName = "PDFSignatureCreate") public at.gv.egiz.moasig.CreatePDFSignatureResponseType createPDFSignature( @WebParam(name = "CreatePDFSignatureRequest") at.gv.egiz.moasig.CreatePDFSignatureRequest createPDFSignatureRequest) throws Exception; diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/SignatureVerificationService.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/SignatureVerificationService.java index dd78aea..65de3bf 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/SignatureVerificationService.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/SignatureVerificationService.java @@ -7,17 +7,17 @@ import javax.jws.WebService; @WebService(name = "SignatureVerificationService", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20151109#") public interface SignatureVerificationService { - @WebMethod(action = "verifyXMLSignature", operationName = "verifyXMLSignature") + @WebMethod(action = "XMLSignatureVerify", operationName = "XMLSignatureVerify") public at.gv.egiz.moasig.VerifyXMLSignatureResponseType verifyXMLSignature( @WebParam(name = "VerifyXMLSignatureRequest") at.gv.egiz.moasig.VerifyXMLSignatureRequest verifyXMLSignatureRequest) throws Exception; - @WebMethod(action = "verifyCMSSignature", operationName = "verifyCMSSignature") + @WebMethod(action = "CMSSignatureVerify", operationName = "CMSSignatureVerify") public at.gv.egiz.moasig.VerifyCMSSignatureResponseType verifyCMSSignature( @WebParam(name = "VerifyCMSSignatureRequest") at.gv.egiz.moasig.VerifyCMSSignatureRequest verifyCMSSignatureRequest) throws Exception; - @WebMethod(action = "verifyPDFSignature", operationName = "verifyPDFSignature") + @WebMethod(action = "PDFSignatureVerify", operationName = "PDFSignatureVerify") public at.gv.egiz.moasig.VerifyPDFSignatureResponseType verifyPDFSignature( @WebParam(name = "VerifyPDFSignatureRequest") at.gv.egiz.moasig.VerifyPDFSignatureRequest verifyPDFSignatureRequest) throws Exception; diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/CMSVerifySignatureBindingImpl.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/CMSVerifySignatureBindingImpl.java index 3799fde..7a49d6a 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/CMSVerifySignatureBindingImpl.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/binding/CMSVerifySignatureBindingImpl.java @@ -2,14 +2,19 @@ package at.gv.egovernment.moa.spss.server.webservice.binding; import java.io.ByteArrayInputStream; import java.io.InputStream; +import java.math.BigInteger; import java.util.ArrayList; import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; +import at.gv.egiz.moasig.FormResultType; import at.gv.egiz.moasig.ObjectFactory; +import at.gv.egiz.moasig.PDFSignatureResultType; import at.gv.egiz.moasig.VerifyCMSSignatureResponseType; +import at.gv.egiz.moasig.VerifyPDFSignatureRequest; +import at.gv.egiz.moasig.VerifyPDFSignatureResponseType; import at.gv.egovernment.moa.spss.MOAApplicationException; import at.gv.egovernment.moa.spss.api.SPSSFactory; import at.gv.egovernment.moa.spss.api.cmsverify.CMSDataObject; @@ -18,6 +23,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.SignerInfo; +import at.gv.egovernment.moa.spss.api.xmlverify.AdESFormResults; import at.gv.egovernment.moa.spss.server.webservice.CMSVerifySignatureBinding; import at.gv.egovernment.moa.util.CollectionUtils; @@ -33,7 +39,7 @@ public class CMSVerifySignatureBindingImpl implements CMSVerifySignatureBinding at.gv.egiz.moasig.VerifyCMSSignatureRequest verifyCMSSignatureRequest) throws MOAApplicationException { Date dateTime = null; - if (verifyCMSSignatureRequest.getDateTime() == null) { + if (verifyCMSSignatureRequest.getDateTime() != null) { dateTime = verifyCMSSignatureRequest.getDateTime().toGregorianCalendar().getTime(); } @@ -49,7 +55,7 @@ public class CMSVerifySignatureBindingImpl implements CMSVerifySignatureBinding InputStream cmsSignature = new ByteArrayInputStream(verifyCMSSignatureRequest.getCMSSignature()); - return factory.createVerifyCMSSignatureRequest(signatories, dateTime, cmsSignature, dataObject, trustProfileID); + return factory.createVerifyCMSSignatureRequest(signatories, dateTime, cmsSignature, dataObject, trustProfileID, false); } /** @@ -62,6 +68,10 @@ public class CMSVerifySignatureBindingImpl implements CMSVerifySignatureBinding * <code>VerifyCMSSignatureRequest</code> DOM element. */ private int[] parseSignatories(at.gv.egiz.moasig.VerifyCMSSignatureRequest verifyCMSSignatureRequest) { + if(verifyCMSSignatureRequest.getSignatories().isEmpty()) { + return VerifyCMSSignatureRequest.ALL_SIGNATORIES; + } + Iterator<String> signatoriesIterator = verifyCMSSignatureRequest.getSignatories().iterator(); List signatoriesList = new ArrayList(); @@ -91,8 +101,6 @@ public class CMSVerifySignatureBindingImpl implements CMSVerifySignatureBinding return signatories; } - - @Override public VerifyCMSSignatureResponseType buildCMSResponse(VerifyCMSSignatureResponse response) throws MOAApplicationException { @@ -120,11 +128,11 @@ public class CMSVerifySignatureBindingImpl implements CMSVerifySignatureBinding private void addResponseElement(VerifyCMSSignatureResponseType verifyCMSSignatureResponseType, VerifyCMSSignatureResponseElement responseElement) throws MOAApplicationException { + ObjectFactory of = new ObjectFactory(); SignerInfo signerInfo = responseElement.getSignerInfo(); CheckResult signatureCheck = responseElement.getSignatureCheck(); CheckResult certCheck = responseElement.getCertificateCheck(); - - ObjectFactory of = new ObjectFactory(); + verifyCMSSignatureResponseType.getSignerInfoAndSignatureCheckAndCertificateCheck().add( of.createVerifyCMSSignatureResponseTypeSignerInfo(this.transformerUtils.buildSignerInfo(signerInfo))); verifyCMSSignatureResponseType.getSignerInfoAndSignatureCheckAndCertificateCheck() @@ -132,8 +140,105 @@ public class CMSVerifySignatureBindingImpl implements CMSVerifySignatureBinding this.transformerUtils.buildCheckResult(signatureCheck))); verifyCMSSignatureResponseType.getSignerInfoAndSignatureCheckAndCertificateCheck() - .add(of.createVerifyCMSSignatureResponseTypeCertificateCheck( - this.transformerUtils.buildCheckResult(certCheck))); + .add(of.createVerifyCMSSignatureResponseTypeCertificateCheck( + this.transformerUtils.buildCheckResult(certCheck))); + + if (responseElement.getAdESFormResults() != null) { + Iterator adesIterator = responseElement.getAdESFormResults().iterator(); + while (adesIterator.hasNext()) { + AdESFormResults adesResult = (AdESFormResults) adesIterator.next(); + FormResultType formResultType = new FormResultType(); + formResultType.setCode(BigInteger.valueOf(adesResult.getCode())); + formResultType.setName(adesResult.getName()); + + verifyCMSSignatureResponseType.getSignerInfoAndSignatureCheckAndCertificateCheck().add( + of.createVerifyCMSSignatureResponseTypeFormCheckResult(formResultType)); + } + } + } + + /** + * Add an element to the response. + * + * @param responseElement + * The element to add to the response. + * @throws MOAApplicationException + * An error occurred adding the element. + */ + private void addResponseElement(VerifyPDFSignatureResponseType verifyPDFSignatureResponseType, + VerifyCMSSignatureResponseElement responseElement) throws MOAApplicationException { + + SignerInfo signerInfo = responseElement.getSignerInfo(); + CheckResult signatureCheck = responseElement.getSignatureCheck(); + CheckResult certCheck = responseElement.getCertificateCheck(); + + PDFSignatureResultType resultType = new PDFSignatureResultType(); + + if (responseElement.getAdESFormResults() != null) { + Iterator adesIterator = responseElement.getAdESFormResults().iterator(); + while (adesIterator.hasNext()) { + AdESFormResults adesResult = (AdESFormResults) adesIterator.next(); + FormResultType formResultType = new FormResultType(); + formResultType.setCode(BigInteger.valueOf(adesResult.getCode())); + formResultType.setName(adesResult.getName()); + resultType.getFormCheckResult().add(formResultType); + } + } + + resultType.setSignerInfo(this.transformerUtils.buildSignerInfo(signerInfo)); + resultType.setSignatureCheck(this.transformerUtils.buildCheckResult(signatureCheck)); + resultType.setCertificateCheck(this.transformerUtils.buildCheckResult(certCheck)); + + verifyPDFSignatureResponseType.getSignatureResult().add(resultType); + } + + /** + * Parse the <code>Signatories</code> attribute contained in the + * <code>VerifyCMSSignatureRequest</code> DOM element. + * + * @param requestElem + * The <code>VerifyCMSSignatureRequest</code> DOM element. + * @return The signatories contained in the given + * <code>VerifyCMSSignatureRequest</code> DOM element. + */ + private int[] parseSignatories(VerifyPDFSignatureRequest verifyPDFSignatureRequest) { + return VerifyCMSSignatureRequest.ALL_SIGNATORIES; + } + + @Override + public VerifyCMSSignatureRequest buildPDFRequest(VerifyPDFSignatureRequest verifyPDFSignatureRequest) + throws MOAApplicationException { + Date dateTime = null; + if (verifyPDFSignatureRequest.getDateTime() == null) { + dateTime = verifyPDFSignatureRequest.getDateTime().toGregorianCalendar().getTime(); + } + + int[] signatories = parseSignatories(verifyPDFSignatureRequest); + + String trustProfileID = null; + + if (verifyPDFSignatureRequest.getTrustProfileID() != null) { + trustProfileID = verifyPDFSignatureRequest.getTrustProfileID(); + } + + InputStream cmsSignature = new ByteArrayInputStream(verifyPDFSignatureRequest.getPDFSignature()); + + return factory.createVerifyCMSSignatureRequest(signatories, dateTime, cmsSignature, null, trustProfileID, true); + } + + @Override + public VerifyPDFSignatureResponseType buildPDFResponse(VerifyCMSSignatureResponse response) + throws MOAApplicationException { + VerifyPDFSignatureResponseType verifyPDFSignatureResponseType = new VerifyPDFSignatureResponseType(); + + Iterator iter; + + for (iter = response.getResponseElements().iterator(); iter.hasNext();) { + VerifyCMSSignatureResponseElement responseElement = (VerifyCMSSignatureResponseElement) iter.next(); + addResponseElement(verifyPDFSignatureResponseType, responseElement); + } + + return verifyPDFSignatureResponseType; } } diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SignatureVerificationServiceImpl.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SignatureVerificationServiceImpl.java index 0b16e2a..cbc4d2d 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SignatureVerificationServiceImpl.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/webservice/impl/SignatureVerificationServiceImpl.java @@ -129,15 +129,15 @@ public class SignatureVerificationServiceImpl implements SignatureVerificationSe } } - @Override - @WebResult(name = "VerifyPDFSignatureResponseType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20151109#") - public VerifyPDFSignatureResponseType verifyPDFSignature(VerifyPDFSignatureRequest verifyPDFSignatureRequest) + //@Override + //@WebResult(name = "VerifyPDFSignatureResponseType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20151109#") + private VerifyPDFSignatureResponseType verifyPDFASSignature(VerifyPDFSignatureRequest verifyPDFSignatureRequest) throws Exception { logger.info("verifyPDFSignature start"); try { logger.info("WebServiceContext: {}", context); ContextSetupAspect.setupContext(context.getMessageContext(), "verifyPDFSignature"); - + VerifyPDFRequest requestObj; VerifyPDFResponse responseObj; @@ -171,5 +171,45 @@ public class SignatureVerificationServiceImpl implements SignatureVerificationSe ContextSetupAspect.cleanContext(); } } + + @Override + @WebResult(name = "VerifyPDFSignatureResponseType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20151109#") + public VerifyPDFSignatureResponseType verifyPDFSignature(VerifyPDFSignatureRequest verifyPDFSignatureRequest) + throws Exception { + logger.info("verifyPDFSignature start"); + try { + logger.info("WebServiceContext: {}", context); + ContextSetupAspect.setupContext(context.getMessageContext(), "verifyPDFSignature"); + + CMSSignatureVerificationInvoker invoker = CMSSignatureVerificationInvoker.getInstance(); + + at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest requestObj; + at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse responseObj; + + logger.trace(">>> preparsing Request"); + requestObj = this.cmsVerifySignatureBinding.buildPDFRequest(verifyPDFSignatureRequest); + logger.trace("<<< preparsed Request"); + + logger.trace(">>> verifying Signature"); + // invoke the core logic + responseObj = invoker.verifyCMSSignature(requestObj); + logger.trace("<<< verified Signature"); + + logger.trace(">>> building Response"); + // map back to XML + VerifyPDFSignatureResponseType response = this.cmsVerifySignatureBinding.buildPDFResponse(responseObj); + logger.trace("<<< built Response"); + + return response; + } catch (Throwable t) { + MOASystemException e = new MOASystemException("2900", null, t); + logger.debug("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:" + + System.getProperty("line.separator") + StreamUtils.getStackTraceAsString(e)); + logger.error("Anfrage zur Signaturerstellung wurde nicht erfolgreich beendet:", e); + throw new Exception(e.getMessage()); + } finally { + ContextSetupAspect.cleanContext(); + } + } } diff --git a/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SIG-3.0.0.xsd b/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SIG-3.0.0.xsd index 4e3601a..63e82a2 100644 --- a/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SIG-3.0.0.xsd +++ b/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SIG-3.0.0.xsd @@ -213,6 +213,8 @@ </xsd:element> <xsd:element name="SignatureCheck" type="CheckResultType" /> <xsd:element name="CertificateCheck" type="CheckResultType" /> + <xsd:element name="FormCheckResult" type="FormResultType" + minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> </xsd:complexType> <!--########## Verify PDF Signature ### --> @@ -258,6 +260,8 @@ </xsd:element> <xsd:element name="SignatureCheck" type="CheckResultType" /> <xsd:element name="CertificateCheck" type="CheckResultType" /> + <xsd:element name="FormCheckResult" type="FormResultType" + minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> </xsd:complexType> <!--########## Verify XML Signature ### --> |