smartcard 0.4.11 → 0.5.0

data/test/pcsc/card_test.rb

@@ -0,0 +1,68 @@
+# Author:: Victor Costan
+# Copyright:: Copyright (C) 2008 Massachusetts Institute of Technology
+# License:: MIT
+
+require 'smartcard'
+
+require 'test/unit'
+
+
+class CardTest < Test::Unit::TestCase
+  def setup
+    @context = Smartcard::PCSC::Context.new
+    @reader = @context.readers.first
+    @card = @context.card @reader, :shared
+  end
+  
+  def teardown
+    @card.disconnect    
+    @context.release    
+  end
+  
+  def test_reconnect
+    @card.reconnect :shared
+  end
+  
+  def test_transaction
+    @card.begin_transaction
+    @card.end_transaction
+    
+    @card.transaction { }
+  end
+  
+  def test_transmit
+    response = @card.transmit [0x00, 0xA4, 0x04, 0x00, 0x00].pack('C*')
+    assert_equal [0x90, 0x00], response[-2, 2].unpack('C*'),
+                 'In transmit: SELECT with no AID should always return OK'    
+  end
+  
+  def test_info
+    info = @card.info
+    assert_operator info[:atr], :kind_of?, String,
+                    "The card's ATR should be a string"
+    assert_operator info[:readers], :include?, @reader,
+                    "The card's readers list should have the canonical reader"
+    assert_operator info[:protocol], :kind_of?, Symbol, "The card's protocol"    
+    assert_operator info[:state], :include?, :present,
+                    "The card's state should reflect the card's presence"
+  end
+  
+  def test_get_attribute
+    vendor_name = @card[:vendor_name]
+    assert_operator vendor_name, :kind_of?, String,
+                    'IFD attributes should be strings'        
+  end
+  
+  def test_set_attribute
+    assert_raise Smartcard::PCSC::Exception do
+      @card[:atr_string] = "\0"
+    end
+  end
+  
+  def test_control
+    # This only works with GemPlus readers... any other suggestions?
+    assert_raise(Smartcard::PCSC::Exception, 'Control sequence') do
+      ctl_response = @card.control 0x42000001, [0x02].pack('C*')
+    end
+  end
+end

data/test/pcsc/context_test.rb

@@ -0,0 +1,64 @@
+# Author:: Victor Costan
+# Copyright:: Copyright (C) 2008 Massachusetts Institute of Technology
+# License:: MIT
+
+require 'smartcard'
+
+require 'test/unit'
+
+
+class ContextTest < Test::Unit::TestCase
+  def setup
+    @context = Smartcard::PCSC::Context.new :system
+  end
+  
+  def teardown
+    @context.release    
+  end
+
+  def test_reader_groups
+    groups = @context.reader_groups
+    assert_operator groups, :kind_of?, Enumerable,
+                    'reader_groups should produce an array'
+    assert_operator groups.length, :>=, 1, 'reader_groups should be non-empty'    
+  end
+  
+  def test_readers_without_groups
+    readers = @context.readers
+    _check_readers readers
+  end
+  
+  def test_readers_with_groups
+    readers = @context.readers @context.reader_groups
+    _check_readers readers
+  end
+  
+  def _check_readers(readers)
+    assert_operator readers, :kind_of?, Enumerable,
+                    'readers (without argument) should produce an array'
+    readers.each do |reader|
+      assert_operator reader, :kind_of?, String,
+                      'each reader name should be a string'
+    end    
+  end
+  
+  def test_wait_for_status_change
+    readers = @context.readers
+    queries = Smartcard::PCSC::ReaderStateQueries.new readers.length
+    readers.each_with_index do |name, index|
+      queries[index].reader_name = name
+      queries[index].current_state = :unknown
+    end
+    
+    @context.wait_for_status_change queries
+  
+    readers.each_with_index do |name, index|
+      query = queries[index]
+      assert_equal name, query.reader_name,
+                   'Reader name changed during wait_for_status_change'
+      assert_operator query.atr, :kind_of?, String, 'ATR should be a string'
+      assert_operator query.event_state, :include?, :changed,
+                      'event_state must have changed from :unknown'
+    end
+  end
+end

data/test/pcsc/reader_state_queries_test.rb

