From 6cb4a071eab9a3b8cf78b8ec7e407aa148f2d038 Mon Sep 17 00:00:00 2001 From: mcentner Date: Wed, 1 Jul 2009 13:03:41 +0000 Subject: Major refactoring of SMCC git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@381 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- smcc/src/test/java/at/gv/egiz/smcc/CardEmul.java | 106 +++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 smcc/src/test/java/at/gv/egiz/smcc/CardEmul.java (limited to 'smcc/src/test/java/at/gv/egiz/smcc/CardEmul.java') diff --git a/smcc/src/test/java/at/gv/egiz/smcc/CardEmul.java b/smcc/src/test/java/at/gv/egiz/smcc/CardEmul.java new file mode 100644 index 00000000..6017bcce --- /dev/null +++ b/smcc/src/test/java/at/gv/egiz/smcc/CardEmul.java @@ -0,0 +1,106 @@ +/* +* Copyright 2008 Federal Chancellery Austria and +* Graz University of Technology +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +package at.gv.egiz.smcc; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.smartcardio.Card; +import javax.smartcardio.CardChannel; +import javax.smartcardio.CardException; + + +@SuppressWarnings("restriction") +public abstract class CardEmul extends Card { + + protected Thread exclThread = null; + protected CardChannel channel = newCardChannel(this); + protected List applications = new ArrayList(); + + public CardEmul() { + super(); + } + + protected abstract CardChannelEmul newCardChannel(CardEmul cardEmul); + + @Override + public void beginExclusive() throws CardException { + + if (exclThread == Thread.currentThread()) { + throw new CardException("Exclusive access already assigned to current thread."); + } else if (exclThread != null) { + throw new CardException("Exclusive access already assigned to another thread."); + } + + exclThread = Thread.currentThread(); + + } + + @Override + public void endExclusive() throws CardException { + + if (exclThread == Thread.currentThread()) { + exclThread = null; + } else if (exclThread == null) { + throw new CardException("Exclusive access has not been assigned."); + } else { + throw new CardException("Exclusive access has not been assigned to current thread."); + } + + } + + @Override + public CardChannel getBasicChannel() { + return channel; + } + + @Override + public void disconnect(boolean reset) throws CardException { + if (reset) { + channel = newCardChannel(this); + } + } + + @Override + public CardChannel openLogicalChannel() throws CardException { + throw new CardException("Logical channels not supported."); + } + + @Override + public String getProtocol() { + return "T1"; + } + + @Override + public byte[] transmitControlCommand(int arg0, byte[] arg1) + throws CardException { + throw new CardException("transmitControlCommand() not supported."); + } + + public AbstractAppl getApplication(byte[] fid) { + + for(AbstractAppl appl : applications) { + if (Arrays.equals(appl.getAID(), fid) || Arrays.equals(appl.getFID(), fid)) { + return appl; + } + } + return null; + + } + +} \ No newline at end of file -- cgit v1.2.3 From 3da4655d011dfc2f04f9e4ac28b38aee42d01bc0 Mon Sep 17 00:00:00 2001 From: clemenso Date: Tue, 5 Jan 2010 10:06:47 +0000 Subject: Features [#437] Handle pinpad [64:03] response apdu correctly [#445] pin entry feedback for VERIFY_PIN_START/FINISH [#471] Provide SecureViewer Link before Pinpad PinEntry timeout starts Bugs [#479] PIN Managment Applet allows unmatching new pin and pin confirmation [#480] PIN Management displays blocked PINs as ACTIVE [#486] Not possible to select 3 times in series the same item from signedReferencesList for display in secureViewer [#506] change pin dialog (gui) issues [#508] e-card G3 PIN activation (with TransportPIN) not supported [#509] closing secure viewer window (WINDOW_CLOSING) leaves "signature data is displayed in viewer" dialog in applet git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@565 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- smcc/src/test/java/at/gv/egiz/smcc/CardEmul.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'smcc/src/test/java/at/gv/egiz/smcc/CardEmul.java') diff --git a/smcc/src/test/java/at/gv/egiz/smcc/CardEmul.java b/smcc/src/test/java/at/gv/egiz/smcc/CardEmul.java index 6017bcce..3dfc8510 100644 --- a/smcc/src/test/java/at/gv/egiz/smcc/CardEmul.java +++ b/smcc/src/test/java/at/gv/egiz/smcc/CardEmul.java @@ -28,15 +28,15 @@ import javax.smartcardio.CardException; @SuppressWarnings("restriction") public abstract class CardEmul extends Card { - protected Thread exclThread = null; - protected CardChannel channel = newCardChannel(this); + protected Thread exclThread; // = null; + protected CardChannel channel; // = newCardChannel(this); protected List applications = new ArrayList(); public CardEmul() { super(); } - protected abstract CardChannelEmul newCardChannel(CardEmul cardEmul); +// protected abstract CardChannelEmul newCardChannel(CardEmul cardEmul); @Override public void beginExclusive() throws CardException { @@ -71,9 +71,9 @@ public abstract class CardEmul extends Card { @Override public void disconnect(boolean reset) throws CardException { - if (reset) { - channel = newCardChannel(this); - } +// if (reset) { +// channel = newCardChannel(this); +// } } @Override @@ -93,7 +93,7 @@ public abstract class CardEmul extends Card { } public AbstractAppl getApplication(byte[] fid) { - + for(AbstractAppl appl : applications) { if (Arrays.equals(appl.getAID(), fid) || Arrays.equals(appl.getFID(), fid)) { return appl; -- cgit v1.2.3