smartcard 0.1.1 → 0.2.0

data/CHANGELOG

@@ -0,0 +1,14 @@
+v0.2.0 Added automatic builds
+	Rakefile for auto builds using echoe
+	extconf.rb: hack to fix Windows makefiles 
+
+v0.1.2 Added Windows compatibility
+	*.c: restructured code so VC2005 likes it
+	(variable declarations before function body)
+	docs: license, readme, and what the gem is
+
+v0.1.1 Added support for Ubuntu 7.10
+	ext/smartcard_pcsc/extconf.rb: better header
+	detection
+
+v0.1.0 Initial release for OSX Leopard

data/LICENSE

@@ -0,0 +1,22 @@
+The MIT License
+
+Copyright (c) 2007 Victor Costan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+

data/Manifest

@@ -0,0 +1,19 @@
+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

data/README

@@ -0,0 +1,22 @@
+SUMMARY
+
+'smartcard' aims to become the de-facto support library for smart-card development on ruby.
+At the moment, 'smartcard' offers a PC/SC binding that is working on ruby 1.8, under
+linux, osx, and windows. Future plans include a high level abstraction for the PC/SC binding 
+(and any other bindings people need), and an interface for Java cards.
+
+LICENSE
+
+'smartcard' is released under the MIT license. This means you're free to do whatever you want
+with it. For the legalese version, please see the 'LICENSE' file.
+
+DOCUMENTATION
+
+The API is fully documented with RDoc. If you installed the 'smartcard' gem, you should be
+able to use ri to see the documentation. If you're using the SVN version, you can use rdoc to
+build the HTML and RI documentation yourself.
+
+ACKNOWLEDGEMENTS
+
+'smartcard' was developed for Victor Costan while working as a Research Assistant for MIT.
+The work was sponsored by a grant from Quanta Computer Inc (www.quanta.com.tw)

data/ext/smartcard_pcsc/extconf.rb

@@ -1,5 +1,4 @@
 require 'mkmf'
-require 'pp'
 
 $CFLAGS ||= ''
 $LDFLAGS ||= ''
@@ -7,7 +6,7 @@ $LDFLAGS ||= ''
 if RUBY_PLATFORM =~ /darwin/
   $LDFLAGS += ' -framework PCSC'
 elsif RUBY_PLATFORM =~ /win/
-  # TODO: no clue what to do here
+  have_library('winscard')
 else
   # pcsc is retarded and uses stuff like '#include <wintypes.h>'
   $CFLAGS += ' -I /usr/include/PCSC -I /usr/local/include/pcsc'
@@ -26,9 +25,29 @@ end
 
 pcsc_defines = []
 
-File.open('pcsc_include.h', 'w') do |f|
+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 
 
-create_makefile('smartcard/pcsc')
+create_makefile('smartcard/pcsc')
+
+def win32_hack(mf_name)
+  # evil, evil, evil -- hack the makefile to embed the 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,7 +1,7 @@
 /* Ruby extension API. */
 #include <ruby.h>
 /* Generated by 'extconf.rb' to point to the PC/SC header. */
-#include "pcsc_include.h"
+#include "pcsc_autogen.h"
 
 /* Entrypoint into the Ruby extension. */
 void Init_pcsc();
@@ -36,3 +36,11 @@ 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

data/ext/smartcard_pcsc/pcsc_card.c

