grizzly_ber 1.0.7 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f7ae8c4643321026428536cfc08fed20ce944673
-  data.tar.gz: f0acebc235b93408dcb1623e2f848f73a0eb5b2d
+SHA256:
+  metadata.gz: 363bdd214a4f6ab85f7555590b98e79fecba9ee871ac0f14240f4925fb0a6049
+  data.tar.gz: 771e82bdcaed2d527870712c784a20c181dcbb27f18771e931e85acf50b679bd
 SHA512:
-  metadata.gz: fcd71e845da7713695b9f22d23a76c7779ca85ffed32ae6b150ffe02b875b406c909b8ca8af52f58d6b406fb5a4068a9b4806da92f0a2df0b4f41868eb62b5b5
-  data.tar.gz: 1af7fa7e474446f1ab06732a6a1d7abef9d4776425b379b5ce2e328a969d43ccfd15fdd7c81be1c99cba1879970223951a44658eb350706e442572516df64772
+  metadata.gz: 4caed519208405e3ff3a4c00351ebb1427e32181d2bb4a7ff48cc991011d2b94320c313b1afa9bd2881a6a246e0496f62d26f39b7f41c6f4b9059fc5814d8eb9
+  data.tar.gz: 13cb98e5a5f75ea43a501183487daacc87bb4e30447bcd6c4a712a077d24531dd4effc99e35dc09349629cc57b1d3bace67ef5e7cd6a30b9d84925394f64bed3

data/lib/grizzly_ber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'grizzly_tag'
 
 class GrizzlyBerElement
@@ -5,7 +7,7 @@ class GrizzlyBerElement
 
   def initialize(byte_array = [])
     raise ArgumentError, "byte_array must be of type Array" unless byte_array.is_a?(Array)
-    @tag = "" # is an uppercase hex string
+    @tag = +"" # is an uppercase hex string
     @value = nil # is a byte array if this is a data element or a GrizzlyBer if it's a sequence element
     decode_value decode_length decode_tag byte_array
   end
@@ -60,7 +62,6 @@ class GrizzlyBerElement
   end
 
   def decode_tag(byte_array)
-    byte_array.shift while byte_array.size > 0 and (byte_array[0] == 0x00 or byte_array[0] == 0xFF)
     return [] if byte_array.size < 1
 
     first_byte = byte_array.shift
@@ -104,9 +105,13 @@ end
 class GrizzlyBer
   include Enumerable
 
-  def initialize(hex_string = "")
+  class ParsingError < StandardError
+  end
+
+  def initialize(hex_string = "", allow_FF_tags: false)
     raise ArgumentError, "hex_string must be a valid hex string" unless hex_string.is_a? String and hex_string.size.even? and hex_string =~ /^[0-9A-F]*$/
     @elements = [] # is an array of GrizzlyBerElement
+    @allow_FF_tags = allow_FF_tags
     from_ber_hex_string(hex_string)
   end
 
@@ -117,11 +122,14 @@ class GrizzlyBer
 
   def from_ber(byte_array)
     raise ArgumentError, "byte_array must be an array of bytes" unless byte_array.is_a? Array and byte_array.all? {|byte| byte.is_a? Integer and byte <= 0xFF}
-    while byte_array.size > 0
+    while byte_array.any?
+      byte_array.shift while byte_array.any? && is_erasure_byte(byte_array[0])
+      break if byte_array.empty?
       element = GrizzlyBerElement.new(byte_array)
-      break if element.tag.nil? or element.value.nil?
+      raise ParsingError if element.tag.nil? or element.value.nil?
       @elements << element
     end
+    raise ParsingError if byte_array.any?
     self
   end
 
@@ -201,5 +209,8 @@ class GrizzlyBer
 
   private
 
+  def is_erasure_byte(byte)
+    byte == 0x00 || (!@allow_FF_tags && byte == 0xFF)
+  end
 
 end

data/lib/grizzly_tag.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GrizzlyTag
   def self.new_tag(params)
     params[:format] ||= :binary

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grizzly_ber
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.1
 platform: ruby
 authors:
 - Ryan Balsdon
@@ -18,27 +18,29 @@ extra_rdoc_files: []
 files:
 - lib/grizzly_ber.rb
 - lib/grizzly_tag.rb
-homepage: ''
+homepage: https://github.com/Shopify/grizzly_ber
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
+  homepage_uri: https://github.com/Shopify/grizzly_ber
+  source_code_uri: https://github.com/Shopify/grizzly_ber
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 3.5.7
 signing_key: 
 specification_version: 4
 summary: Fiercest TLV-BER parser