smartcards: add Smargo smartreader+ support

diff --git a/examples/cardslot.conf.example b/examples/cardslot.conf.example
index b3d2fcf9d784ac0b5fff28f02a3374e3feb299ee..163b3aa2e9a49b0484f5356734b7685a6525c91f 100644 (file)
--- a/examples/cardslot.conf.example
+++ b/examples/cardslot.conf.example
@@ -12,6 +12,21 @@
 serial:/dev/ttyS0:0:0
 serial:/dev/ttyS1:1:0:3579545
 
+; cardslot with Smargo Smartreader+ on serial port
+;
+; srplus:dev:[clock]
+;
+; dev   - serial device e.g. /dev/ttyS0
+; clock - clock frequency in Hz. Defaults to 3571200 Hz
+;
+; The clock frequency is automatically configured according to ISO 7816-3. It
+; is possible to override the clock frequency via parameter for overclocking,
+; however don't do this unless you know exactly what you're doing - you may
+; possibly fry your smartcard!
+;
+srplus:/dev/ttyS0
+srplus:/dev/ttyS1:6000000
+
 ; emulated smartcard on dummy port. For testing/debugging purpose only!
 ; The emulation code has to be enabled with the CARD_EMU define im smartcard.c
 ;

diff --git a/sc.c b/sc.c
index a3f61f46b686d958a0b1174b252466f8012532be..21152cfdd8777d1e4bad34dbd0e5ad7332ccefc0 100644 (file)
--- a/sc.c
+++ b/sc.c
@@ -78,7 +78,7 @@
 #endif
 
 // SC API version number for loading shared libraries
-#define SCAPIVERS 22
+#define SCAPIVERS 23
 
 static cPlugin *ScPlugin;
 static cOpts *ScOpts, *LogOpts;