@@ -0,0 +1,72 @@
+# Author:: Victor Costan
+# Copyright:: Copyright (C) 2008 Massachusetts Institute of Technology
+# License:: MIT
+
+require 'smartcard'
+
+require 'test/unit'
+
+
+class ReaderStatesTest < Test::Unit::TestCase
+  def setup
+    @queries = Smartcard::PCSC::ReaderStateQueries.new 2
+
+    @queries[1].current_state = :atrmatch
+    @queries[0].current_state = [:inuse, :exclusive]
+    @queries[0].event_state = :ignore
+    @queries[1].event_state = [:present, :unpowered]
+    @queries[1].atr = "Ruby\0rocks!"
+    @queries[0].atr = 'grreat success'
+    @queries[0].reader_name = 'PC/SC Reader 0'
+    @queries[1].reader_name = 'CCID Reader 1'
+  end
+  
+  def teardown
+  end
+
+  def test_length
+    assert_equal 2, @queries.length
+  end
+
+  def test_atr
+    assert_equal "Ruby\0rocks!", @queries[1].atr
+    assert_equal 'grreat success', @queries[0].atr     
+  end
+  
+  def test_atr_reassign
+    @queries[1].atr = 'even more success'
+    assert_equal 'even more success', @queries[1].atr
+  end
+  
+  def test_states
+    assert_equal Set.new([:atrmatch]), @queries[1].current_state,
+                 'current_state'
+    assert_equal Set.new([:inuse, :exclusive]), @queries[0].current_state,
+                 'current_state'
+
+    assert_equal Set.new([:ignore]), @queries[0].event_state,
+                 'event_state'
+    assert_equal Set.new([:present, :unpowered]), @queries[1].event_state,
+                 'event_state'
+  end
+  
+  def test_reader_names
+    assert_equal 'PC/SC Reader 0', @queries[0].reader_name
+    assert_equal 'CCID Reader 1', @queries[1].reader_name
+  end
+  
+  def test_ack_changes
+    @queries.ack_changes
+    
+    assert_equal Set.new([:ignore]), @queries[0].current_state
+    assert_equal Set.new([:present, :unpowered]), @queries[1].current_state
+  end
+  
+  def test_invalid_indexes    
+    [[5, IndexError], [2, IndexError], [nil, TypeError]].each do |test_case|
+      assert_raise test_case.last, test_case.inspect do
+        @queries[test_case.first]
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smartcard
 version: !ruby/object:Gem::Version 
-  version: 0.4.11
+  version: 0.5.0
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,9 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 -05:00
+date: 2009-11-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: ffi
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.3
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rubyzip
   type: :runtime
@@ -56,26 +66,13 @@ description: Interface with ISO 7816 smart cards.
 email: victor@costan.us
 executables: []
 
-extensions: 
-- ext/smartcard_pcsc/extconf.rb
+extensions: []
+
 extra_rdoc_files: 
 - BUILD
 - CHANGELOG
 - LICENSE
 - README
-- ext/smartcard_pcsc/extconf.rb
-- ext/smartcard_pcsc/pcsc.h
-- ext/smartcard_pcsc/pcsc_card.c
-- ext/smartcard_pcsc/pcsc_constants.c
-- ext/smartcard_pcsc/pcsc_context.c
-- ext/smartcard_pcsc/pcsc_exception.c
-- ext/smartcard_pcsc/pcsc_io_request.c
-- ext/smartcard_pcsc/pcsc_main.c
-- ext/smartcard_pcsc/pcsc_multi_strings.c
-- ext/smartcard_pcsc/pcsc_namespace.c
-- ext/smartcard_pcsc/pcsc_reader_states.c
-- ext/smartcard_pcsc/pcsc_surrogate_reader.h
-- ext/smartcard_pcsc/pcsc_surrogate_wintypes.h
 - lib/smartcard.rb
 - lib/smartcard/gp/asn1_ber.rb
 - lib/smartcard/gp/cap_loader.rb
@@ -89,7 +86,15 @@ extra_rdoc_files:
 - lib/smartcard/iso/jcop_remote_transport.rb
 - lib/smartcard/iso/pcsc_transport.rb
 - lib/smartcard/iso/transport.rb
+- lib/smartcard/pcsc/card.rb
+- lib/smartcard/pcsc/context.rb
+- lib/smartcard/pcsc/ffi_autogen.rb
+- lib/smartcard/pcsc/ffi_functions.rb
+- lib/smartcard/pcsc/ffi_lib.rb
+- lib/smartcard/pcsc/ffi_structs.rb
 - lib/smartcard/pcsc/pcsc_exception.rb
+- lib/smartcard/pcsc/reader_state_queries.rb
+- tasks/ffi_codegen.rb
 files: 
 - BUILD
 - CHANGELOG
@@ -97,19 +102,6 @@ files:
 - Manifest
 - README
 - Rakefile