@@ -43,24 +43,26 @@ static VALUE PCSC_Card_alloc(VALUE klass) {
  */
 static VALUE PCSC_Card_initialize(VALUE self, VALUE rbContext, VALUE rbReaderName, VALUE rbShareMode, VALUE rbPreferredProtocols) {
 	struct SCardHandleEx *card;
+	SCARDCONTEXT context;
+	VALUE rbFinalReaderName;
+	DWORD share_mode, preferred_protocols, active_protocol;
+	
 	Data_Get_Struct(self, struct SCardHandleEx, card);
 	
-	SCARDCONTEXT context;
 	if(_PCSC_Context_lowlevel_get(rbContext, &context) == 0) {
 		rb_raise(rb_eArgError, "first argument is not a Context instance");
 		return self;
 	}
 	
-	VALUE rbFinalReaderName = rb_check_string_type(rbReaderName);
+	rbFinalReaderName = rb_check_string_type(rbReaderName);
 	if(NIL_P(rbFinalReaderName)) {
 		rb_raise(rb_eArgError, "second argument (should be reader name) does not convert to a String");
 		return self;
 	}
 	
-	DWORD share_mode = NUM2UINT(rbShareMode);
-	DWORD preferred_protocols = NUM2UINT(rbPreferredProtocols);
+	share_mode = NUM2UINT(rbShareMode);
+	preferred_protocols = NUM2UINT(rbPreferredProtocols);
 	
-	DWORD active_protocol;
 	card->pcsc_error = SCardConnect(context, RSTRING(rbFinalReaderName)->ptr, share_mode, preferred_protocols, &card->card_handle, &active_protocol);	
 	if(card->pcsc_error != SCARD_S_SUCCESS)
 		rb_raise(rb_eRuntimeError, "SCardConnect: %s", pcsc_stringify_error(card->pcsc_error));
@@ -82,14 +84,15 @@ static VALUE PCSC_Card_initialize(VALUE self, VALUE rbContext, VALUE rbReaderNam
  */
 static VALUE PCSC_Card_reconnect(VALUE self, VALUE rbShareMode, VALUE rbPreferredProtocols, VALUE rbInitialization) {
 	struct SCardHandleEx *card;
+	DWORD share_mode, preferred_protocols, initialization, active_protocol;
+	
 	Data_Get_Struct(self, struct SCardHandleEx, card);
 	if(card == NULL) return self;
 
-	DWORD share_mode = NUM2UINT(rbShareMode);
-	DWORD preferred_protocols = NUM2UINT(rbPreferredProtocols);
-	DWORD initialization = NUM2UINT(rbInitialization);
+	share_mode = NUM2UINT(rbShareMode);
+	preferred_protocols = NUM2UINT(rbPreferredProtocols);
+	initialization = NUM2UINT(rbInitialization);
 	
-	uint32_t active_protocol;
 	card->pcsc_error = SCardReconnect(card->card_handle, share_mode, preferred_protocols, initialization, &active_protocol);
 	if(card->pcsc_error != SCARD_S_SUCCESS)
 		rb_raise(rb_eRuntimeError, "SCardReconnect: %s", pcsc_stringify_error(card->pcsc_error));
@@ -107,11 +110,13 @@ static VALUE PCSC_Card_reconnect(VALUE self, VALUE rbShareMode, VALUE rbPreferre
  * +disposition+:: action to be taken on the card inside the reader; use one of the Smartcard::PCSC::DISPOSITION_ constants
  */
 static VALUE PCSC_Card_disconnect(VALUE self, VALUE rbDisposition) {
-	struct SCardHandleEx *card;	
+	struct SCardHandleEx *card;
+	DWORD disposition;
+	
 	Data_Get_Struct(self, struct SCardHandleEx, card);
 	if(card == NULL) return self;
 
-	DWORD disposition = NUM2UINT(rbDisposition);
+	disposition = NUM2UINT(rbDisposition);
 	if(!card->released) {
 		card->pcsc_error = SCardDisconnect(card->card_handle, disposition);		
 		card->released = 1;
@@ -129,7 +134,8 @@ static VALUE PCSC_Card_disconnect(VALUE self, VALUE rbDisposition) {
  * Wraps _SCardBeginTransaction_ in PC/SC.
  */
 static VALUE PCSC_Card_begin_transaction(VALUE self) {
-	struct SCardHandleEx *card;	
+	struct SCardHandleEx *card;
+	
 	Data_Get_Struct(self, struct SCardHandleEx, card);
 	if(card == NULL) return self;
 	
@@ -149,11 +155,13 @@ static VALUE PCSC_Card_begin_transaction(VALUE self) {
  * +disposition+:: action to be taken on the card inside the reader; use one of the Smartcard::PCSC::DISPOSITION_ constants
  */
 static VALUE PCSC_Card_end_transaction(VALUE self, VALUE rbDisposition) {
-	struct SCardHandleEx *card;	
+	struct SCardHandleEx *card;
+	DWORD disposition;
+	
 	Data_Get_Struct(self, struct SCardHandleEx, card);
 	if(card == NULL) return self;
 	
-	DWORD disposition = NUM2UINT(rbDisposition);
+	disposition = NUM2UINT(rbDisposition);
 	card->pcsc_error = SCardEndTransaction(card->card_handle, disposition);
 	if(card->pcsc_error != SCARD_S_SUCCESS)
 		rb_raise(rb_eRuntimeError, "SCardEndTransaction: %s", pcsc_stringify_error(card->pcsc_error));	
@@ -174,19 +182,23 @@ static VALUE PCSC_Card_end_transaction(VALUE self, VALUE rbDisposition) {
  * +attribute_id+:: identifies the attribute to be read; use one of the Smartcard::PCSC::ATTR_ constants
  */
 static VALUE PCSC_Card_get_attribute(VALUE self, VALUE rbAttributeId) {
-	struct SCardHandleEx *card;	
+	struct SCardHandleEx *card;
+	char *attribute_buffer;
+	DWORD attribute_id, attribute_length;
+	VALUE rbAttribute;
+	
 	Data_Get_Struct(self, struct SCardHandleEx, card);
 	if(card == NULL) return Qnil;
 	
-	DWORD attribute_id = NUM2UINT(rbAttributeId);
-	DWORD attribute_length;
+	attribute_id = NUM2UINT(rbAttributeId);
+	attribute_length;
 	card->pcsc_error = SCardGetAttrib(card->card_handle, attribute_id, NULL, &attribute_length);
 	if(card->pcsc_error == SCARD_S_SUCCESS) {
-		char *attribute_buffer = ALLOC_N(char, attribute_length);
+		attribute_buffer = ALLOC_N(char, attribute_length);
 		if(attribute_buffer != NULL) {
 			card->pcsc_error = SCardGetAttrib(card->card_handle, attribute_id, (LPSTR)attribute_buffer, &attribute_length);
 			if(card->pcsc_error == SCARD_S_SUCCESS) {
-				VALUE rbAttribute = rb_str_new(attribute_buffer, attribute_length);
+				rbAttribute = rb_str_new(attribute_buffer, attribute_length);
 				xfree(attribute_buffer);
 				return rbAttribute;
 			}
@@ -210,13 +222,16 @@ static VALUE PCSC_Card_get_attribute(VALUE self, VALUE rbAttributeId) {
  * +attribute_value+:: the value to be assigned to the attribute; wrap the bytes in a string-like object (low-level API, remember?)
  */
 static VALUE PCSC_Card_set_attribute(VALUE self, VALUE rbAttributeId, VALUE rbAttributeValue) {
-	struct SCardHandleEx *card;	
+	struct SCardHandleEx *card;
+	DWORD attribute_id;
+	VALUE rbFinalAttributeValue;
+	
 	Data_Get_Struct(self, struct SCardHandleEx, card);
 	if(card == NULL) return self;
 	
-	DWORD attribute_id = NUM2UINT(rbAttributeId);
+	attribute_id = NUM2UINT(rbAttributeId);
 
-	VALUE rbFinalAttributeValue = rb_check_string_type(rbAttributeValue);
+	rbFinalAttributeValue = rb_check_string_type(rbAttributeValue);
 	if(NIL_P(rbFinalAttributeValue)) {
 		rb_raise(rb_eArgError, "second argument (attribute buffer) does not convert to a String");
 		return self;
@@ -242,35 +257,38 @@ static VALUE PCSC_Card_set_attribute(VALUE self, VALUE rbAttributeId, VALUE rbAt
  * +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) {
-	struct SCardHandleEx *card;	
+	struct SCardHandleEx *card;
+	VALUE rbFinalSendData, rbRecvData;
+	SCARD_IO_REQUEST *send_io_request, *recv_io_request;
+	char *recv_buffer;
+	DWORD recv_length;
+	
 	Data_Get_Struct(self, struct SCardHandleEx, card);
 	if(card == NULL) return Qnil;
 	
-	VALUE rbFinalSendData = rb_check_string_type(rbSendData);
+	rbFinalSendData = rb_check_string_type(rbSendData);
 	if(NIL_P(rbFinalSendData)) {
 		rb_raise(rb_eArgError, "first argument (send buffer) does not convert to a String");
 		return Qnil;
 	}
 	
-	SCARD_IO_REQUEST *send_io_request;
 	if(_PCSC_IoRequest_lowlevel_get(rbSendIoRequest, &send_io_request) == 0) {
 		rb_raise(rb_eArgError, "second argument (send io request) is not an IoRequest instance");
 		return Qnil;	
 	}	
-	SCARD_IO_REQUEST *recv_io_request;
 	if(_PCSC_IoRequest_lowlevel_get(rbRecvIoRequest, &recv_io_request) == 0) {
 		rb_raise(rb_eArgError, "second argument (recv io request) is not an IoRequest instance");
 		return Qnil;	
 	}
 	
 #if defined(PCSCLITE_MAX_MESSAGE_SIZE)
-	DWORD recv_length = PCSCLITE_MAX_MESSAGE_SIZE;
+	recv_length = PCSCLITE_MAX_MESSAGE_SIZE;
 #elif defined(MAX_BUFFER_SIZE_EXTENDED)
-	DWORD recv_length = MAX_BUFFER_SIZE_EXTENDED;
+	recv_length = MAX_BUFFER_SIZE_EXTENDED;
 #else
-	DWORD recv_length = 65536;
+	recv_length = 65536;
 #endif
-	char *recv_buffer = ALLOC_N(char, recv_length);
+	recv_buffer = ALLOC_N(char, recv_length);
 	if(recv_buffer == NULL) return Qnil;
 	
 	card->pcsc_error = SCardTransmit(card->card_handle, send_io_request,
@@ -282,7 +300,7 @@ static VALUE PCSC_Card_transmit(VALUE self, VALUE rbSendData, VALUE rbSendIoRequ
 		return Qnil;
 	}
 
-	VALUE rbRecvData = rb_str_new(recv_buffer, recv_length);
+	rbRecvData = rb_str_new(recv_buffer, recv_length);
 	xfree(recv_buffer);
 	return rbRecvData;			
 }
@@ -308,18 +326,22 @@ static VALUE PCSC_Card_transmit(VALUE self, VALUE rbSendData, VALUE rbSendIoRequ
  */
 static VALUE PCSC_Card_control(VALUE self, VALUE rbControlCode, VALUE rbSendData, VALUE rbMaxRecvBytes) {
 	struct SCardHandleEx *card;	
+	VALUE rbFinalSendData, rbRecvData;
+	char *recv_buffer;
+	DWORD control_code, recv_length;
+	
 	Data_Get_Struct(self, struct SCardHandleEx, card);
 	if(card == NULL) return Qnil;
 	
-	VALUE rbFinalSendData = rb_check_string_type(rbSendData);
+	rbFinalSendData = rb_check_string_type(rbSendData);
 	if(NIL_P(rbFinalSendData)) {
 		rb_raise(rb_eArgError, "second argument (send buffer) does not convert to a String");
 		return Qnil;
 	}
 	
-	DWORD control_code = NUM2UINT(rbControlCode);
-	DWORD recv_length = NUM2UINT(rbMaxRecvBytes);
-	char *recv_buffer = ALLOC_N(char, recv_length);
+	control_code = NUM2UINT(rbControlCode);
+	recv_length = NUM2UINT(rbMaxRecvBytes);
+	recv_buffer = ALLOC_N(char, recv_length);
 	if(recv_buffer == NULL) return Qnil;
 	
 	card->pcsc_error = SCardControl(card->card_handle, control_code,
@@ -331,7 +353,7 @@ static VALUE PCSC_Card_control(VALUE self, VALUE rbControlCode, VALUE rbSendData
 		return Qnil;
 	}
 
-	VALUE rbRecvData = rb_str_new(recv_buffer, recv_length);
+	rbRecvData = rb_str_new(recv_buffer, recv_length);
 	xfree(recv_buffer);
 	return rbRecvData;			
 }
@@ -352,21 +374,24 @@ static VALUE _rbStateKey, _rbProtocolKey, _rbAtrKey, _rbReaderNamesKey;
  * <tt>:reader_names</tt> :: array of strings containing all the names of the reader containing the smartcard
  */
 static VALUE PCSC_Card_status(VALUE self) {
-	struct SCardHandleEx *card;	
+	struct SCardHandleEx *card;
+	char *atr_buffer, *reader_names_buffer;
+	DWORD atr_length, reader_names_length, state, protocol;
+	VALUE rbStateVal, rbProtocolVal, rbAtrVal, rbReaderNamesVal, rbReturnHash;
+	
 	Data_Get_Struct(self, struct SCardHandleEx, card);
 	if(card == NULL) return Qnil;
 
-	DWORD atr_length = MAX_ATR_SIZE;
-	char *atr_buffer = ALLOC_N(char, atr_length);	
-	DWORD reader_names_length = 4096;
-	char *reader_names_buffer = ALLOC_N(char, reader_names_length);
+	atr_length = MAX_ATR_SIZE;
+	atr_buffer = ALLOC_N(char, atr_length);	
+	reader_names_length = 4096;
+	reader_names_buffer = ALLOC_N(char, reader_names_length);
 	if(atr_buffer == NULL || reader_names_buffer == NULL) {
 		if(reader_names_buffer != NULL) xfree(reader_names_buffer);
 		if(atr_buffer != NULL) xfree(atr_buffer);
 		return Qnil;
 	}
 	
-	DWORD state, protocol;
 	card->pcsc_error = SCardStatus(card->card_handle, reader_names_buffer, &reader_names_length, &state, &protocol, (LPSTR)atr_buffer, &atr_length);
 	if(card->pcsc_error != SCARD_S_SUCCESS) {
 		xfree(reader_names_buffer); xfree(atr_buffer);
@@ -374,12 +399,12 @@ static VALUE PCSC_Card_status(VALUE self) {
 		return Qnil;
 	}
 	
-	VALUE rbStateVal = UINT2NUM(state);
-	VALUE rbProtocolVal = UINT2NUM(protocol);
-	VALUE rbAtrVal = rb_str_new(atr_buffer, atr_length);
-	VALUE rbReaderNamesVal = PCSC_Internal_multistring_to_ruby_array(reader_names_buffer, reader_names_length);
+	rbStateVal = UINT2NUM(state);
+	rbProtocolVal = UINT2NUM(protocol);
+	rbAtrVal = rb_str_new(atr_buffer, atr_length);
+	rbReaderNamesVal = PCSC_Internal_multistring_to_ruby_array(reader_names_buffer, reader_names_length);
 	
-	VALUE rbReturnHash = rb_hash_new();
+	rbReturnHash = rb_hash_new();
 	rb_hash_aset(rbReturnHash, _rbStateKey, rbStateVal);
 	rb_hash_aset(rbReturnHash, _rbProtocolKey, rbProtocolVal);
 	rb_hash_aset(rbReturnHash, _rbAtrKey, rbAtrVal);
@@ -398,6 +423,7 @@ static VALUE PCSC_Card_status(VALUE self) {
  */
 static VALUE PCSC_Card_last_error(VALUE self) {
 	struct SCardHandleEx *card;	
+	
 	Data_Get_Struct(self, struct SCardHandleEx, card);
 	if(card == NULL) return Qnil;
 
@@ -414,16 +440,18 @@ static VALUE PCSC_Card_last_error(VALUE self) {
  * Wraps a _SCARDHANDLE_ structure.
  */
 void Init_PCSC_Card() {
-	ID state_id = rb_intern("status"); _rbStateKey = ID2SYM(state_id);
-	ID protocol_id = rb_intern("protocol"); _rbProtocolKey = ID2SYM(protocol_id);
-	ID atr_id = rb_intern("atr"); _rbAtrKey = ID2SYM(atr_id);
-	ID reader_names_id = rb_intern("reader_names"); _rbReaderNamesKey = ID2SYM(reader_names_id);
+	ID state_id, protocol_id, atr_id, reader_names_id;
+	
+	state_id = rb_intern("status"); _rbStateKey = ID2SYM(state_id);
+	protocol_id = rb_intern("protocol"); _rbProtocolKey = ID2SYM(protocol_id);
+	atr_id = rb_intern("atr"); _rbAtrKey = ID2SYM(atr_id);
+	reader_names_id = rb_intern("reader_names"); _rbReaderNamesKey = ID2SYM(reader_names_id);
 	
 	cPcscCard = rb_define_class_under(mPcsc, "Card", rb_cObject);
 	rb_define_alloc_func(cPcscCard, PCSC_Card_alloc);
 	rb_define_method(cPcscCard, "initialize", PCSC_Card_initialize, 4);
-	rb_define_method(cPcscCard, "reconnect", PCSC_Card_reconnect, 3);	
 	rb_define_method(cPcscCard, "disconnect", PCSC_Card_disconnect, 1);	
+	rb_define_method(cPcscCard, "reconnect", PCSC_Card_reconnect, 3);	
 	rb_define_method(cPcscCard, "begin_transaction", PCSC_Card_begin_transaction, 0);	
 	rb_define_method(cPcscCard, "end_transaction", PCSC_Card_end_transaction, 1);
 	rb_define_method(cPcscCard, "get_attribute", PCSC_Card_get_attribute, 1);	
@@ -436,10 +464,11 @@ void Init_PCSC_Card() {
 
 /* Retrieves the SCARDHANDLE wrapped into a Smartcard::PCSC::Card instance. */
 int _PCSC_Card_lowlevel_get(VALUE rbCard, SCARDHANDLE *card_handle) {
+	struct SCardHandleEx *card;	
+
 	if(TYPE(rbCard) != T_DATA || RDATA(rbCard)->dfree != (void (*)(void *))PCSC_Card_free)
 		return 0;
 	
-	struct SCardHandleEx *card;	
 	Data_Get_Struct(rbCard, struct SCardHandleEx, card);
 	*card_handle = card->card_handle;
 	return 1;

data/ext/smartcard_pcsc/pcsc_constants.c

@@ -133,16 +133,20 @@ void Init_PCSC_Consts() {
 	/* SCARD_SPECIFIC : PTS has been set. */
 	rb_define_const(mPcsc, "STATUS_SPECIFIC", INT2NUM(SCARD_SPECIFIC));
 	
+#if defined(SCARD_PROTOCOL_UNSET)
 	/* SCARD_PROTOCOL_UNSET : Protocol not set. */
 	rb_define_const(mPcsc, "PROTOCOL_UNSET", INT2NUM(SCARD_PROTOCOL_UNSET));
+#endif /* SCARD_PROTOCOL_UNSET */
 	/* SCARD_PROTOCOL_T0 : T=0 active protocol. */
 	rb_define_const(mPcsc, "PROTOCOL_T0", INT2NUM(SCARD_PROTOCOL_T0));
 	/* SCARD_PROTOCOL_T1 : T=1 active protocol. */
 	rb_define_const(mPcsc, "PROTOCOL_T1", INT2NUM(SCARD_PROTOCOL_T1));
 	/* SCARD_PROTOCOL_RAW : Raw active protocol. */
 	rb_define_const(mPcsc, "PROTOCOL_RAW", INT2NUM(SCARD_PROTOCOL_RAW));
+#if defined(SCARD_PROTOCOL_UNSET)
 	/* SCARD_PROTOCOL_T15 : T=15 protocol. */
 	rb_define_const(mPcsc, "PROTOCOL_T15", INT2NUM(SCARD_PROTOCOL_T15));
+#endif /* SCARD_PROTOCOL_UNSET */
 	/* SCARD_PROTOCOL_ANY : IFD determines protocol. */
 	rb_define_const(mPcsc, "PROTOCOL_ANY", INT2NUM(SCARD_PROTOCOL_ANY));
 

data/ext/smartcard_pcsc/pcsc_context.c

@@ -40,6 +40,7 @@ static VALUE PCSC_Context_alloc(VALUE klass) {
  */
 static VALUE PCSC_Context_initialize(VALUE self, VALUE scope) {
 	struct SCardContextEx *context;	
+	
 	Data_Get_Struct(self, struct SCardContextEx, context);
 	
 	context->pcsc_error = SCardEstablishContext(NUM2INT(scope), NULL, NULL, &context->pcsc_context);
@@ -60,6 +61,7 @@ static VALUE PCSC_Context_initialize(VALUE self, VALUE scope) {
  */
 static VALUE PCSC_Context_release(VALUE self) {
 	struct SCardContextEx *context;	
+	
 	Data_Get_Struct(self, struct SCardContextEx, context);
 	if(context == NULL) return self;
 
@@ -87,8 +89,8 @@ static VALUE PCSC_Context_is_valid(VALUE self) {
 	Data_Get_Struct(self, struct SCardContextEx, context);
 	if(context == NULL) return self;
 
-	DWORD pcsc_error = SCardIsValidContext(context->pcsc_context);		
-	return (pcsc_error == SCARD_S_SUCCESS) ? Qtrue : Qfalse;
+	context->pcsc_error = SCardIsValidContext(context->pcsc_context);		
+	return (context->pcsc_error == SCARD_S_SUCCESS) ? Qtrue : Qfalse;
 }
 
 /* :Document-method: list_reader_groups
@@ -101,18 +103,21 @@ static VALUE PCSC_Context_is_valid(VALUE self) {
  * Returns an array of strings containing the names of all the smart-card readers in the system.
  */
 static VALUE PCSC_Context_list_reader_groups(VALUE self) {
-	struct SCardContextEx *context;	
+	struct SCardContextEx *context;
+	VALUE rbGroups;
+	char *groups;
+	DWORD groups_length;
+	
 	Data_Get_Struct(self, struct SCardContextEx, context);
 	if(context == NULL) return Qnil;
 		
-	DWORD groups_length;
 	context->pcsc_error = SCardListReaderGroups(context->pcsc_context, NULL, &groups_length);
 	if(context->pcsc_error == SCARD_S_SUCCESS) {
-		char *groups = ALLOC_N(char, groups_length);
+		groups = ALLOC_N(char, groups_length);
 		if(groups != NULL) {
 			context->pcsc_error = SCardListReaderGroups(context->pcsc_context, groups, &groups_length);
 			if(context->pcsc_error == SCARD_S_SUCCESS) {
-				VALUE rbGroups = PCSC_Internal_multistring_to_ruby_array(groups, groups_length);
+				rbGroups = PCSC_Internal_multistring_to_ruby_array(groups, groups_length);
 				xfree(groups);
 				return rbGroups;
 			}
@@ -137,24 +142,26 @@ static VALUE PCSC_Context_list_reader_groups(VALUE self) {
  * +reader_groups+:: array of strings indicating the reader groups to list; also accepts a string or +nil+ (meaning all readers)
  */
 static VALUE PCSC_Context_list_readers(VALUE self, VALUE rbGroups) {
-	struct SCardContextEx *context;	
+	struct SCardContextEx *context;
+	VALUE rbReaders;
+	char *groups;
+	DWORD readers_length;
+	
 	Data_Get_Struct(self, struct SCardContextEx, context);
 	if(context == NULL) return Qnil;
 
-	char *groups;
 	if(PCSC_Internal_ruby_strings_to_multistring(rbGroups, &groups) == 0) {
 		rb_raise(rb_eArgError, "invalid reader groups set (expecting nil or string or array of strings)");
 		return Qnil;
 	}
 	
-	DWORD readers_length;
 	context->pcsc_error = SCardListReaders(context->pcsc_context, groups, NULL, &readers_length);
 	if(context->pcsc_error == SCARD_S_SUCCESS) {
 		char *readers = ALLOC_N(char, readers_length);
 		if(readers != NULL) {
 			context->pcsc_error = SCardListReaders(context->pcsc_context, groups, readers, &readers_length);
 			if(context->pcsc_error == SCARD_S_SUCCESS) {
-				VALUE rbReaders = PCSC_Internal_multistring_to_ruby_array(readers, readers_length);
+				rbReaders = PCSC_Internal_multistring_to_ruby_array(readers, readers_length);
 				xfree(readers);
 				if(groups != NULL) xfree(groups);
 				return rbReaders;
@@ -177,7 +184,8 @@ static VALUE PCSC_Context_list_readers(VALUE self, VALUE rbGroups) {
  * Wraps _SCardCancel_ in PC/SC.
  */
 static VALUE PCSC_Context_cancel(VALUE self) {
-	struct SCardContextEx *context;	
+	struct SCardContextEx *context;
+	
 	Data_Get_Struct(self, struct SCardContextEx, context);
 	if(context == NULL) return self;
 	
@@ -202,18 +210,19 @@ static VALUE PCSC_Context_cancel(VALUE self) {
  * ReaderStates#set_event_state_of and ReaderStates#event_state_of)
  */
 static VALUE PCSC_Context_get_status_change(VALUE self, VALUE rbReaderStates, VALUE rbTimeout) {
-	struct SCardContextEx *context;	
+	struct SCardContextEx *context;
+	SCARD_READERSTATE *reader_states;
+	size_t reader_states_count;	
+	DWORD timeout;
+	
 	Data_Get_Struct(self, struct SCardContextEx, context);
 	if(context == NULL) return self;
 	
-	unsigned int timeout;
 	if(TYPE(rbTimeout) == T_NIL || TYPE(rbTimeout) == T_FALSE)
 		timeout = INFINITE;
 	else
 		timeout = NUM2INT(rbTimeout);
 	
-	SCARD_READERSTATE *reader_states;
-	size_t reader_states_count;	
 	if(_PCSC_ReaderStates_lowlevel_get(rbReaderStates, &reader_states, &reader_states_count) == 0)
 		rb_raise(rb_eArgError, "first parameter is not a ReaderStates instance or nil");
 	else {
@@ -235,6 +244,7 @@ static VALUE PCSC_Context_get_status_change(VALUE self, VALUE rbReaderStates, VA
  */
 static VALUE PCSC_Context_last_error(VALUE self) {
 	struct SCardContextEx *context;	
+	
 	Data_Get_Struct(self, struct SCardContextEx, context);
 	if(context == NULL) return Qnil;
 
@@ -265,10 +275,11 @@ void Init_PCSC_Context() {
 
 /* Retrieves the SCARDCONTEXT wrapped into a Smartcard::PCSC::Context instance. */
 int _PCSC_Context_lowlevel_get(VALUE rbContext, SCARDCONTEXT *pcsc_context) {
+	struct SCardContextEx *context;	
+
 	if(TYPE(rbContext) != T_DATA || RDATA(rbContext)->dfree != (void (*)(void *))PCSC_Context_free)
 		return 0;	
 	
-	struct SCardContextEx *context;	
 	Data_Get_Struct(rbContext, struct SCardContextEx, context);
 	*pcsc_context = context->pcsc_context;
 	return 1;

data/ext/smartcard_pcsc/pcsc_io_request.c

@@ -26,6 +26,7 @@ static VALUE PCSC_IoRequest_alloc(VALUE klass) {
  */
 static VALUE PCSC_IoRequest_get_protocol(VALUE self) {
 	SCARD_IO_REQUEST *request;
+	
 	Data_Get_Struct(self, SCARD_IO_REQUEST, request);
 	if(request == NULL) return Qnil;
 	
@@ -42,6 +43,7 @@ static VALUE PCSC_IoRequest_get_protocol(VALUE self) {
  */
 static VALUE PCSC_IoRequest_set_protocol(VALUE self, VALUE rbProtocol) {
 	SCARD_IO_REQUEST *request;
+	
 	Data_Get_Struct(self, SCARD_IO_REQUEST, request);
 	if(request == NULL) return self;
 	
@@ -70,6 +72,8 @@ void Init_PCSC_IoRequest() {
 
 /* 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;	
+
 	if(TYPE(rbIoRequest) == T_NIL || TYPE(rbIoRequest) == T_FALSE) {
 		*io_request = NULL;
 		return 1;
@@ -77,7 +81,6 @@ 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;
 	
-	SCARD_IO_REQUEST *request;	
 	Data_Get_Struct(rbIoRequest, SCARD_IO_REQUEST, request);
 	*io_request = request;
 	return 1;

data/ext/smartcard_pcsc/pcsc_multi_strings.c

@@ -3,14 +3,16 @@
 
 /* Converts a multi-string "str1\0str_2\0str3\0\0" into a Ruby array of Ruby strings. */
 VALUE PCSC_Internal_multistring_to_ruby_array(char *mstr, size_t mstr_len) {
-	VALUE rbArray = rb_ary_new();
-	int i = 0;
-	for(; i < mstr_len; i++) {
+	VALUE rbArray, rbString;
+	size_t i, start_offset;
+	
+	rbArray = rb_ary_new();
+	for(i = 0; i < mstr_len; i++) {
 		if(mstr[i] == '\0') break;
-		int start_offset = i;
+		start_offset = i;
 		for(; i < mstr_len; i++)
 			if(mstr[i] == '\0') break;
-		VALUE rbString = rb_str_new(mstr + start_offset, i - start_offset);
+		rbString = rb_str_new(mstr + start_offset, i - start_offset);
 		rb_ary_push(rbArray, rbString);
 	}
 	return rbArray;
@@ -21,6 +23,10 @@ VALUE PCSC_Internal_multistring_to_ruby_array(char *mstr, size_t mstr_len) {
  * If false is returned, something went wrong and the method did not return a buffer. 
  */
 int PCSC_Internal_ruby_strings_to_multistring(VALUE rbStrings, char **strings) {
+	VALUE *array_elements;
+	char *buffer;
+	size_t string_length, array_length, buffer_length, i;
+	
 	/* nil -> NULL */ 
 	if(TYPE(rbStrings) == T_NIL || TYPE(rbStrings) == T_FALSE) {
 		*strings = NULL;
@@ -28,8 +34,8 @@ int PCSC_Internal_ruby_strings_to_multistring(VALUE rbStrings, char **strings) {
 	}
 	/* string -> [string] */
 	if(TYPE(rbStrings) == T_STRING) {
-		size_t string_length = RSTRING(rbStrings)->len; 
-		char *buffer = ALLOC_N(char, string_length + 2);
+		string_length = RSTRING(rbStrings)->len; 
+		buffer = ALLOC_N(char, string_length + 2);
 		memcpy(buffer, RSTRING(rbStrings)->ptr, string_length);
 		buffer[string_length] = buffer[string_length + 1] = '\0';
 		*strings = buffer;
@@ -38,20 +44,19 @@ int PCSC_Internal_ruby_strings_to_multistring(VALUE rbStrings, char **strings) {
 	/* array -> array */
 	if(TYPE(rbStrings) == T_ARRAY) {
 		/* compute buffer length */
-		size_t array_length = RARRAY(rbStrings)->len;
-		VALUE *array_elements = RARRAY(rbStrings)->ptr;
-		size_t buffer_length = 1; /* for the trailing '\0' */
-		int i = 0;
-		for(; i < array_length; i++) {
+		array_length = RARRAY(rbStrings)->len;
+		array_elements = RARRAY(rbStrings)->ptr;
+		buffer_length = 1; /* for the trailing '\0' */
+		for(i = 0; i < array_length; i++) {
 			if(TYPE(array_elements[i]) != T_STRING)
 				return 0;
 			buffer_length += RSTRING(array_elements[i])->len + 1; 
 		}
 		
 		/* concatenate strings into buffer */
-		char *buffer = ALLOC_N(char, buffer_length);
+		buffer = ALLOC_N(char, buffer_length);
 		for(buffer_length = 0, i = 0; i < array_length; i++) {
-			size_t string_length = RSTRING(array_elements[i])->len;
+			string_length = RSTRING(array_elements[i])->len;
 			memcpy(buffer + buffer_length, RSTRING(array_elements[i])->ptr, string_length);
 			buffer[buffer_length] = '\0';
 			buffer_length += string_length + 1;
@@ -63,3 +68,15 @@ int PCSC_Internal_ruby_strings_to_multistring(VALUE rbStrings, char **strings) {
 	
 	return 0;
 }
+
+#if defined(WIN32)
+char scard_error_buffer[128];
+
+/* Produces a string for an error code yielded by the SCard* PC/SC functions. Returns a static global buffer. */
+char *pcsc_stringify_error(DWORD scard_error) {
+	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+		NULL, scard_error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+        scard_error_buffer, sizeof(scard_error_buffer), NULL );
+	return scard_error_buffer;
+}
+#endif

data/ext/smartcard_pcsc/pcsc_reader_states.c

@@ -10,10 +10,10 @@ struct PCSCReaderStates {
 
 /* Custom free for Smartcard::PCSC::ReaderStates. Also releases the referenced buffers (for the reader names). */
 static void PCSC_ReaderStates_free(struct PCSCReaderStates *_states) {
+	size_t i;
 	if(_states != NULL) {
 		if(_states->states != NULL) {
-			size_t i = 0;
-			for(; i < _states->states_count; i++) {
+			for(i = 0; i < _states->states_count; i++) {
 				if(_states->states[i].szReader != NULL)
 					xfree((char *)_states->states[i].szReader);
 			}
@@ -42,15 +42,16 @@ static VALUE PCSC_ReaderStates_alloc(VALUE klass) {
  */
 static VALUE PCSC_ReaderStates_initialize(VALUE self, VALUE rbNumStates) {
 	struct PCSCReaderStates *states;	
+	size_t states_count, i;
+	
 	Data_Get_Struct(self, struct PCSCReaderStates, states);
 	
-	size_t states_count = NUM2UINT(rbNumStates);
+	states_count = NUM2UINT(rbNumStates);
 	if(states_count > 0) {
 		states->states = ALLOC_N(SCARD_READERSTATE, states_count);
 		if(states->states != NULL) {
 			states->states_count = states_count;
-			size_t i = 0;
-			for(; i < states_count; i++) {
+			for(i = 0; i < states_count; i++) {
 				states->states[i].szReader = NULL;
 				states->states[i].dwCurrentState = SCARD_STATE_UNAWARE;
 			}
@@ -86,6 +87,7 @@ static int _validate_readerstates_args(VALUE rbReaderStates, VALUE rbIndex, stru
 static VALUE PCSC_ReaderStates_current_state_of(VALUE self, VALUE rbIndex) {
 	struct PCSCReaderStates *states;
 	size_t index;
+	
 	if(_validate_readerstates_args(self, rbIndex, &states, &index) == 0)
 		return Qnil;
 	
@@ -106,6 +108,7 @@ static VALUE PCSC_ReaderStates_current_state_of(VALUE self, VALUE rbIndex) {
 static VALUE PCSC_ReaderStates_event_state_of(VALUE self, VALUE rbIndex) {
 	struct PCSCReaderStates *states;
 	size_t index;
+	
 	if(_validate_readerstates_args(self, rbIndex, &states, &index) == 0)
 		return Qnil;
 	
@@ -126,6 +129,7 @@ static VALUE PCSC_ReaderStates_event_state_of(VALUE self, VALUE rbIndex) {
 static VALUE PCSC_ReaderStates_set_current_state_of(VALUE self, VALUE rbIndex, VALUE rbCurrentState) {
 	struct PCSCReaderStates *states;
 	size_t index;
+	
 	if(_validate_readerstates_args(self, rbIndex, &states, &index) == 0)
 		return self;
 
@@ -146,6 +150,7 @@ static VALUE PCSC_ReaderStates_set_current_state_of(VALUE self, VALUE rbIndex, V
 static VALUE PCSC_ReaderStates_set_event_state_of(VALUE self, VALUE rbIndex, VALUE rbEventState) {
 	struct PCSCReaderStates *states;
 	size_t index;
+	
 	if(_validate_readerstates_args(self, rbIndex, &states, &index) == 0)
 		return self;
 
@@ -167,6 +172,7 @@ static VALUE PCSC_ReaderStates_set_event_state_of(VALUE self, VALUE rbIndex, VAL
 static VALUE PCSC_ReaderStates_atr_of(VALUE self, VALUE rbIndex) {
 	struct PCSCReaderStates *states;
 	size_t index;
+	
 	if(_validate_readerstates_args(self, rbIndex, &states, &index) == 0)
 		return Qnil;
 	
@@ -186,10 +192,12 @@ static VALUE PCSC_ReaderStates_atr_of(VALUE self, VALUE rbIndex) {
 static VALUE PCSC_ReaderStates_set_atr_of(VALUE self, VALUE rbIndex, VALUE rbAtr) {
 	struct PCSCReaderStates *states;
 	size_t index;
+	VALUE rbFinalAtr;
+	
 	if(_validate_readerstates_args(self, rbIndex, &states, &index) == 0)
 		return self;
 	
-	VALUE rbFinalAtr = rb_check_string_type(rbAtr);
+	rbFinalAtr = rb_check_string_type(rbAtr);
 	if(NIL_P(rbFinalAtr))
 		return self;
 
@@ -215,6 +223,7 @@ static VALUE PCSC_ReaderStates_set_atr_of(VALUE self, VALUE rbIndex, VALUE rbAtr
 static VALUE PCSC_ReaderStates_reader_name_of(VALUE self, VALUE rbIndex) {
 	struct PCSCReaderStates *states;
 	size_t index;
+	
 	if(_validate_readerstates_args(self, rbIndex, &states, &index) == 0)
 		return Qnil;
 	
@@ -233,15 +242,17 @@ static VALUE PCSC_ReaderStates_reader_name_of(VALUE self, VALUE rbIndex) {
  */
 static VALUE PCSC_ReaderStates_set_reader_name_of(VALUE self, VALUE rbIndex, VALUE rbReaderName) {
 	struct PCSCReaderStates *states;
-	size_t index;
+	size_t index, reader_name_length;
+	VALUE rbFinalReaderName;
+	
 	if(_validate_readerstates_args(self, rbIndex, &states, &index) == 0)
 		return self;
 	
-	VALUE rbFinalReaderName = rb_check_string_type(rbReaderName);
+	rbFinalReaderName = rb_check_string_type(rbReaderName);
 	if(NIL_P(rbFinalReaderName))
 		return self;
 
-	size_t reader_name_length = RSTRING(rbFinalReaderName)->len;
+	reader_name_length = RSTRING(rbFinalReaderName)->len;
 	if(states->states[index].szReader != NULL)
 		xfree((char *)states->states[index].szReader);
 	states->states[index].szReader = ALLOC_N(char, reader_name_length + 1);
@@ -261,11 +272,12 @@ static VALUE PCSC_ReaderStates_set_reader_name_of(VALUE self, VALUE rbIndex, VAL
  * (and thus prepare for a new call). 
  */
 static VALUE PCSC_ReaderStates_acknowledge_events(VALUE self) {
-	struct PCSCReaderStates *states;	
+	struct PCSCReaderStates *states;
+	size_t i;
+	
 	Data_Get_Struct(self, struct PCSCReaderStates, states);
 	if(states != NULL) {
-		size_t i = 0;
-		for(; i < states->states_count; i++)
+		for(i = 0; i < states->states_count; i++)
 			states->states[i].dwCurrentState = states->states[i].dwEventState; 
 	}
 	return self;
@@ -297,6 +309,8 @@ void Init_PCSC_ReaderStates() {
 
 /* Retrieves the SCARD_READERSTATE array wrapped into a Smartcard::PCSC::ReaderStates instance. */
 int _PCSC_ReaderStates_lowlevel_get(VALUE rbReaderStates, SCARD_READERSTATE **reader_states, size_t *reader_states_count) {
+	struct PCSCReaderStates *states;	
+
 	if(TYPE(rbReaderStates) == T_NIL || TYPE(rbReaderStates) == T_FALSE) {
 		*reader_states = NULL;
 		*reader_states_count = 0;
@@ -305,7 +319,6 @@ int _PCSC_ReaderStates_lowlevel_get(VALUE rbReaderStates, SCARD_READERSTATE **re
 	if(TYPE(rbReaderStates) != T_DATA || RDATA(rbReaderStates)->dfree != (void (*)(void *))PCSC_ReaderStates_free)
 		return 0;
 	
-	struct PCSCReaderStates *states;	
 	Data_Get_Struct(rbReaderStates, struct PCSCReaderStates, states);
 	*reader_states = states->states;
 	*reader_states_count = states->states_count;

data/smartcard.gemspec

@@ -0,0 +1,53 @@
+
+# Gem::Specification for Smartcard-0.2.0
+# Originally generated by Echoe
+
+Gem::Specification.new do |s|
+  s.name = %q{smartcard}
+  s.version = "0.2.0"
+  s.date = %q{2007-11-18}
+  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.authors = ["Victor Costan"]
+  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"]
+  s.test_files = ["test/test_all.rb"]
+  s.extensions = ["ext/smartcard_pcsc/extconf.rb"]
+end
+
+
+# # Original Rakefile source (requires the Echoe gem):
+# 
+# # Needs the 'echoe' gem
+# require 'echoe'
+# 
+# Echoe.new('smartcard') do |p|
+#   p.project = 'smartcard' # rubyforge project
+#   
+#   p.author = 'Victor Costan'
+#   p.email = 'victor@costan.us'
+#   p.summary = 'Interface with ISO 7816 smart cards.'
+#   p.url = 'http://www.costan.us/smartcard'
+#   
+#   p.need_tar_gz = false
+#   p.clean_pattern += ['ext/**/*.manifest', 'ext/**/*_autogen.h']
+#   
+#   p.eval = proc do |p|
+#     case RUBY_PLATFORM
+#     when /mswin/
+#       p.files += ['lib/smartcard/pcsc.so']
+#       p.platform = Gem::Platform::WIN32
+# 
+#       # take out the extension info from the gemspec
+#       task :postcompile_hacks => [:compile] do
+#         p.extensions.clear
+#       end
+# 
+#       task :package => [ :clean, :compile, :postcompile_hacks ]
+#     end
+#   end
+# end

metadata

@@ -3,16 +3,17 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: smartcard
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2007-11-16 00:00:00 -05:00
+  version: 0.2.0
+date: 2007-11-18 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: 
-description: 
-autorequire: smartcard
+rubyforge_project: smartcard
+description: Interface with ISO 7816 smart cards.
+autorequire: 
 default_executable: 
 bindir: bin
 has_rdoc: true
@@ -29,8 +30,7 @@ post_install_message:
 authors: 
 - Victor Costan
 files: 
-- lib/smartcard.rb
-- ext/smartcard_pcsc
+- CHANGELOG
 - ext/smartcard_pcsc/extconf.rb
 - ext/smartcard_pcsc/pcsc.h
 - ext/smartcard_pcsc/pcsc_card.c
@@ -43,9 +43,15 @@ files:
 - 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
-test_files: []
-
+- Manifest
+- smartcard.gemspec
+test_files: 
+- test/test_all.rb
 rdoc_options: []
 
 extra_rdoc_files: []