smartware 0.4.11 → 0.4.12

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dddf32a584b18a74383d3c9af10514be4d99308e
+  data.tar.gz: 6d3ff0e9a3f7db8ad32b5289458e32029e0bc707
+SHA512:
+  metadata.gz: 9c3ecd875a3496a23e8bc97d49773518fe0d249becf12cbf626ef4fb197d3e7dd6d2c51da3bc10778b18d9d0b55a871d0cb5d09e08798130e504dee23e3f9e66
+  data.tar.gz: a897ca6d6461396a6441b5545d9834f6c47a84dac598f7dd04e1535479782282689f1f8b4b5f75f130ab72c5343cbdc5f41358f76e6bdff7dc453011d8705519

data/lib/smartware/drivers/common/szzt_connection.rb

@@ -29,7 +29,9 @@ module Smartware
     protected
 
     def check_dsr!
-      if @io.dsr == 0
+      dsr = @io.dsr != 0 rescue true
+
+      if !dsr
         if @ready_for_commands
           Logging.logger.debug "SZZT: DSR low detected"
 

data/lib/smartware/drivers/pin_pad/zt588.rb

@@ -62,10 +62,11 @@ module Smartware
         }
 
         # Authentication data
-        UID = "0000000000000000"
+        UID = "\x11" * 8
 
         # Keys
-        KEY_TMK = 0x00
+        KEY_TMK = 0x20
+        KEY_TPK = 0x30
         KEY_IMK = 0x80
 
         # Key types, etc
@@ -192,11 +193,11 @@ module Smartware
             control MISC, ENABLE_INPUT
 
           when Interface::PinPad::INPUT_PIN
-            tpk = 0x40 + 8 * options[:key_set]
+            raise "unsupported key set" unless options[:key_set] == 0
             @plain_input = false
             @auto_stop = options[:length]
 
-            start_pin_input tpk, options[:format], 0, options[:length],
+            start_pin_input KEY_TPK, options[:format], 0, options[:length],
                             options[:pan]
 
           else
@@ -211,23 +212,10 @@ module Smartware
           @input_event.call :cancel
         end
 
-        def start_pin_input(key, format, hint_code, length, pan)
-          raise "unsupported PIN block format" unless PIN_TYPE_MAP.include? format
-
-          safe_command(START_PIN_INPUT,
-                       sprintf("%02X%c%d%02d%s",
-                               key,
-                               PIN_TYPE_MAP[format],
-                               hint_code,
-                               length,
-                               pan))
-        end
-
         def load_working_keys(set, tpk_under_tmk)
-          raise "unsupported key set" unless (0..7).include? set
+          raise "unsupported key set" unless set == 0
 
-          tpk = 0x40 + 8 * set
-          tpk_verify = load_encrypted_key tpk, KEY_TMK, KEY_TYPE_TPK, nil,
+          tpk_verify = load_encrypted_key KEY_TPK, KEY_TMK, KEY_TYPE_TPK, nil,
                                           tpk_under_tmk
 
           return tpk_verify
@@ -236,8 +224,6 @@ module Smartware
         def get_pin
           response = safe_command GET_PIN_VALUE
 
-          p response
-
           [
             response.slice(1, 2).to_i, # Track
             response.slice(3, 2).to_i, # Length
@@ -247,6 +233,18 @@ module Smartware
 
         private
 
+        def start_pin_input(key, format, hint_code, length, pan)
+          raise "unsupported PIN block format" unless PIN_TYPE_MAP.include? format
+
+          safe_command(START_PIN_INPUT,
+                       sprintf("%02X%c%d%02d%s",
+                               key,
+                               PIN_TYPE_MAP[format],
+                               hint_code,
+                               length,
+                               pan))
+        end
+
         def calculate_response(challenge, key)
           cipher = OpenSSL::Cipher.new('DES-ECB')
           cipher.encrypt
@@ -272,7 +270,7 @@ module Smartware
             KEY_LENGTH_TRIPLE
 
           else
-            raise "unsupported key length: #{data.bytes}"
+            raise "unsupported key length: #{data.length}"
           end
         end
 
@@ -406,21 +404,14 @@ module Smartware
               restart
 =end
             else
-              [0x10, 0x20, 0x30].each do |key|
-                p key
-                begin
-                  random    = auth AUTH_GET_CHALLENGE, "0000000000000000"
-                  challenge = auth key, random
-                  response  = calculate_response challenge, UID
-                  check     = calculate_response response, UID
-                  verify    = auth AUTH_WITH_TMK, response
-                  raise ZT588Error, "verification failed" if check != verify
-                  Logging.logger.debug "ZT588: authenticated"
-
-                  break
-                rescue => e
-                  p e
-                end
+              begin
+                random    = auth AUTH_GET_CHALLENGE, "0000000000000000"
+                challenge = auth KEY_TMK, random
+                response  = calculate_response challenge, UID
+                check     = calculate_response response, UID
+                verify    = auth AUTH_WITH_TMK, response
+                raise ZT588Error, "verification failed" if check != verify
+                Logging.logger.debug "ZT588: authenticated"
               end
 
               @device_ready.call

data/lib/smartware/interfaces/card_reader.rb

@@ -113,10 +113,13 @@ module Smartware
             end
           end
         rescue CardReaderError => e
-          Logging.logger.error "Card reader error: #{e}"
+          Logging.logger.error "Card reader error: #{e}" unless @state == :failure
 
-          @device.eject rescue nil
-          @device.accepting = false rescue nil
+          begin
+            @device.eject
+            @device.accepting = false
+          rescue CardReaderError => e
+          end
 
           @state = :failure
           update_status :error, e.code

data/lib/smartware/version.rb

@@ -1,3 +1,3 @@
 module Smartware
-  VERSION = "0.4.11"
+  VERSION = "0.4.12"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartware
 version: !ruby/object:Gem::Version
-  version: 0.4.11
-  prerelease: 
+  version: 0.4.12
 platform: ruby
 authors:
 - Evgeni Sudarchikov
@@ -11,182 +10,160 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-17 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartkiosk-common
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: serialport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cmux
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: digest-crc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: oily_png
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Smartware is the Smartkiosk hardware control daemon
@@ -249,26 +226,26 @@ files:
 - smartware.gemspec
 homepage: https://github.com/smartkiosk/smartware
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Smartware is the Smartkiosk hardware control daemon
 test_files: []
+has_rdoc: