aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2014-07-14 13:04:58 +0200
committerAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2014-07-14 13:04:58 +0200
commit81fe4613b2e26d6bb04893a9160d21225c072b33 (patch)
treec054902b24ff00bfedfbd7fff992335cc108fbd2
parentbccb1f7c2595611eeaa66b4a85dc0529bcb2522f (diff)
downloadpdf-as-4-81fe4613b2e26d6bb04893a9160d21225c072b33.tar.gz
pdf-as-4-81fe4613b2e26d6bb04893a9160d21225c072b33.tar.bz2
pdf-as-4-81fe4613b2e26d6bb04893a9160d21225c072b33.zip
Changed API iaik Certificate to Java Certificate
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/verify/VerifyResult.java2
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java2
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/sl/util/ISignatureConnectorSLWrapper.java2
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/sl/util/MOAConnector.java2
-rw-r--r--pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/VerifyServlet.java2
5 files changed, 5 insertions, 5 deletions
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/verify/VerifyResult.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/verify/VerifyResult.java
index 40e82c91..4b636db0 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/verify/VerifyResult.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/verify/VerifyResult.java
@@ -23,7 +23,7 @@
******************************************************************************/
package at.gv.egiz.pdfas.lib.api.verify;
-import iaik.x509.X509Certificate;
+import java.security.cert.X509Certificate;
import at.gv.egiz.pdfas.common.exceptions.PdfAsException;
public interface VerifyResult {
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java
index 7815717e..0c2d8fbf 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/PdfAsImpl.java
@@ -437,7 +437,7 @@ public class PdfAsImpl implements PdfAs, IConfigurationConstants {
RequestedSignature requestedSignature = request.getStatus().getRequestedSignature();
if(!StreamUtils.dataCompare(requestedSignature.getCertificate().getFingerprintSHA(),
- verifyResult.getSignerCertificate().getFingerprintSHA())) {
+ ((X509Certificate)verifyResult.getSignerCertificate()).getFingerprintSHA())) {
throw new PdfAsSignatureException("Certificates missmatch!");
}
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/ISignatureConnectorSLWrapper.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/ISignatureConnectorSLWrapper.java
index 077f2f9b..82dc0602 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/ISignatureConnectorSLWrapper.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/ISignatureConnectorSLWrapper.java
@@ -93,7 +93,7 @@ public class ISignatureConnectorSLWrapper implements ISignatureConnector {
VerifyResult verifyResult = SignatureUtils.verifySignature(response.getCMSSignature(), input);
if(!StreamUtils.dataCompare(requestedSignature.getCertificate().getFingerprintSHA(),
- verifyResult.getSignerCertificate().getFingerprintSHA())) {
+ ((X509Certificate)verifyResult.getSignerCertificate()).getFingerprintSHA())) {
throw new PdfAsSignatureException("Certificates missmatch!");
}
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/MOAConnector.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/MOAConnector.java
index 1059dba1..70b40876 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/MOAConnector.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/util/MOAConnector.java
@@ -231,7 +231,7 @@ public class MOAConnector implements ISignatureConnector {
VerifyResult verifyResult = SignatureUtils.verifySignature(cmsSignatureData, input);
if(!StreamUtils.dataCompare(requestedSignature.getCertificate().getFingerprintSHA(),
- verifyResult.getSignerCertificate().getFingerprintSHA())) {
+ ((X509Certificate)verifyResult.getSignerCertificate()).getFingerprintSHA())) {
throw new PdfAsSignatureException("Certificates missmatch!");
}
diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/VerifyServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/VerifyServlet.java
index aa93f7c9..e9d1f246 100644
--- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/VerifyServlet.java
+++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/VerifyServlet.java
@@ -294,7 +294,7 @@ public class VerifyServlet extends HttpServlet {
Exception e = result.getVerificationException();
- X509Certificate cert = result.getSignerCertificate();
+ X509Certificate cert = (X509Certificate)result.getSignerCertificate();
sb.append("<td>" + cert.getSubjectDN().getName() + "</td>");
sb.append("<td>" + certCode + "</td>");