aboutsummaryrefslogtreecommitdiff
path: root/signature-standards/sigs-pades/src
diff options
context:
space:
mode:
authorAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2014-10-23 10:50:56 +0200
committerAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2014-10-23 10:50:56 +0200
commit6e61c8588d48efe1a2720d98db74beb61382a49e (patch)
tree8a1341622733e04448e513571fd61d5a51c0a27b /signature-standards/sigs-pades/src
parentcd16e78a59ba4e8cecb2396cbc8d098be896d65b (diff)
downloadpdf-as-4-6e61c8588d48efe1a2720d98db74beb61382a49e.tar.gz
pdf-as-4-6e61c8588d48efe1a2720d98db74beb61382a49e.tar.bz2
pdf-as-4-6e61c8588d48efe1a2720d98db74beb61382a49e.zip
KeyStore Constructors added
Diffstat (limited to 'signature-standards/sigs-pades/src')
-rw-r--r--signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESSignerKeystore.java111
1 files changed, 79 insertions, 32 deletions
diff --git a/signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESSignerKeystore.java b/signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESSignerKeystore.java
index a3240450..f49e54a0 100644
--- a/signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESSignerKeystore.java
+++ b/signature-standards/sigs-pades/src/main/java/at/gv/egiz/pdfas/sigs/pades/PAdESSignerKeystore.java
@@ -49,6 +49,7 @@ import java.security.KeyStore.PrivateKeyEntry;
import java.security.NoSuchAlgorithmException;
import java.security.PrivateKey;
import java.security.cert.Certificate;
+import java.security.cert.CertificateEncodingException;
import java.security.cert.CertificateException;
import java.util.ArrayList;
import java.util.Date;
@@ -57,6 +58,7 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import at.gv.egiz.pdfas.common.exceptions.PDFASError;
import at.gv.egiz.pdfas.common.exceptions.PdfAsException;
import at.gv.egiz.pdfas.common.exceptions.PdfAsSignatureException;
import at.gv.egiz.pdfas.lib.api.sign.IPlainSigner;
@@ -74,36 +76,7 @@ public class PAdESSignerKeystore implements IPlainSigner, PAdESConstants {
PrivateKey privKey;
X509Certificate cert;
- private void loadKeystore(String file, String alias, String kspassword,
- String keypassword, String type, String provider) throws Throwable {
-
- String viusalProvider = (provider == null ? "IAIK" : provider);
- logger.info("Opening Keystore: " + file + " with [" + viusalProvider
- + "]");
-
- KeyStore ks = null;
- if (provider == null) {
- ks = KeyStore.getInstance(type);
- } else {
- ks = KeyStore.getInstance(type, provider);
- }
-
- if (ks == null) {
- throw new PdfAsException("error.pdf.sig.14");
- }
- if (kspassword == null) {
- throw new PdfAsException("error.pdf.sig.15");
- }
- FileInputStream is = null;
- try {
- is = new FileInputStream(file);
- ks.load(is, kspassword.toCharArray());
- } finally {
- if (is != null) {
- is.close();
- }
- }
-
+ private void readKeyStore(KeyStore ks, String alias, String keypassword) throws Throwable {
if (keypassword == null) {
throw new PdfAsException("error.pdf.sig.16");
}
@@ -142,9 +115,57 @@ public class PAdESSignerKeystore implements IPlainSigner, PAdESConstants {
cert = new X509Certificate(c.getEncoded());
}
+
+ private KeyStore buildKeyStoreFromFile(String file, String kspassword,
+ String type, String provider) throws Throwable {
+ String viusalProvider = (provider == null ? "IAIK" : provider);
+ logger.info("Opening Keystore: " + file + " with [" + viusalProvider
+ + "]");
+ KeyStore ks = null;
+ if (provider == null) {
+ ks = KeyStore.getInstance(type);
+ } else {
+ ks = KeyStore.getInstance(type, provider);
+ }
+
+ if (ks == null) {
+ throw new PdfAsException("error.pdf.sig.14");
+ }
+ if (kspassword == null) {
+ throw new PdfAsException("error.pdf.sig.15");
+ }
+ FileInputStream is = null;
+ try {
+ is = new FileInputStream(file);
+ ks.load(is, kspassword.toCharArray());
+ } finally {
+ if (is != null) {
+ is.close();
+ }
+ }
+ return ks;
+ }
+
+ private void loadKeystore(String file, String alias, String kspassword,
+ String keypassword, String type, String provider) throws Throwable {
+
+ KeyStore ks = buildKeyStoreFromFile(file, kspassword, type, provider);
+
+ readKeyStore(ks, alias, keypassword);
+ }
+
+ public PAdESSignerKeystore(KeyStore ks, String alias,
+ String keypassword) throws PDFASError {
+ try {
+ readKeyStore(ks, alias, keypassword);
+ } catch (Throwable e) {
+ throw new PDFASError(PDFASError.ERROR_SIG_FAILED_OPEN_KS, e);
+ }
+ }
+
public PAdESSignerKeystore(String file, String alias, String kspassword,
- String keypassword, String type) throws PdfAsException {
+ String keypassword, String type) throws PDFASError {
try {
// Load keystore with default security provider (IAIK)
loadKeystore(file, alias, kspassword, keypassword, type, null);
@@ -158,9 +179,35 @@ public class PAdESSignerKeystore implements IPlainSigner, PAdESConstants {
logger.error("Keystore IAIK provider error: ", e);
logger.error("Keystore " + fallBackProvider
+ " provider error: ", e1);
- throw new PdfAsException("error.pdf.sig.02", e1);
+ throw new PDFASError(PDFASError.ERROR_SIG_FAILED_OPEN_KS, e1);
+ }
+ }
+ }
+
+ public PAdESSignerKeystore(PrivateKey privKey, java.security.cert.Certificate cert) throws PDFASError {
+ if(cert == null) {
+ logger.error("PAdESSignerKeystore provided certificate is NULL");
+ throw new NullPointerException();
+ }
+
+ if(privKey == null) {
+ logger.error("PAdESSignerKeystore provided private Key is NULL");
+ throw new NullPointerException();
+ }
+
+ if(cert instanceof X509Certificate) {
+ this.cert = (X509Certificate)cert;
+ } else {
+ try {
+ this.cert = new X509Certificate(cert.getEncoded());
+ } catch (CertificateEncodingException e) {
+ throw new PDFASError(PDFASError.ERROR_INVALID_CERTIFICATE, e);
+ } catch (CertificateException e) {
+ throw new PDFASError(PDFASError.ERROR_INVALID_CERTIFICATE, e);
}
}
+
+ this.privKey = privKey;
}
public X509Certificate getCertificate(SignParameter parameter) {