smartcard 0.5.1 → 0.5.2

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.5.2. Added 'thread' require to fix crashes on new Rubygems versions.
+
 v0.5.1. Work around drivers that don't honor PROTOCOL_ANY.
 
 v0.5.0. Dropped C extension in favor of FFI. Hello, jruby and rbx!

data/README

@@ -35,3 +35,7 @@ the {Trusted Computing group}[http://projects.csail.mit.edu/tc/].
 The work is funded by a grant from
 {Quanta Computer Inc}[http://www.quanta.com.tw], under the
 {T-Party Project}[http://projects.csail.mit.edu/tparty/].
+
+Kevin Redon <kevredon@mail.tsaitgaist.info> provided information and a failing
+test case for ATR-based protocol detection, which is necessary if the PC/SC
+driver doesn't do it automatically.

data/lib/smartcard/iso/jcop_remote_server.rb

@@ -5,6 +5,7 @@
 # License:: MIT
 
 require 'socket'
+require 'thread'
 
 # :nodoc: namespace
 module Smartcard::Iso

data/lib/smartcard/pcsc/ffi_autogen.rb

@@ -29,8 +29,8 @@ module FFILib
     SCARD_E_DUPLICATE_READER = 0x8010001B
     SCARD_E_NO_SERVICE = 0x8010001D
     SCARD_E_SERVICE_STOPPED = 0x8010001E
-    SCARD_W_CARD_NOT_AUTHENTICATED = 0x8010006F
     SCARD_E_UNSUPPORTED_FEATURE = 0x8010001F
+    SCARD_W_CARD_NOT_AUTHENTICATED = 0x8010006F
     SCARD_S_SUCCESS = 0x00000000
     SCARD_E_NO_KEY_CONTAINER = 0x80100030
     SCARD_W_CANCELLED_BY_USER = 0x8010006E
@@ -63,7 +63,6 @@ module FFILib
     SCARD_E_INVALID_CHV = 0x8010002A
     SCARD_W_UNSUPPORTED_CARD = 0x80100065
     SCARD_W_UNRESPONSIVE_CARD = 0x80100066
-    SCARD_W_INSERTED_CARD = 0x8010006A
     SCARD_SCOPE_USER = 0x00000000
     SCARD_SCOPE_SYSTEM = 0x00000002
     SCARD_SCOPE_TERMINAL = 0x00000001
@@ -175,8 +174,8 @@ module FFILib
     :duplicate_reader, Consts::SCARD_E_DUPLICATE_READER,
     :no_service, Consts::SCARD_E_NO_SERVICE,
     :service_stopped, Consts::SCARD_E_SERVICE_STOPPED,
-    :card_not_authenticated, Consts::SCARD_W_CARD_NOT_AUTHENTICATED,
     :unsupported_feature, Consts::SCARD_E_UNSUPPORTED_FEATURE,
+    :card_not_authenticated, Consts::SCARD_W_CARD_NOT_AUTHENTICATED,
     :success, Consts::SCARD_S_SUCCESS,
     :no_key_container, Consts::SCARD_E_NO_KEY_CONTAINER,
     :cancelled_by_user, Consts::SCARD_W_CANCELLED_BY_USER,
@@ -209,7 +208,6 @@ module FFILib
     :invalid_chv, Consts::SCARD_E_INVALID_CHV,
     :unsupported_card, Consts::SCARD_W_UNSUPPORTED_CARD,
     :unresponsive_card, Consts::SCARD_W_UNRESPONSIVE_CARD,
-    :inserted_card, Consts::SCARD_W_INSERTED_CARD,
   ]
 
   # Values for the context's scope.

data/lib/smartcard/pcsc/ffi_lib.rb

@@ -35,4 +35,4 @@ unless 0.respond_to?(:ord) or '0'.respond_to?(:ord)
       self
     end
   end
-end
+end

data/lib/smartcard/pcsc/pcsc_exception.rb

@@ -2,7 +2,7 @@
 class Smartcard::PCSC::Exception  < RuntimeError
   def initialize(error_status)
     @pcsc_status = error_status
-    super error_status.to_s
+    super '0x%x' % (2**32 + error_status)
   end
   
   # The PC/SC error status that caused this error.

data/smartcard.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smartcard}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2010-11-27}
+  s.date = %q{2011-04-21}
   s.description = %q{Interface with ISO 7816 smart cards.}
   s.email = %q{victor@costan.us}
   s.extra_rdoc_files = ["BUILD", "CHANGELOG", "LICENSE", "README", "lib/smartcard.rb", "lib/smartcard/gp/asn1_ber.rb", "lib/smartcard/gp/cap_loader.rb", "lib/smartcard/gp/des.rb", "lib/smartcard/gp/gp_card_mixin.rb", "lib/smartcard/iso/apdu_error.rb", "lib/smartcard/iso/auto_configurator.rb", "lib/smartcard/iso/iso_card_mixin.rb", "lib/smartcard/iso/jcop_remote_protocol.rb", "lib/smartcard/iso/jcop_remote_server.rb", "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"]