-- ext/smartcard_pcsc/extconf.rb
-- ext/smartcard_pcsc/pcsc.h
-- ext/smartcard_pcsc/pcsc_card.c
-- ext/smartcard_pcsc/pcsc_constants.c
-- ext/smartcard_pcsc/pcsc_context.c
-- ext/smartcard_pcsc/pcsc_exception.c
-- ext/smartcard_pcsc/pcsc_io_request.c
-- ext/smartcard_pcsc/pcsc_main.c
-- ext/smartcard_pcsc/pcsc_multi_strings.c
-- ext/smartcard_pcsc/pcsc_namespace.c
-- ext/smartcard_pcsc/pcsc_reader_states.c
-- ext/smartcard_pcsc/pcsc_surrogate_reader.h
-- ext/smartcard_pcsc/pcsc_surrogate_wintypes.h
 - lib/smartcard.rb
 - lib/smartcard/gp/asn1_ber.rb
 - lib/smartcard/gp/cap_loader.rb
@@ -123,7 +115,15 @@ files:
 - lib/smartcard/iso/jcop_remote_transport.rb
 - lib/smartcard/iso/pcsc_transport.rb
 - lib/smartcard/iso/transport.rb
+- lib/smartcard/pcsc/card.rb
+- lib/smartcard/pcsc/context.rb
+- lib/smartcard/pcsc/ffi_autogen.rb
+- lib/smartcard/pcsc/ffi_functions.rb
+- lib/smartcard/pcsc/ffi_lib.rb
+- lib/smartcard/pcsc/ffi_structs.rb
 - lib/smartcard/pcsc/pcsc_exception.rb
+- lib/smartcard/pcsc/reader_state_queries.rb
+- tasks/ffi_codegen.rb
 - test/gp/asn1_ber_test.rb
 - test/gp/cap_loader_test.rb
 - test/gp/des_test.rb
@@ -135,9 +135,9 @@ files:
 - test/iso/iso_card_mixin_test.rb
 - test/iso/iso_exception_test.rb
 - test/iso/jcop_remote_test.rb
-- test/pcsc/containers_test.rb
-- test/pcsc/smoke_test.rb
-- tests/ts_pcsc_ext.rb
+- test/pcsc/card_test.rb
+- test/pcsc/context_test.rb
+- test/pcsc/reader_state_queries_test.rb
 - smartcard.gemspec
 has_rdoc: true
 homepage: http://www.costan.us/smartcard
@@ -153,7 +153,6 @@ rdoc_options:
 - README
 require_paths: 
 - lib
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
@@ -174,14 +173,15 @@ signing_key:
 specification_version: 3
 summary: Interface with ISO 7816 smart cards.
 test_files: 
-- test/gp/asn1_ber_test.rb
-- test/gp/cap_loader_test.rb
-- test/gp/des_test.rb
-- test/gp/gp_card_mixin_compat_test.rb
-- test/gp/gp_card_mixin_test.rb
-- test/iso/auto_configurator_test.rb
 - test/iso/iso_card_mixin_test.rb
+- test/iso/auto_configurator_test.rb
 - test/iso/iso_exception_test.rb
 - test/iso/jcop_remote_test.rb
-- test/pcsc/containers_test.rb
-- test/pcsc/smoke_test.rb
+- test/pcsc/card_test.rb
+- test/pcsc/context_test.rb
+- test/pcsc/reader_state_queries_test.rb
+- test/gp/gp_card_mixin_test.rb
+- test/gp/gp_card_mixin_compat_test.rb
+- test/gp/cap_loader_test.rb
+- test/gp/asn1_ber_test.rb
+- test/gp/des_test.rb

data/ext/smartcard_pcsc/extconf.rb

