summaryrefslogtreecommitdiff
path: root/smcc/src/main
diff options
context:
space:
mode:
authorclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2009-07-13 13:12:35 +0000
committerclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2009-07-13 13:12:35 +0000
commit3913af8cffc38b821bc1be428f62fccbd482a814 (patch)
treef857ff9d37a71e9bd6afbdd9004797263ae058cb /smcc/src/main
parentd3f2f0b0061e1389a3d4d71468314766c446ab20 (diff)
downloadmocca-3913af8cffc38b821bc1be428f62fccbd482a814.tar.gz
mocca-3913af8cffc38b821bc1be428f62fccbd482a814.tar.bz2
mocca-3913af8cffc38b821bc1be428f62fccbd482a814.zip
Gemalto GemPC (== Gemplus GemPC)
wLangId, bNumberMessage git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@409 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'smcc/src/main')
-rw-r--r--smcc/src/main/java/at/gv/egiz/smcc/ccid/DefaultReader.java12
-rw-r--r--smcc/src/main/java/at/gv/egiz/smcc/ccid/ReaderFactory.java2
2 files changed, 7 insertions, 7 deletions
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ccid/DefaultReader.java b/smcc/src/main/java/at/gv/egiz/smcc/ccid/DefaultReader.java
index 682390e3..2004db45 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/ccid/DefaultReader.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/ccid/DefaultReader.java
@@ -467,8 +467,8 @@ public class DefaultReader implements CCID {
s.write(getbEntryValidationCondition());
// bNumberMessage
s.write(0x02);
- // wLangId
- s.write(0x0C);
+ // wLangId English (United States), see http://www.usb.org/developers/docs/USB_LANGIDs.pdf
+ s.write(0x09);
s.write(0x04);
// bMsgIndex1
s.write(0x01);
@@ -530,8 +530,8 @@ public class DefaultReader implements CCID {
s.write(getbEntryValidationCondition());
// bNumberMessage
s.write(0x03);
- // wLangId
- s.write(0x0C);
+ // wLangId English (United States), see http://www.usb.org/developers/docs/USB_LANGIDs.pdf
+ s.write(0x09);
s.write(0x04);
// bMsgIndex1
s.write(0x00);
@@ -586,9 +586,9 @@ public class DefaultReader implements CCID {
// bEntryValidationCondition
s.write(getbEntryValidationCondition());
// bNumberMessage
- s.write(0xFF);
+ s.write(0x01);
// wLangId
- s.write(0x0C);
+ s.write(0x09);
s.write(0x04);
// bMsgIndex
s.write(0x00);
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ccid/ReaderFactory.java b/smcc/src/main/java/at/gv/egiz/smcc/ccid/ReaderFactory.java
index 5b94de05..e0625a53 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/ccid/ReaderFactory.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/ccid/ReaderFactory.java
@@ -62,7 +62,7 @@ public class ReaderFactory {
//old: REINER SCT CyberJack 00 00
//new (CCID): 0C4B/0300 Reiner-SCT cyberJack pinpad(a) 00 00
//display: REINER SCT CyberJack 00 00
- if(name.startsWith("gemplus gempc pinpad")) {
+ if(name.startsWith("gemplus gempc pinpad") || name.startsWith("gemalto gempc pinpad")) {
reader = new GemplusGemPCPinpad(icc, ct);
} else if (name.startsWith("omnikey cardman 3621")) {
reader = new OMNIKEYCardMan3621(icc, ct);