@@ -15,12 +15,11 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Smartcard", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{smartcard}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.7.2}
   s.summary = %q{Interface with ISO 7816 smart cards.}
   s.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/iso_exception_test.rb", "test/iso/jcop_remote_test.rb", "test/pcsc/card_test.rb", "test/pcsc/context_test.rb", "test/pcsc/reader_state_queries_test.rb"]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/test/gp/asn1_ber_test.rb

@@ -2,6 +2,7 @@
 # Copyright:: Copyright (C) 2008 Massachusetts Institute of Technology
 # License:: MIT
 
+require 'rubygems'
 require 'smartcard'
 
 require 'test/unit'

data/test/gp/cap_loader_test.rb

@@ -2,6 +2,7 @@
 # Copyright:: Copyright (C) 2008 Massachusetts Institute of Technology
 # License:: MIT
 
+require 'rubygems'
 require 'smartcard'
 
 require 'test/unit'

data/test/gp/des_test.rb

@@ -2,6 +2,7 @@
 # Copyright:: Copyright (C) 2008 Massachusetts Institute of Technology
 # License:: MIT
 
+require 'rubygems'
 require 'smartcard'
 
 require 'test/unit'

data/test/gp/gp_card_mixin_compat_test.rb

@@ -2,6 +2,7 @@
 # Copyright:: Copyright (C) 2008 Massachusetts Institute of Technology
 # License:: MIT
 
+require 'rubygems'
 require 'smartcard'
 
 require 'test/unit'

data/test/gp/gp_card_mixin_test.rb

@@ -2,6 +2,7 @@
 # Copyright:: Copyright (C) 2008 Massachusetts Institute of Technology
 # License:: MIT
 
+require 'rubygems'
 require 'smartcard'
 
 require 'test/unit'

data/test/iso/auto_configurator_test.rb

@@ -2,6 +2,7 @@
 # Copyright:: Copyright (C) 2008 Massachusetts Institute of Technology
 # License:: MIT
 
+require 'rubygems'
 require 'smartcard'
 
 require 'test/unit'

data/test/iso/iso_card_mixin_test.rb

@@ -2,6 +2,7 @@
 # Copyright:: Copyright (C) 2008 Massachusetts Institute of Technology
 # License:: MIT
 
+require 'rubygems'
 require 'smartcard'
 
 require 'test/unit'

data/test/iso/iso_exception_test.rb

@@ -2,6 +2,7 @@
 # Copyright:: Copyright (C) 2008 Massachusetts Institute of Technology
 # License:: MIT
 
+require 'rubygems'
 require 'smartcard'
 
 require 'test/unit'

data/test/iso/jcop_remote_test.rb

@@ -2,6 +2,7 @@
 # Copyright:: Copyright (C) 2008 Massachusetts Institute of Technology
 # License:: MIT
 
+require 'rubygems'
 require 'smartcard'
 
 require 'test/unit'

data/test/pcsc/card_test.rb

@@ -2,6 +2,7 @@
 # Copyright:: Copyright (C) 2008 Massachusetts Institute of Technology
 # License:: MIT
 
+require 'rubygems'
 require 'smartcard'
 
 require 'test/unit'

data/test/pcsc/context_test.rb

@@ -2,6 +2,7 @@
 # Copyright:: Copyright (C) 2008 Massachusetts Institute of Technology
 # License:: MIT
 
+require 'rubygems'
 require 'smartcard'
 
 require 'test/unit'

data/test/pcsc/reader_state_queries_test.rb

@@ -2,6 +2,7 @@
 # Copyright:: Copyright (C) 2008 Massachusetts Institute of Technology
 # License:: MIT
 
+require 'rubygems'
 require 'smartcard'
 
 require 'test/unit'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: smartcard
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Victor Costan
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-27 00:00:00 -05:00
-default_executable: 
+date: 2011-04-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
@@ -174,7 +173,6 @@ files:
 - test/pcsc/context_test.rb
 - test/pcsc/reader_state_queries_test.rb
 - smartcard.gemspec
-has_rdoc: true
 homepage: http://www.costan.us/smartcard
 licenses: []
 
@@ -210,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: smartcard
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Interface with ISO 7816 smart cards.