diff --git a/smartcard.c b/smartcard.c
index 45418db6465ee2cb72ce06b718148b479ccbf39f..ddf9181efc1384bd8dca3557fd9f4bf441607fa2 100644 (file)
--- a/smartcard.c
+++ b/smartcard.c
@@ -402,12 +402,16 @@ int cSmartCardSlot::RawWrite(const unsigned char *data, int len)
 bool cSmartCardSlot::ParseAtr(void)
 {
   // default values
-  atr.histLen=0; atr.T=0; atr.F=372; atr.D=1.0; atr.N=0; atr.WI=10;
+  atr.histLen=0; atr.T=0; atr.F=372; atr.fs=clock; atr.D=1.0; atr.N=0; atr.WI=10;
   atr.BWI=4; atr.CWI=0; atr.Tspec=-1;
 
   static const int Ftable[16] = {
     372,372,558,744,1116,1488,1860,0,0,512,768,1024,1536,2048,0,0
     };
+  static const int fstable[16] = {
+    3571200,5000000,6000000, 8000000,12000000,16000000,20000000,0,
+          0,5000000,7500000,10000000,15000000,20000000,       0,0
+    };
   static const float Dtable[16] = {
     0.0,1.0,2.0,4.0,8.0,16.0,0.0,0.0,
     0.0,0.0,0.5,0.25,0.125,0.0625,0.03125,0.015625
@@ -423,6 +427,10 @@ bool cSmartCardSlot::ParseAtr(void)
     PRINTF(L_CORE_SC,"%d: direct convention detected",slotnum);
     atr.convention=SM_DIRECT;
     }
+  else if(rawatr[0]==0x3F) {
+    PRINTF(L_CORE_SC,"%d: inverted indirect convention detected",slotnum);
+    atr.convention=SM_INDIRECT_INV;
+    }
   else {
     PRINTF(L_CORE_SC,"%d: byte mode not supported 0x%02x",slotnum,rawatr[0]);
     return false;
@@ -439,9 +447,10 @@ bool cSmartCardSlot::ParseAtr(void)
       LBPUT("TA%d=%02x ",i,rawatr[len]);
       if(i==1) {
         atr.TA1=rawatr[len];
-        atr.F=Ftable[(rawatr[len]>>4)&0x0F];
-        atr.D=Dtable[ rawatr[len]    &0x0F];
-        LBPUT("F=%d D=%f ",atr.F,atr.D);
+        int i=(rawatr[len]>>4)&0x0F;
+        atr.F=Ftable[i]; atr.fs=fstable[i];
+        atr.D=Dtable[rawatr[len]&0x0F];
+        LBPUT("F=%d fs=%.4f D=%f ",atr.F,atr.fs/1000000.0,atr.D);
         }
       else if(i==2) {
         atr.Tspec=rawatr[len]&0x0F;
@@ -638,13 +647,17 @@ bool cSmartCardSlots::ParseLinePlain(const char *line)
 
 class cSmartCardSlotSerial : public cSmartCardSlot {
 private:
+  int statInv, invRST;
+  //
+  speed_t FindBaud(int baud);
+protected:
   char devName[256];
   int fd;
-  int currMode, statInv, invRST;
+  int currMode;
   //
   void Flush(void);
-  speed_t FindBaud(int baud);
-protected:
+  void SetDtrRts(void);
+  //
   virtual bool DeviceOpen(const char *cfg);
   virtual void DeviceClose(void);
   virtual bool DeviceSetMode(int mode, int baud);
@@ -673,10 +686,7 @@ bool cSmartCardSlotSerial::DeviceOpen(const char *cfg)
     PRINTF(L_CORE_SERIAL,"%s: open serial port",devName);
     fd=open(devName,O_RDWR|O_NONBLOCK|O_NOCTTY);
     if(fd>=0) {
-      PRINTF(L_CORE_SERIAL,"%s: set DTR/RTS",devName);
-      unsigned int modembits;
-      modembits=TIOCM_DTR; CHECK(ioctl(fd, TIOCMBIS, &modembits));
-      modembits=TIOCM_RTS; CHECK(ioctl(fd, invRST?TIOCMBIS:TIOCMBIC, &modembits));
+      SetDtrRts();
       PRINTF(L_CORE_SERIAL,"%s: init done",devName);
       PRINTF(L_CORE_LOAD,"cardslot: added serial port %s as port %d (%s CD, %s RESET, CLOCK %d)",
                 devName,slotnum,invCD?"inverse":"normal",invRST?"inverse":"normal",clock);
@@ -688,6 +698,14 @@ bool cSmartCardSlotSerial::DeviceOpen(const char *cfg)
   return false;
 }
 
+void cSmartCardSlotSerial::SetDtrRts(void)
+{
+  PRINTF(L_CORE_SERIAL,"%s: set DTR/RTS",devName);
+  unsigned int modembits;
+  modembits=TIOCM_DTR; CHECK(ioctl(fd, TIOCMBIS, &modembits));
+  modembits=TIOCM_RTS; CHECK(ioctl(fd, invRST?TIOCMBIS:TIOCMBIC, &modembits));
+}
+
 void cSmartCardSlotSerial::DeviceClose(void)
 {
   if(fd>=0) {
@@ -931,10 +949,118 @@ bool cSmartCardSlotSerial::DeviceIsInserted(void)
   return !(status & TIOCM_CAR);
 }
 
-#ifdef CARD_EMU
+// -- cSmartCardSlotSRPlus -----------------------------------------------------
+
+class cSmartCardSlotSRPlus : public cSmartCardSlotSerial {
+private:
+  bool SRConfig(int F, float D, int fs, int N, int T, int inv);
+protected:
+  virtual bool DeviceOpen(const char *cfg);
+  virtual bool DeviceSetMode(int mode, int baud);
+  virtual bool DevicePTS(void);
+public:
+  cSmartCardSlotSRPlus(void);
+  };
+
+static cSmartCardSlotLinkReg<cSmartCardSlotSRPlus> __scs_srplus("srplus");
+
+cSmartCardSlotSRPlus::cSmartCardSlotSRPlus(void)
+{
+  localecho=false;
+}
+
+bool cSmartCardSlotSRPlus::DeviceOpen(const char *cfg)
+{
+  if(sscanf(cfg,"%255[^:]:%d",devName,&clock)>=1) {
+    if(clock==0) clock=ISO_FREQ;
+    PRINTF(L_CORE_SERIAL,"%s: open serial port",devName);
+    fd=open(devName,O_RDWR|O_NONBLOCK|O_NOCTTY);
+    if(fd>=0) {
+      SetDtrRts();
+      PRINTF(L_CORE_SERIAL,"%s: init done",devName);
+      PRINTF(L_CORE_LOAD,"cardslot: added smartreader+ port %s as port %d (CLOCK %d)",
+                devName,slotnum,clock);
+      return true;
+      }
+    else PRINTF(L_GEN_ERROR,"%s: open failed: %s",devName,strerror(errno));
+    }
+  else PRINTF(L_GEN_ERROR,"bad parameter for cardslot type 'srplus'");
+  return false;
+}
+
+bool cSmartCardSlotSRPlus::DeviceSetMode(int mode, int baud)
+{
+  // Configure SmartReader+ with initial settings, ref ISO 7816 3.1.
+  return baud==ISO_BAUD &&
+         cSmartCardSlotSerial::DeviceSetMode(mode,ISO_BAUD) &&
+         SRConfig(372,0.0,clock,0,0,0);
+}
+
+bool cSmartCardSlotSRPlus::DevicePTS(void)
+{
+  // Configure SmartReader+ with work settings, ref ISO 7816 3.1.
+  int inv=0;
+  if(atr.convention==SM_INDIRECT) atr.convention=SM_INDIRECT_INV;
+  if(atr.convention==SM_INDIRECT_INV) inv=1;
+  // Use ISO work clock frequency unless a fixed frequency is specified.
+  int cl=(clock==ISO_FREQ) ? atr.fs:clock;
+  if(!SRConfig(atr.F,atr.D,cl,atr.N,atr.T,inv)) return false;
+  PRINTF(L_CORE_SERIAL,"%s: SmartReader+ mode %.4f MHz",devName,cl/1000000.0);
+  return true;
+}
+
+bool cSmartCardSlotSRPlus::SRConfig(int F, float D, int fs, int N, int T, int inv)
+{
+  fs/=1000; // convert to kHz.
+  PRINTF(L_CORE_SERIAL,"%s: SR+ options F=%d D=%f fs=%d N=%d T=%d inv=%d",devName,F,D,fs,N,T,inv);
+  // Set SmartReader+ in CMD mode.
+  struct termios term;
+  if(tcgetattr(fd,&term)==-1) {
+    PRINTF(L_GEN_ERROR,"%s: tcgetattr failed: %s",devName,strerror(errno));
+    return false;
+    }
+  term.c_cflag&=~CSIZE;
+  term.c_cflag|=CS5;
+  if(tcsetattr(fd,TCSADRAIN,&term)==-1) {
+    PRINTF(L_GEN_ERROR,"%s: tcsetattr failed: %s",devName,strerror(errno));
+    return false;
+    }
+  // Write SmartReader+ configuration commands.
+  unsigned char cmd[16];
+  //XXX how is (int)D supposed to work for fractional values e.g. 0.125 ??
+  cmd[0]=1; cmd[1]=F>>8; cmd[2]=F; cmd[3]=(int)D;
+  if(DeviceWrite(cmd,4)!=4) return false;
+  cmd[0]=2; cmd[1]=fs>>8; cmd[2]=fs;
+  if(DeviceWrite(cmd,3)!=3) return false;
+  cmd[0]=3; cmd[1]=N;
+  if(DeviceWrite(cmd,2)!=2) return false;
+  cmd[0]=4; cmd[1]=T;
+  if(DeviceWrite(cmd,2)!=2) return false;
+  cmd[0]=5; cmd[1]=inv;
+  if(DeviceWrite(cmd,2)!=2) return false;
+  // Send zero bits for 0.25 - 0.5 seconds.
+  if(tcsendbreak(fd,0)==-1) {
+    PRINTF(L_GEN_ERROR,"%s: tcsendbreak failed: %s",devName,strerror(errno));
+    return false;
+    }
+  // We're entering SmartReader+ mode; speed up serial communication.
+  // B3000000 is the highest setting that sticks.
+  cfsetispeed(&term,B3000000);
+  cfsetospeed(&term,B3000000);
+  // Set SmartReader+ in DATA mode.
+  term.c_cflag&=~CSIZE;
+  term.c_cflag|=CS8;
+  if(tcsetattr(fd,TCSADRAIN,&term)==-1) {
+    PRINTF(L_GEN_ERROR,"%s: tcsetattr failed: %s",devName,strerror(errno));
+    return false;
+    }
+  return true;
+}
 
 // -- cSmartCardSlotEmuGeneric -------------------------------------------------
 
+#ifdef CARD_EMU
+
 #define PUSH(mem,len) { memcpy(devBuff+buffCount,(mem),(len)); buffCount+=(len); }
 #define PUSHB(b)      { devBuff[buffCount++]=(b); }
 

diff --git a/smartcard.h b/smartcard.h
index eac4ae15b8a819eb9b3b237d35b361363f8a2679..28ce5bb9ae2050fb3204f7c50937e2356f76352c 100644 (file)
--- a/smartcard.h
+++ b/smartcard.h
@@ -82,8 +82,9 @@ public:
 #define SM_MASK 0x1F
 #define SM_1SB  0x80
 
-#define SM_DIRECT   0
-#define SM_INDIRECT 1
+#define SM_DIRECT       0
+#define SM_INDIRECT     1
+#define SM_INDIRECT_INV 2
 
 struct CardConfig {
   int SerMode;
@@ -97,7 +98,7 @@ struct StatusMsg {
   };
 
 struct Atr {
-  int T, F, N, WI, BWI, CWI, TA1, Tspec;
+  int T, F, fs, N, WI, BWI, CWI, TA1, Tspec;
   float D;
   int wwt, bwt;
   int atrLen, histLen;