smartcard 0.1.0 → 0.1.1

data/ext/smartcard_pcsc/extconf.rb

@@ -1,22 +1,34 @@
 require 'mkmf'
+require 'pp'
 
+$CFLAGS ||= ''
 $LDFLAGS ||= ''
 
-pcsc_headers = []
-pcsc_defines = []
 if RUBY_PLATFORM =~ /darwin/
-  pcsc_headers += ['<PCSC/winscard.h>']
-  pcsc_headers += ['"pcsc_surrogate_wintypes.h"', '"pcsc_surrogate_reader.h"']
   $LDFLAGS += ' -framework PCSC'
 elsif RUBY_PLATFORM =~ /win/
-  pcsc_headers += ['<winscard.h>']
+  # TODO: no clue what to do here
 else
-  pcsc_headers += ['<winscard.h>']
+  # pcsc 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
+
+pcsc_defines = []
+
 File.open('pcsc_include.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')

data/ext/smartcard_pcsc/pcsc.h

@@ -3,6 +3,9 @@
 /* Generated by 'extconf.rb' to point to the PC/SC header. */
 #include "pcsc_include.h"
 
+/* Entrypoint into the Ruby extension. */
+void Init_pcsc();
+
 /* Namespace structure. */
 extern VALUE mSmartcard; /* Smartcard module / namespace */
 extern VALUE mPcsc; /* Smartcard::PCSC module / namespace */

data/ext/smartcard_pcsc/pcsc_card.c

@@ -263,7 +263,13 @@ static VALUE PCSC_Card_transmit(VALUE self, VALUE rbSendData, VALUE rbSendIoRequ
 		return Qnil;	
 	}
 	
-	DWORD recv_length = PCSCLITE_MAX_MESSAGE_SIZE; 
+#if defined(PCSCLITE_MAX_MESSAGE_SIZE)
+	DWORD recv_length = PCSCLITE_MAX_MESSAGE_SIZE;
+#elif defined(MAX_BUFFER_SIZE_EXTENDED)
+	DWORD recv_length = MAX_BUFFER_SIZE_EXTENDED;
+#else
+	DWORD recv_length = 65536;
+#endif
 	char *recv_buffer = ALLOC_N(char, recv_length);
 	if(recv_buffer == NULL) return Qnil;
 	

data/ext/smartcard_pcsc/pcsc_main.c

@@ -1,6 +1,6 @@
 #include "pcsc.h"
 
-void Init_smartcard_pcsc() {
+void Init_pcsc() {
 	Init_PCSC_Namespace();
 	Init_PCSC_ReaderStates();
 	Init_PCSC_IoRequest();

data/lib/smartcard.rb

@@ -1 +1 @@
-require 'smartcard_pcsc'
+require 'smartcard/pcsc'

data/tests/ts_pcsc_ext.rb

@@ -1,4 +1,5 @@
 require 'smartcard'
+require 'pp'
 
 def test_reader_states
   reader_states = Smartcard::PCSC::ReaderStates.new(2)
@@ -119,11 +120,15 @@ select_response = card0.transmit(select_apdu.map {|byte| byte.chr}.join(''), sen
 select_response_str = (0...select_response.length).map { |i| ' %02x' % select_response[i].to_i }.join('')
 puts "Response:#{select_response_str}\n"
 
-# This only works with GemPlus readers... any other suggestions?
-puts "Testing low-level control\n"
-ctl_string = [0x82, 0x01, 0x07, 0x00].map {|byte| byte.chr}.join('')
-ctl_response = card0.control 2049, ctl_string, 4
-pp ctl_response
+begin
+  # This only works with GemPlus readers... any other suggestions?
+  puts "Testing low-level control\n"
+  ctl_string = [0x82, 0x01, 0x07, 0x00].map {|byte| byte.chr}.join('')
+  ctl_response = card0.control 2049, ctl_string, 4
+  pp ctl_response
+rescue RuntimeError => e
+  puts "Card.control threw exception #{e}\n"
+end
 
 puts "Disconnecting and cleaning up\n"
 card0.disconnect Smartcard::PCSC::DISPOSITION_LEAVE

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: smartcard
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 date: 2007-11-16 00:00:00 -05:00
 summary: Interface with ISO 7816 smart cards.
 require_paths: