grizzly_ber 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7ae8c4643321026428536cfc08fed20ce944673
-  data.tar.gz: f0acebc235b93408dcb1623e2f848f73a0eb5b2d
+  metadata.gz: e1b181cdaf383957407f7ab5c1277d5afebbbbdc
+  data.tar.gz: a0d9f7ade92b3b805167ad4740169eab216b01ed
 SHA512:
-  metadata.gz: fcd71e845da7713695b9f22d23a76c7779ca85ffed32ae6b150ffe02b875b406c909b8ca8af52f58d6b406fb5a4068a9b4806da92f0a2df0b4f41868eb62b5b5
-  data.tar.gz: 1af7fa7e474446f1ab06732a6a1d7abef9d4776425b379b5ce2e328a969d43ccfd15fdd7c81be1c99cba1879970223951a44658eb350706e442572516df64772
+  metadata.gz: 07166fd51c1a96ef44bcea69a99b6b12d63bbac0d51143b4d0fc9cbd20ac44d722c8f1736c0c753f57ff6578e7f46a7a59ec4a49a0eb4c721c2235f35f0891dd
+  data.tar.gz: c26cdd7fc85f05e355fa18811da938cdc780d9b95922561753dc65f0369b2789dac0ddc9fb2ef98c16a358ef7c749d194e7ced3c6eb2be20800c3e0e769ae1f9

data/lib/grizzly_ber.rb

@@ -60,7 +60,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 +103,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 +120,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 +207,8 @@ class GrizzlyBer
 
   private
 
+  def is_erasure_byte(byte)
+    byte == 0x00 || (!@allow_FF_tags && byte == 0xFF)
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grizzly_ber
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan Balsdon