mfrc522 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec95f072c266803e40c9178fba2435c8f113d5ab
-  data.tar.gz: 98eb6c503409371dcb7e25f7e61f02494c5c13b4
+  metadata.gz: 75d391fefaa44340237f219a9292de10b030f321
+  data.tar.gz: 9574c355eb6ccb2abb83930e064b0fe73cd52900
 SHA512:
-  metadata.gz: 23304b26becaed10dc250a013bc5a098894e9ce03f688986ca9fd403897bdf4472603aba2f7bc216bb26732a70c515c5f302c656e559a4fc2e6e51f5a8ec68a3
-  data.tar.gz: b8afd661c9ed6e8e898716e5c91bbfee19d373bb1287822f12fa8f42890d42e1cce1fc844312e312a52724a1f97ca58c5a53ad85215e12ac7931e12cd797cf88
+  metadata.gz: 0d46681cb3ad8bd8fa0b02e9c11c946d90e67e8eb7426da22242d5f3360cd7309b573b00285d0067c057ea98f805dd5d214f305ddd7987c76ca3ed0e92617dea
+  data.tar.gz: e814a5f7d9e10675d19f4f69d2d6e5de7c6ee95ec73085adf65ac990329b10b7341529c97b34c6608138d1869e1836fa7465f36dd7ed053c81fa2479f05b67b9

data/lib/iso144434.rb

@@ -156,7 +156,7 @@ class ISO144434 < PICC
 
     fsci = t0 & 0x0F # PICC buffer size integer
     y1 = (t0 >> 4) & 0x07 # Optional frame(TA, TB, TC) indicator
-    @fsc = FSCI_to_FSC[fsci] # Convert buffer size integer to bytes
+    @fsc = FSCI_to_FSC.fetch(fsci) # Convert buffer size integer to bytes
     dr = 0 # default baud rate 106kBd
     ds = 0
 

data/lib/mifare/des_fire.rb

@@ -115,7 +115,7 @@ module Mifare
       linear_record_file: 0x03, cyclic_record_file: 0x04
     }
 
-    FILE_ENCRYPTION = {plain: 0x00, mac: 0x01, encrypt: 0x03}
+    FILE_COMMUNICATION = {plain: 0x00, mac: 0x01, encrypt: 0x03}
 
     # value 0x00 ~ 0x0D are key numbers, 0x0E grants free access, 0x0F always denies access
     FILE_PERMISSION = Struct.new(:read_access, :write_access, :read_write_access, :change_access) do
@@ -134,7 +134,7 @@ module Mifare
 
     FILE_SETTING = Struct.new(
       :type,
-      :encryption,
+      :communication,
       :permission,
       # Data file only
       :size,
@@ -381,7 +381,7 @@ module Mifare
       same_key = (key_number == @authed)
 
       # Only Master Key can change its key type
-      key_number |= KEY_TYPE[new_key.cipher_suite] if @selected_app == 0
+      key_number |= KEY_TYPE.fetch(new_key.cipher_suite) if @selected_app == 0
 
       # XOR new key if we're using different one
       unless same_key
@@ -435,7 +435,7 @@ module Mifare
 
       file_setting = FILE_SETTING.new
       file_setting.type = FILE_TYPE.key(received_data.shift)
-      file_setting.encryption = FILE_ENCRYPTION.key(received_data.shift)
+      file_setting.communication = FILE_COMMUNICATION.key(received_data.shift)
       file_setting.permission = FILE_PERMISSION.new.import(received_data.shift(2).to_uint)
 
       case file_setting.type
@@ -457,7 +457,7 @@ module Mifare
 
     def change_file_setting(id, file_setting)
       buffer = []
-      buffer.append_uint(FILE_ENCRYPTION[file_setting.encryption], 1)
+      buffer.append_uint(FILE_COMMUNICATION.fetch(file_setting.communication), 1)
       buffer.append_uint(file_setting.permission.to_uint, 2)
 
       transceive(cmd: CMD_CHANGE_FILE_SETTING, plain_data: id, data: buffer, tx: :encrypt, rx: :cmac, expect: ST_SUCCESS)
@@ -465,7 +465,7 @@ module Mifare
 
     def create_file(id, file_setting)
       buffer = [id]
-      buffer.append_uint(FILE_ENCRYPTION[file_setting.encryption], 1)
+      buffer.append_uint(FILE_COMMUNICATION.fetch(file_setting.communication), 1)
       buffer.append_uint(file_setting.permission.to_uint, 2)
 
       case file_setting.type
@@ -493,12 +493,12 @@ module Mifare
     def read_file(id, cmd, data, length)
       file_setting = get_file_setting(id)
       length *= file_setting.record_size if file_setting.record_size
-      transceive(cmd: cmd, data: data, tx: :cmac, rx: convert_file_encryption(file_setting.encryption), expect: ST_SUCCESS, receive_all: true, receive_length: length)
+      transceive(cmd: cmd, data: data, tx: :cmac, rx: convert_file_communication(file_setting.communication), expect: ST_SUCCESS, receive_all: true, receive_length: length)
     end
 
     def write_file(id, cmd, plain_data, data)
       file_setting = get_file_setting(id)
-      transceive(cmd: cmd, plain_data: plain_data, data: data, tx: convert_file_encryption(file_setting.encryption), rx: :cmac, expect: ST_SUCCESS)
+      transceive(cmd: cmd, plain_data: plain_data, data: data, tx: convert_file_communication(file_setting.communication), rx: :cmac, expect: ST_SUCCESS)
     end
 
     def read_data(id, offset, length)
@@ -624,8 +624,8 @@ module Mifare
       end
     end
 
-    def convert_file_encryption(encryption)
-      case encryption
+    def convert_file_communication(communication)
+      case communication
       when :plain
         :cmac
       when :mac

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mfrc522
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - atitan