@@ -1,79 +0,0 @@
-require 'mkmf'
-
-$CFLAGS ||= ''
-$LDFLAGS ||= ''
-
-pcsc_defines = []
-
-if RUBY_PLATFORM =~ /darwin/
-  $LDFLAGS += ' -framework PCSC'
-  darwin_version = `uname -r`
-  if darwin_version =~ /^8./
-    pcsc_defines.push 'RB_SMARTCARD_OSX_TIGER_HACK'
-  end
-elsif RUBY_PLATFORM =~ /win/
-  have_library('winscard')
-  unless have_library('winscard', 'SCardIsValidContext')
-  	pcsc_defines << 'PCSC_SURROGATE_SCARD_IS_VALID_CONTEXT'
-  end 
-else
-  # pcsclite is retarded and uses stuff like '#include <wintypes.h>'
-  $CFLAGS += ' -I /usr/include/PCSC -I /usr/local/include/PCSC'
-  have_library('pcsclite')
-end
-
-pcsc_headers = []
-['wintypes.h', 'reader.h', 'winscard.h', 'pcsclite.h'].each do |header|
-  ['', 'PCSC/', './pcsc_surrogate_'].each do |path_prefix|
-    if have_header(path_prefix + header)
-      pcsc_headers.push((path_prefix[0,1] == '.') ?
-                        "\"#{path_prefix + header}\"" :
-                        "<#{path_prefix + header}>")
-      break
-    end
-  end
-end
-
-File.open('pcsc_autogen.h', 'w') do |f|
-  pcsc_defines.each { |d| f.write "\#define #{d}\n" }
-  pcsc_headers.each { |h| f.write "\#include #{h}\n" }
-end
-
-if have_macro('SCARDHANDLE', ['pcsc_autogen.h']) or
-    have_type('SCARDHANDLE', ['pcsc_autogen.h'])
-  create_makefile('smartcard/pcsc')
-else
-  STDERR.write "PC/SC libraries missing!\n"
-end
-
-
-def win32_hack(mf_name)
-  # get the version of MSVC
-  Kernel.system `cl 2> msvc_version.txt`
-  msvc_logo = File.open('msvc_version.txt') { |f| f.read }
-  print msvc_logo
-  File.delete 'msvc_version.txt'
-  if msvc_logo =~ /Optimizing Compiler Version (\d+)/
-    msvc_ver = $1.to_i  
-    # for MSVC 6.0, no manifest BS is needed -- straight-up compilation is good
-    return if msvc_ver == 12
-  end
-    
-  # HACK: monkey-patch the makefile to embed a manifest in the extension dll
-  make_contents = File.open(mf_name, 'r') { |f| f.read }
-  make_rules = make_contents.split(/(\n|\r)(\n|\r)+/)
-  new_make_rules = make_rules.map do |rule|
-    if rule =~ /^\$\(DLLIB\)\:/
-      rule + "\n\tmt.exe -manifest $(@).manifest -outputresource:$(@);2"
-    else
-      rule
-    end
-  end
-  File.open(mf_name, 'w') { |f| f.write new_make_rules.join("\n\n")}
-end
-
-case RUBY_PLATFORM
-when /darwin/
-when /win/
-  win32_hack 'Makefile'
-end

data/ext/smartcard_pcsc/pcsc.h

@@ -1,52 +0,0 @@
-/* Ruby extension API. */
-#include <ruby.h>
-/* Generated by 'extconf.rb' to point to the PC/SC header. */
-#include "pcsc_autogen.h"
-
-/* Entrypoint into the Ruby extension. */
-void Init_pcsc();
-
-/* Namespace structure. */
-extern VALUE mSmartcard; /* Smartcard module / namespace */
-extern VALUE mPcsc; /* Smartcard::PCSC module / namespace */
-
-/* Class Smartcard::PCSC::ReaderStates */
-extern VALUE cPcscReaderStates;
-void Init_PCSC_ReaderStates();
-int _PCSC_ReaderStates_lowlevel_get(VALUE rbReaderStates, SCARD_READERSTATE **reader_states, size_t *reader_states_count);
-
-/* Class Smartcard::PCSC::IoRequest */
-extern VALUE cPcscIoRequest;
-void Init_PCSC_IoRequest();
-int _PCSC_IoRequest_lowlevel_get(VALUE rbIoRequest, SCARD_IO_REQUEST **io_request);
-VALUE _PCSC_IoRequest_lowlevel_new(const SCARD_IO_REQUEST *io_request);
-
-/* Class Smartcard::PCSC::Context */
-extern VALUE cPcscContext;
-void Init_PCSC_Context();
-int _PCSC_Context_lowlevel_get(VALUE rbContext, SCARDCONTEXT *pcsc_context);
-
-/* Class Smartcard::PCSC::Card */
-extern VALUE cPcscCard;
-void Init_PCSC_Card();
-int _PCSC_Card_lowlevel_get(VALUE rbCard, SCARDHANDLE *card_handle);
-
-/* Class Smartcard::PCSC::Exception */
-extern VALUE ePcscException;
-void Init_PCSC_Exception();
-void _PCSC_Exception_raise(DWORD pcsc_error, char *pcsc_function);
-
-/* Constants in Smartcard::PCSC */
-void Init_PCSC_Consts();
-
-/* Multi-string (win32 abomination) tools. */
-VALUE PCSC_Internal_multistring_to_ruby_array(char *mstr, size_t mstr_len);
-int PCSC_Internal_ruby_strings_to_multistring(VALUE rbStrings, char **strings);
-
-/* Messing up with constants that aren't uniformly defined. */
-#if !defined(MAX_ATR_SIZE)
-#define MAX_ATR_SIZE 32
-#endif
-#if !defined(SCARD_PROTOCOL_ANY)
-#define SCARD_PROTOCOL_ANY (SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1)
-#endif