diff options
Diffstat (limited to 'moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas')
2 files changed, 9 insertions, 2 deletions
diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaConnector.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaConnector.java index 6edee0d..f12a2d1 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaConnector.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaConnector.java @@ -13,6 +13,8 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import at.gv.egiz.pdfas.common.exceptions.PDFASError; +import at.gv.egiz.pdfas.common.exceptions.PdfAsErrorCarrier; import at.gv.egiz.pdfas.common.exceptions.PdfAsException; import at.gv.egiz.pdfas.lib.api.sign.SignParameter; import at.gv.egiz.pdfas.lib.impl.status.RequestedSignature; @@ -52,9 +54,10 @@ public class InternalMoaConnector implements ISignatureConnector { this.transactionId = transactionId; this.clientCert = clientCert; } - + @SuppressWarnings({ "rawtypes", "unchecked" }) private Set buildKeySet(String keyGroupID, KeyModule module) throws ConfigurationException { ConfigurationProvider config = ConfigurationProvider.getInstance(); + Set keyGroupEntries; // get the KeyGroup entries from the configuration @@ -95,6 +98,7 @@ public class InternalMoaConnector implements ISignatureConnector { } @Override + @SuppressWarnings("rawtypes") public X509Certificate getCertificate(SignParameter parameter) throws PdfAsException { KeyModule module = KeyModuleFactory.getInstance(this.transactionId); @@ -161,6 +165,7 @@ public class InternalMoaConnector implements ISignatureConnector { throw new PdfAsException("Failed to find keys available for Key Identifier: " + this.keyIdentifier); } + @SuppressWarnings("unchecked") @Override public byte[] sign(byte[] input, int[] byteRange, SignParameter parameter, RequestedSignature requestedSignature) throws PdfAsException { @@ -207,6 +212,8 @@ public class InternalMoaConnector implements ISignatureConnector { if(createCMSSignatureResponseElement.getResponseType() == CreateCMSSignatureResponseElement.ERROR_RESPONSE) { ErrorResponse errorResponse = (ErrorResponse) createCMSSignatureResponseElement; + Logger.error("Failed to create signature " + errorResponse.getErrorCode() + " " + errorResponse.getInfo()); + throw new PdfAsErrorCarrier(new PDFASError(errorResponse.getErrorCode(), errorResponse.getInfo())); } else if(createCMSSignatureResponseElement.getResponseType() == CreateCMSSignatureResponseElement.CMS_SIGNATURE ) { CMSSignatureResponse cmsSignatureResponse = (CMSSignatureResponse) createCMSSignatureResponseElement; diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaVerifier.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaVerifier.java index f937495..e59fe50 100644 --- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaVerifier.java +++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/pdfas/InternalMoaVerifier.java @@ -18,7 +18,6 @@ import at.gv.egiz.pdfas.lib.api.verify.VerifyParameter.SignatureVerificationLeve import at.gv.egiz.pdfas.lib.api.verify.VerifyResult; import at.gv.egiz.pdfas.lib.impl.verify.IVerifier; import at.gv.egiz.pdfas.lib.impl.verify.SignatureCheckImpl; -import at.gv.egiz.pdfas.lib.impl.verify.VerifyResultImpl; import at.gv.egovernment.moa.spss.MOAException; import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureRequest; import at.gv.egovernment.moa.spss.api.cmsverify.VerifyCMSSignatureResponse; @@ -68,6 +67,7 @@ public class InternalMoaVerifier implements IVerifier { try { VerifyCMSSignatureResponse verifyCMSSignatureResponse = CMSSignatureVerificationInvoker.getInstance() .verifyCMSSignature(verifyCMSSignatureRequest); + @SuppressWarnings("rawtypes") Iterator iter; for (iter = verifyCMSSignatureResponse.getResponseElements().iterator(); iter.hasNext();) { VerifyCMSSignatureResponseElement responseElement = (VerifyCMSSignatureResponseElement) iter.next(); |