smartcard 0.2.1-mswin32 → 0.2.2-mswin32

data/CHANGELOG

@@ -1,3 +1,8 @@
+v0.2.2 Fixed APDU exchange bugs on Windows
+	Restructured PCSC::IoRequest to allow PCI_ consts
+	Added PCI_ consts
+	Changed test suite to reflect proper way to do transmits
+
 v0.2.1 Added OSX Tiger support
 	Many workarounds for Tiger's buggy/incomplete PC/SC.
 	Small bugfixes for PC/SC status constants.

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2007 Victor Costan
+Copyright (c) 2007 Massachusetts Institute of Technology
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README

@@ -25,5 +25,8 @@ has the license in legalese.
 
 = Acknowledgements
 
-+smartcard+ is developed by Victor Costan while working as a Research Assistant for MIT.
-The work is sponsored by a grant from Quanta Computer Inc (www.quanta.com.tw)
++smartcard+ is developed by Victor Costan while working as a Research Assistant for MIT, under
+{Prof. Srini Devadas}[http://people.csail.mit.edu/devadas/], in 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/].

data/ext/smartcard_pcsc/extconf.rb

@@ -15,7 +15,7 @@ elsif RUBY_PLATFORM =~ /win/
   have_library('winscard')
 else
   # pcsc is retarded and uses stuff like '#include <wintypes.h>'
-  $CFLAGS += ' -I /usr/include/PCSC -I /usr/local/include/pcsc'
+  $CFLAGS += ' -I /usr/include/PCSC -I /usr/local/include/PCSC'
   have_library('pcsclite')
 end
 

data/ext/smartcard_pcsc/pcsc.h

@@ -19,6 +19,7 @@ int _PCSC_ReaderStates_lowlevel_get(VALUE rbReaderStates, SCARD_READERSTATE **re
 extern VALUE cPcscIoRequest;
 void Init_PCSC_IoRequest();
 int _PCSC_IoRequest_lowlevel_get(VALUE rbIoRequest, SCARD_IO_REQUEST **io_request);
+VALUE _PCSC_IoRequest_lowlevel_new(SCARD_IO_REQUEST *io_request);
 
 /* Class Smartcard::PCSC::Context */
 extern VALUE cPcscContext;

data/ext/smartcard_pcsc/pcsc_card.c

@@ -263,7 +263,7 @@ static VALUE PCSC_Card_set_attribute(VALUE self, VALUE rbAttributeId, VALUE rbAt
  * The bytes in the card's response are returned wrapped in a string. (don't complain, it's a low-level API)
  * 
  * +send_data+:: the APDU to be send to the card; wrap the bytes in a string-like object (low-level API, remember?)
- * +send_io_request+:: Smartcard::PCSC::IoRequest instance indicating the send protocol; you can use one of the Smartcard::PCSC::PCI_ constants
+ * +send_io_request+:: Smartcard::PCSC::IoRequest instance indicating the send protocol; you should use one of the Smartcard::PCSC::IOREQUEST_ constants
  * +recv_io_request+:: Smartcard::PCSC::IoRequest instance receving information about the recv protocol; you can use the result of Smartcard::PCSC::IoRequest#new
  */
 static VALUE PCSC_Card_transmit(VALUE self, VALUE rbSendData, VALUE rbSendIoRequest, VALUE rbRecvIoRequest) {

data/ext/smartcard_pcsc/pcsc_constants.c

@@ -186,10 +186,10 @@ void Init_PCSC_Consts() {
 	/* SCARD_ATTR_MAXINPUT : Maximum size of an APDU supported by the reader. */
 	rb_define_const(mPcsc, "ATTR_MAXINPUT", INT2NUM(SCARD_ATTR_MAXINPUT));	
 	
-	
-	/*
-#define 	SCARD_PCI_T0   (&g_rgSCardT0Pci)
-#define 	SCARD_PCI_T1   (&g_rgSCardT1Pci)
-#define 	SCARD_PCI_RAW   (&g_rgSCardRawPci)
- 	*/ 	
-}
+	/* SCARD_PCI_T0 : IoRequest for transmitting using the T=0 protocol. */
+	rb_define_const(mPcsc, "IOREQUEST_T0", _PCSC_IoRequest_lowlevel_new(SCARD_PCI_T0));
+	/* SCARD_PCI_T1 : IoRequest for transmitting using the T=1 protocol. */
+	rb_define_const(mPcsc, "IOREQUEST_T1", _PCSC_IoRequest_lowlevel_new(SCARD_PCI_T1));
+	/* SCARD_PCI_RAW : IoRequest for transmitting using the RAW protocol. */
+	rb_define_const(mPcsc, "IOREQUEST_RAW", _PCSC_IoRequest_lowlevel_new(SCARD_PCI_RAW));
+}

data/ext/smartcard_pcsc/pcsc_io_request.c

@@ -2,20 +2,48 @@
 
 VALUE cPcscIoRequest;
 
+/* Wraps a SCARD_IO_REQUEST, tracking its allocation etc. */
+struct SCardIoRequestEx {
+	SCARD_IO_REQUEST *pcsc_request;
+	int mallocd; 
+};
+
 /* Custom free for Smartcard::PCSC::IoRequest. */
-static void PCSC_IoRequest_free(SCARD_IO_REQUEST *_request) {
-	if(_request != NULL)
+static void PCSC_IoRequest_free(struct SCardIoRequestEx *_request) {
+	if(_request != NULL) {
+		if(_request->mallocd)
+			xfree(_request->pcsc_request);
 		xfree(_request);
+	}
 }
 
-/* Custom allocation for Smartcard::PCSC::Card. Wraps a SCARD_IO_REQUEST. */
+/* Custom allocation for Smartcard::PCSC::Card. Wraps a SCardIoRequestEx. */
 static VALUE PCSC_IoRequest_alloc(VALUE klass) {
-	SCARD_IO_REQUEST *request;
+	struct SCardIoRequestEx *request;
 	
-	VALUE rbIoRequest = Data_Make_Struct(klass, SCARD_IO_REQUEST, NULL, PCSC_IoRequest_free, request);
+	VALUE rbIoRequest = Data_Make_Struct(klass, struct SCardIoRequestEx, NULL, PCSC_IoRequest_free, request);
+	request->pcsc_request = NULL;
+	request->mallocd = 0;
 	return rbIoRequest;
 }
 
+/* :Document-method: new
+ * call-seq:
+ *      new() --> io_request
+ * 
+ * Creates an uninitialized IoRequest. 
+ * The request can be used as a receiving IoRequest in Smartcard::PCSC::Card#transmit.
+ */
+static VALUE PCSC_IoRequest_initialize(VALUE self) {
+	struct SCardIoRequestEx *request;	
+	
+	Data_Get_Struct(self, struct SCardIoRequestEx, request);
+	request->pcsc_request = ALLOC(SCARD_IO_REQUEST);
+	request->mallocd = 1;
+	
+	return self;
+}
+
 /* :Document-method: protocol
  * call-seq:
  *      io_request.protocol --> protocol
@@ -25,12 +53,12 @@ static VALUE PCSC_IoRequest_alloc(VALUE klass) {
  * The returned protocol is a number, and should be checked against one of the Smartcard::PCSC::PROTOCOL_ constants.
  */
 static VALUE PCSC_IoRequest_get_protocol(VALUE self) {
-	SCARD_IO_REQUEST *request;
+	struct SCardIoRequestEx *request;
 	
-	Data_Get_Struct(self, SCARD_IO_REQUEST, request);
+	Data_Get_Struct(self, struct SCardIoRequestEx, request);
 	if(request == NULL) return Qnil;
 	
-	return UINT2NUM(request->dwProtocol);
+	return UINT2NUM(request->pcsc_request->dwProtocol);
 }
 
 /* :Document-method: protocol=
@@ -42,12 +70,15 @@ static VALUE PCSC_IoRequest_get_protocol(VALUE self) {
  * +protocol+:: use one of the Smartcard::PCSC::PROTOCOL_ constants
  */
 static VALUE PCSC_IoRequest_set_protocol(VALUE self, VALUE rbProtocol) {
-	SCARD_IO_REQUEST *request;
+	struct SCardIoRequestEx *request;
 	
-	Data_Get_Struct(self, SCARD_IO_REQUEST, request);
+	Data_Get_Struct(self, struct SCardIoRequestEx, request);
 	if(request == NULL) return self;
 	
-	request->dwProtocol = NUM2UINT(rbProtocol);
+	if(request->mallocd == 0)
+		rb_raise(rb_eSecurityError, "cannot modify PC/SC-global (read-only) IO_REQUEST");
+	else
+		request->pcsc_request->dwProtocol = NUM2UINT(rbProtocol);
 	return self;
 }
 
@@ -66,13 +97,14 @@ static VALUE PCSC_IoRequest_set_protocol(VALUE self, VALUE rbProtocol) {
 void Init_PCSC_IoRequest() {
 	cPcscIoRequest = rb_define_class_under(mPcsc, "IoRequest", rb_cObject);
 	rb_define_alloc_func(cPcscIoRequest, PCSC_IoRequest_alloc);
+	rb_define_method(cPcscIoRequest, "initialize", PCSC_IoRequest_initialize, 0);	
 	rb_define_method(cPcscIoRequest, "protocol", PCSC_IoRequest_get_protocol, 0);	
 	rb_define_method(cPcscIoRequest, "protocol=", PCSC_IoRequest_set_protocol, 1);	
 }
 
 /* Retrieves the SCARD_IO_REQUEST wrapped into a Smartcard::PCSC::IoRequest instance. */
 int _PCSC_IoRequest_lowlevel_get(VALUE rbIoRequest, SCARD_IO_REQUEST **io_request) {
-	SCARD_IO_REQUEST *request;	
+	struct SCardIoRequestEx *request;	
 
 	if(TYPE(rbIoRequest) == T_NIL || TYPE(rbIoRequest) == T_FALSE) {
 		*io_request = NULL;
@@ -81,7 +113,17 @@ int _PCSC_IoRequest_lowlevel_get(VALUE rbIoRequest, SCARD_IO_REQUEST **io_reques
 	if(TYPE(rbIoRequest) != T_DATA || RDATA(rbIoRequest)->dfree != (void (*)(void *))PCSC_IoRequest_free)
 		return 0;
 	
-	Data_Get_Struct(rbIoRequest, SCARD_IO_REQUEST, request);
-	*io_request = request;
+	Data_Get_Struct(rbIoRequest, struct SCardIoRequestEx, request);
+	*io_request = request->pcsc_request;
 	return 1;
 }
+
+/* Creates a Smartcard::PCSC::IoRequest instance wrapping a given SCARD_IO_REQUEST. */
+VALUE _PCSC_IoRequest_lowlevel_new(SCARD_IO_REQUEST *io_request) {
+	struct SCardIoRequestEx *request;
+	
+	VALUE rbIoRequest = Data_Make_Struct(cPcscIoRequest, struct SCardIoRequestEx, NULL, PCSC_IoRequest_free, request);
+	request->pcsc_request = io_request;
+	request->mallocd = 0;
+	return rbIoRequest;
+}

data/ext/smartcard_pcsc/pcsc_main.c

@@ -7,4 +7,4 @@ void Init_pcsc() {
 	Init_PCSC_Context();
 	Init_PCSC_Card();
 	Init_PCSC_Consts();
-}
+}

data/ext/smartcard_pcsc/pcsc_multi_strings.c

@@ -79,4 +79,4 @@ char *pcsc_stringify_error(DWORD scard_error) {
         scard_error_buffer, sizeof(scard_error_buffer), NULL );
 	return scard_error_buffer;
 }
-#endif
+#endif

data/smartcard.gemspec

@@ -1,30 +1,35 @@
 
-# Gem::Specification for Smartcard-0.2.1
+# Gem::Specification for Smartcard-0.2.2
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{smartcard}
-  s.version = "0.2.1"
-  s.date = %q{2007-11-19}
-  s.summary = %q{Interface with ISO 7816 smart cards.}
-  s.require_paths = ["lib", "ext"]
-  s.email = %q{victor@costan.us}
-  s.homepage = %q{http://www.costan.us/smartcard}
-  s.rubyforge_project = %q{smartcard}
-  s.description = %q{Interface with ISO 7816 smart cards.}
-  s.has_rdoc = true
+  s.version = "0.2.2"
   s.platform = %q{mswin32}
+
+  s.specification_version = 2 if s.respond_to? :specification_version=
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
+  s.date = %q{2007-12-03}
+  s.description = %q{Interface with ISO 7816 smart cards.}
+  s.email = %q{victor@costan.us}
   s.files = ["CHANGELOG", "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_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", "LICENSE", "README", "test/test_all.rb", "tests/ts_pcsc_ext.rb", "Manifest", "smartcard.gemspec", "lib/smartcard/pcsc.so"]
+  s.has_rdoc = true
+  s.homepage = %q{http://www.costan.us/smartcard}
+  s.require_paths = ["lib", "ext"]
+  s.rubyforge_project = %q{smartcard}
+  s.rubygems_version = %q{0.9.5}
+  s.summary = %q{Interface with ISO 7816 smart cards.}
   s.test_files = ["test/test_all.rb"]
 end
 
 
 # # Original Rakefile source (requires the Echoe gem):
 # 
-# # Needs the 'echoe' gem
+# require 'rubygems'
+# gem 'echoe'
 # require 'echoe'
-# require 'pp'
 # 
 # Echoe.new('smartcard') do |p|
 #   p.project = 'smartcard' # rubyforge project
@@ -52,4 +57,9 @@ end
 #       task :package => [ :clean, :compile, :postcompile_hacks ]
 #     end
 #   end
+# end
+# 
+# if $0 == __FILE__
+#   Rake.application = Rake::Application.new
+#   Rake.application.run
 # end

data/tests/ts_pcsc_ext.rb

@@ -1,3 +1,5 @@
+require 'rubygems'
+gem 'smartcard', '>= 0.2.1'
 require 'smartcard'
 require 'pp'
 
@@ -57,7 +59,7 @@ def test_io_request
   io_request = Smartcard::PCSC::IoRequest.new
   [Smartcard::PCSC::PROTOCOL_T0, Smartcard::PCSC::PROTOCOL_T1, Smartcard::PCSC::PROTOCOL_RAW].each do |t_protocol|
     io_request.protocol = t_protocol
-    r_protocol = io_request.protocol 
+    r_protocol = io_request.protocol
     if r_protocol != t_protocol
       puts "FAILED: IoRequest.protocol= / protocol failed for protocol #{t_protocol} (got #{r_protocol} instead)\n"
       return false
@@ -116,9 +118,10 @@ rescue RuntimeError => e
 end
 
 puts "Selecting applet\n"
-aid = [0x19, 0x83, 0x12, 0x29, 0xba, 0xbe]
+aid = [0x19, 0x83, 0x12, 0x29, 0x10, 0xba, 0xbe]
 select_apdu = [0x00, 0xA4, 0x04, 0x00, aid.length, aid].flatten
-send_ioreq = Smartcard::PCSC::IoRequest.new; send_ioreq.protocol = Smartcard::PCSC::PROTOCOL_T1;
+send_ioreq = {Smartcard::PCSC::PROTOCOL_T0 => Smartcard::PCSC::IOREQUEST_T0,
+              Smartcard::PCSC::PROTOCOL_T1 => Smartcard::PCSC::IOREQUEST_T1}[card_status[:protocol]]
 recv_ioreq = Smartcard::PCSC::IoRequest.new
 select_response = card0.transmit(select_apdu.map {|byte| byte.chr}.join(''), send_ioreq, recv_ioreq)
 select_response_str = (0...select_response.length).map { |i| ' %02x' % select_response[i].to_i }.join('')

metadata

@@ -1,34 +1,26 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: smartcard
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2007-11-19 00:00:00 -05:00
-summary: Interface with ISO 7816 smart cards.
-require_paths: 
-- lib
-- ext
-email: victor@costan.us
-homepage: http://www.costan.us/smartcard
-rubyforge_project: smartcard
-description: Interface with ISO 7816 smart cards.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.2.2
 platform: mswin32
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Victor Costan
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2007-12-03 00:00:00 -05:00
+default_executable: 
+dependencies: []
+
+description: Interface with ISO 7816 smart cards.
+email: victor@costan.us
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - CHANGELOG
 - ext/smartcard_pcsc/extconf.rb
@@ -51,17 +43,32 @@ files:
 - Manifest
 - smartcard.gemspec
 - lib/smartcard/pcsc.so
-test_files: 
-- test/test_all.rb
+has_rdoc: true
+homepage: http://www.costan.us/smartcard
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+- ext
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: smartcard
+rubygems_version: 0.9.5
+signing_key: 
+specification_version: 2
+summary: Interface with ISO 7816 smart cards.
+test_files: 
+- test/test_all.rb