From f8db5af9c94285c4946bdf38407fe15ed1b7f818 Mon Sep 17 00:00:00 2001 From: tkellner Date: Mon, 2 Apr 2012 16:38:59 +0000 Subject: * Save certificates to local file system * Show cardreader and smartcard information for Webstart and Applet version git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1042 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java | 6 ++++++ smcc/src/main/java/at/gv/egiz/smcc/SWCard.java | 4 ++++ smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java | 2 ++ 3 files changed, 12 insertions(+) (limited to 'smcc') diff --git a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java index 0104cdb3..deed447d 100644 --- a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java +++ b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java @@ -43,6 +43,7 @@ public abstract class AbstractSignatureCard implements SignatureCard { protected Locale locale = Locale.getDefault(); private Card card_; + private String cardterminalname; protected CardReader reader; @@ -67,6 +68,7 @@ public abstract class AbstractSignatureCard implements SignatureCard { public void init(Card card, CardTerminal cardTerminal) { this.card_ = card; this.reader = ReaderFactory.getReader(card, cardTerminal); + this.cardterminalname = cardTerminal.getName(); } @Override @@ -74,6 +76,10 @@ public abstract class AbstractSignatureCard implements SignatureCard { return card_; } + public String getTerminalName() { + return(cardterminalname); + } + protected CardChannel getCardChannel() { if(card_.getProtocol().equalsIgnoreCase("T=0")) { diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java b/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java index 33f4019b..7150c8b4 100644 --- a/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java +++ b/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java @@ -121,6 +121,10 @@ public class SWCard implements SignatureCard { return null; } + public String getTerminalName() { + return null; + } + private String getFileName(String fileName) { String fs = System.getProperty("file.separator"); return swCardDir + fs + fileName; diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java index 56ae7b74..b3cbaec8 100644 --- a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java +++ b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java @@ -85,6 +85,8 @@ public interface SignatureCard { public Card getCard(); + public String getTerminalName(); + public byte[] getCertificate(KeyboxName keyboxName, PINGUI pinGUI) throws SignatureCardException, InterruptedException; -- cgit v1.2.3