zsteg 0.1.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 68101c2a1131eef8343b68bc8176274d0d8d0a3e
-  data.tar.gz: 090dabdfd430f5ef61dd2f70c84610842bdfffea
+SHA256:
+  metadata.gz: 03b8c9494bd4dfb5953973438b62cd909abb1a0d6fc46363928e9a3773e1e47a
+  data.tar.gz: a46faa826bc3781860881b4c15d9e6c04fb86da6dedfd5df2487f62fa09fcbf1
 SHA512:
-  metadata.gz: fa1a8dd3e81074ce70c3019d08f27d33a31b245b0f2ca12b7f28c2824a08fac1c0740b3bdcdcd86f83e38888267c6f0524a590b3dc1511ea62702468a308a76e
-  data.tar.gz: c0f4e62456de78b373695f2cbd0f8ae4ea1e9c13f959a5554f0472eb7d35847c039331a5c5ea724fcbcfed1c80db09903f17c6428bb08bafd7ad0b224d8eb202
+  metadata.gz: 5f4243a62114c5098d56c59d273deaff5addf89b334377ba0d63032a6aee9759720ff3772805ae6a445179d3487a40b436024cc1c431f9a723e8de5140e2f683
+  data.tar.gz: 86eed1938f6c92812ab461f25b8647a25034e06b1b8c23b81187c253ef987de84d49a5e6d1521874fc480cf9cbe136559d921ab91ea8d2501383a13688dcb49d

data/Gemfile

@@ -1,10 +1,10 @@
 source "http://rubygems.org"
 
-gem 'zpng', ">= 0.2.3"
+gem 'zpng', ">= 0.3.1"
 gem "iostruct"
 
 group :development do
-  gem "rspec",   ">= 2.8.0"
-  gem "bundler", ">= 1.0.0"
-  gem "jeweler", "~> 1.8.4"
+  gem "rspec",   "~> 3.9.0"
+  gem "bundler", "~> 2.2.3"
+  gem "jeweler", "~> 2.3.9"
 end

data/Gemfile.lock

@@ -1,68 +1,85 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.5)
-    builder (3.2.2)
-    diff-lcs (1.1.3)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    git (1.2.6)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
-      oauth2
-    hashie (2.0.5)
-    highline (1.6.19)
-    httpauth (0.2.0)
-    iostruct (0.0.1)
-    jeweler (1.8.7)
+    addressable (2.4.0)
+    builder (3.2.4)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.4.4)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.8.1)
+      rchardet (~> 1.8)
+    github_api (0.16.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashie (4.1.0)
+    highline (2.0.3)
+    iostruct (0.0.4)
+    jeweler (2.3.9)
       builder
-      bundler (~> 1.0)
+      bundler
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api (~> 0.16.0)
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
+      psych
       rake
       rdoc
-    json (1.8.0)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    multi_json (1.8.0)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+      semver2
+    jwt (2.2.2)
+    mime-types (2.99.3)
+    mini_portile2 (2.5.0)
+    multi_json (1.15.0)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.5.2)
-    rainbow (1.1.4)
-    rake (10.1.0)
-    rdoc (4.0.1)
-      json (~> 1.4)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
-    zpng (0.2.3)
+      rack (>= 1.2, < 3)
+    psych (3.3.0)
+    racc (1.5.2)
+    rack (2.2.3)
+    rainbow (3.0.0)
+    rake (13.0.3)
+    rchardet (1.8.0)
+    rdoc (6.3.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.4)
+    semver2 (3.4.2)
+    thread_safe (0.3.6)
+    zpng (0.3.2)
       rainbow
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.0.0)
+  bundler (~> 2.2.3)
   iostruct
-  jeweler (~> 1.8.4)
-  rspec (>= 2.8.0)
-  zpng (>= 0.2.3)
+  jeweler (~> 2.3.9)
+  rspec (~> 3.9.0)
+  zpng (>= 0.3.1)
+
+BUNDLED WITH
+   2.2.3

data/README.md

@@ -29,17 +29,26 @@ Usage
     Usage: zsteg [options] filename.png [param_string]
     
         -c, --channels X                 channels (R/G/B/A) or any combination, comma separated
-                                         valid values: r,g,b,a,rg,rgb,bgr,rgba,...
+                                         valid values: r,g,b,a,rg,bgr,rgba,r3g2b3,...
         -l, --limit N                    limit bytes checked, 0 = no limit (default: 256)
-        -b, --bits N                     number of bits (1..8), single value or '1,3,5' or '1-8'
+        -b, --bits N                     number of bits, single int value or '1,3,5' or range '1-8'
+                                         advanced: specify individual bits like '00001110' or '0x88'
             --lsb                        least significant BIT comes first
             --msb                        most significant BIT comes first
         -P, --prime                      analyze/extract only prime bytes/pixels
+            --invert                     invert bits (XOR 0xff)
         -a, --all                        try all known methods
         -o, --order X                    pixel iteration order (default: 'auto')
                                          valid values: ALL,xy,yx,XY,YX,xY,Xy,bY,...
         -E, --extract NAME               extract specified payload, NAME is like '1b,rgb,lsb'
     
+            --[no-]file                  use 'file' command to detect data type (default: YES)
+            --no-strings                 disable ASCII strings finding (default: enabled)
+        -s, --strings X                  ASCII strings find mode: first, all, longest, none
+                                         (default: first)
+        -n, --min-str-len X              minimum string length (default: 8)
+            --shift N                    prepend N zero bits
+    
         -v, --verbose                    Run verbosely (can be used multiple times)
         -q, --quiet                      Silent any warnings (can be used multiple times)
         -C, --[no-]color                 Force (or disable) color output (default: auto)
@@ -54,7 +63,8 @@ Examples
 
     # zsteg flower_rgb3.png
 
-    3b,rgb,lsb,xy       .. text: "SuperSecretMessage"
+    imagedata           .. file: 370 XA sysV pure executable not stripped - version 768
+    b3,rgb,lsb,xy       .. text: "SuperSecretMessage"
 
 ### Multi-result file
 
@@ -65,16 +75,34 @@ Examples
     meta A              .. [same as "meta F"]
     meta date:create    .. text: "2012-03-15T23:32:46+07:00"
     meta date:modify    .. text: "2012-03-15T23:32:14+07:00"
-    1b,r,lsb,xy         .. text: "Second cat is Marussia"
-    1b,g,lsb,xy         .. text: "Good, but look a bit deeper..."
-    1b,bgr,lsb,xy       .. text: "MF_WIhf>"
-    2b,g,lsb,xy         .. text: "VHello, third kitten is Bessy"
+    imagedata           .. file: 68K BCS executable
+    b1,r,lsb,xy         .. text: "Second cat is Marussia"
+    b1,g,lsb,xy         .. text: "Good, but look a bit deeper..."
+    b1,bgr,lsb,xy       .. text: "MF_WIhf>"
+    b2,g,lsb,xy         .. text: "VHello, third kitten is Bessy"
 
 ### wbStego even distributed
 
     # zsteg wbstego/wbsteg_noenc_even.bmp 1b,lsb,bY -v
 
-    1b,lsb,bY           .. <wbStego size=22, data="xtSuperSecretMessage\n", even=true, mix=true, controlbyte="t">
+    imagedata           .. file: FoxPro FPT, blocks size 1, next free block index 65537
+        00000000: 00 01 00 01 00 00 00 01  00 00 00 00 00 00 00 00  |................|
+        00000010: 00 00 00 00 00 00 00 00  00 00 00 01 00 01 01 00  |................|
+        00000020: 00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|
+        00000030: 00 01 01 01 00 01 00 00  00 00 00 00 01 01 00 01  |................|
+        00000040: 01 00 01 01 00 01 00 01  00 01 01 01 01 00 00 00  |................|
+        00000050: 00 00 00 01 01 01 01 00  01 00 01 00 00 00 00 01  |................|
+        00000060: 00 00 01 01 01 00 00 01  00 01 01 01 00 01 00 00  |................|
+        00000070: 01 01 01 00 01 00 00 00  00 00 01 01 01 00 00 00  |................|
+        00000080: 00 01 00 01 00 00 01 01  01 01 00 00 00 01 01 00  |................|
+        00000090: 00 01 00 01 00 01 01 00  01 00 00 01 00 01 00 00  |................|
+        000000a0: 00 01 01 01 00 01 00 01  01 01 00 01 00 00 00 01  |................|
+        000000b0: 01 00 01 00 00 01 00 01  00 01 01 01 00 00 00 00  |................|
+        000000c0: 01 00 00 00 00 01 00 00  01 01 00 00 01 00 00 00  |................|
+        000000d0: 00 00 01 00 00 01 01 01  00 01 01 00 00 01 00 01  |................|
+        000000e0: 01 01 01 01 01 01 01 00  00 00 00 00 01 00 00 00  |................|
+        000000f0: 00 01 01 01 00 00 01 00  00 00 01 01 00 01 00 01  |................|
+    b1,lsb,bY           .. <wbStego size=22, data="xtSuperSecretMessage\n", even=true, mix=true, controlbyte="t">
         00000000: 51 00 00 16 00 00 74 0d  b5 78 1e a1 39 74 e8 38  |Q.....t..x..9t.8|
         00000010: 53 c6 56 94 75 d1 a5 70  84 c8 27 65 fe 08 72 35  |S.V.u..p..'e..r5|
         00000020: 1f 3e 53 5d a7 65 8b 6e  3b 63 6b 1d bf 72 ee 27  |.>S].e.n;ck..r.'|
@@ -86,7 +114,7 @@ Examples
 
     # zsteg wbstego/wbsteg_blowfish_pass_1.bmp 1b,lsb,bY -v
 
-    1b,lsb,bY           .. <wbStego size=26, data="\rC\xF5\xBF#\xFF[6\e\xB3"..., even=false, hdr="\x01", enc="Blowfish">
+    b1,lsb,bY           .. <wbStego size=26, data="\rC\xF5\xBF#\xFF[6\e\xB3"..., even=false, hdr="\x01", enc="Blowfish">
         00000000: 1a 00 00 00 ff 01 01 0d  43 f5 bf 23 ff 5b 36 1b  |........C..#.[6.|
         00000010: b3 17 42 4a 3f ba eb c7  ee 9c d7 7a 2b           |..BJ?......z+   |
 
@@ -94,7 +122,7 @@ Examples
 
     # zsteg ndh2k12_sp113.bmp -b 1 -o yx -v
 
-    1b,rgb,lsb,yx       .. zlib: data="%PDF-1.4\n%\xC3\xA4\xC3\xBC\xC3\xB6\xC3\x9F\n2 0 obj\n<</Length 3 0 R/Filter/FlateDecode>>\nstream\nx\x9C\x8DT\xC9n\xDB@\f\xBD\xCFW\xF0\x1C \x13\x92\xB3\x03\x86\x80\xC8K\xD1\xDE\\\b\xE8\xA1\xE8)K\x8B\xA2n\x91\\\xF2\xFB!5Zl\xD5v\v\x01\xD4\x90C\xBE\xF7\x86\x1A\n-\xC1\x9By\x01\x94'\x94`=d\xCF\xF0\xFA\x04_n\xE0\xF7\x10Gx\xFDn\xDA\xCE\xB0\x8F6\x80s$Y\xDD#\xDC\xED\b\x1CC\xF7\xBCBBF\x87^\xDE\xA1\xE9~\x9Amg\xF6\x8BZ\xCAYj", offset=4
+    b1,rgb,lsb,yx       .. zlib: data="%PDF-1.4\n%\xC3\xA4\xC3\xBC\xC3\xB6\xC3\x9F\n2 0 obj\n<</Length 3 0 R/Filter/FlateDecode>>\nstream\nx\x9C\x8DT\xC9n\xDB@\f\xBD\xCFW\xF0\x1C \x13\x92\xB3\x03\x86\x80\xC8K\xD1\xDE\\\b\xE8\xA1...", offset=4, size=186
         00000000: 00 02 eb 9b 78 9c d4 b9  65 54 24 cc 92 36 58 b8  |....x...eT$..6X.|
         00000010: d3 68 e3 ee ee 4e e3 ee  ee 0e 85 bb 3b dd 68 23  |.h...N......;.h#|
         00000020: 8d bb bb bb 3b 8d bb bb  3b 34 ee 6e 1f ef 7b ef  |....;...;4.n..{.|
@@ -112,6 +140,11 @@ Examples
         000000e0: fd bb 13 a9 e6 3a c9 da  19 34 ae f0 43 bb 90 90  |.....:...4..C...|
         000000f0: 58 88 de 46 ce 91 6f aa  8d d9 7d b8 d6 88 a6 65  |X..F..o...}....e|
 
+See also
+--------
+1. https://29a.ch/photo-forensics/
+2. https://holloway.nz/steg/
+
 License
 -------
 Released under the MIT License.  See the [LICENSE](https://github.com/zed-0xff/zsteg/blob/master/LICENSE.txt) file for further details.

data/README.md.tpl

@@ -49,6 +49,11 @@ Examples
 
 % zsteg ndh2k12_sp113.bmp -b 1 -o yx -v
 
+See also
+--------
+1. https://29a.ch/photo-forensics/
+2. https://holloway.nz/steg/
+
 License
 -------
 Released under the MIT License.  See the [LICENSE](https://github.com/zed-0xff/zsteg/blob/master/LICENSE.txt) file for further details.

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.3

data/lib/zsteg/checker.rb

@@ -310,6 +310,8 @@ module ZSteg
         show_result result, params
       end
       if data.size > 0 && !result.is_a?(Result::OneChar) && !result.is_a?(Result::WholeText)
+        # newline if no results and want hexdump
+        puts if !result || result == []
         limit = (params[:limit] || @params[:limit]).to_i
         t = limit > 0 ? data[0,limit] : data
         print ZPNG::Hexdump.dump(t){ |x| x.prepend(" "*4) }
@@ -383,7 +385,7 @@ module ZSteg
 #        t = data.
 #          encode('UTF-16', 'UTF-8', :invalid => :replace, :replace => '').
 #          encode!('UTF-8', 'UTF-16')
-#        r = t.scan(/\p{Word}{#{MIN_TEXT_LENGTH},}/)
+#        r = t.scan(/\p{Word}{#{DEFAULT_MIN_STR_LEN},}/)
 #        r if r.any?
 #      rescue
 #      end

data/lib/zsteg/checker/scanline_checker.rb

@@ -1,3 +1,4 @@
+#coding: binary
 module ZSteg
   class Checker
     module ScanlineChecker

data/lib/zsteg/checker/wbstego.rb

@@ -1,3 +1,4 @@
+#coding: binary
 module ZSteg
   class Checker
     module WBStego

data/lib/zsteg/cli/cli.rb

@@ -112,6 +112,10 @@ module ZSteg
           @options[:min_str_len] = x
         end
 
+        opts.on "--shift N", Integer, "prepend N zero bits" do |x|
+          @options[:shift] = x
+        end
+
         opts.separator ""
         opts.on "-v", "--verbose", "Run verbosely (can be used multiple times)" do |v|
           @options[:verbose] += 1
@@ -120,7 +124,11 @@ module ZSteg
           @options[:verbose] -= 1
         end
         opts.on "-C", "--[no-]color", "Force (or disable) color output (default: auto)" do |x|
-          Sickill::Rainbow.enabled = x
+          if defined?(Rainbow) && Rainbow.respond_to?(:enabled=)
+            Rainbow.enabled = x
+          else
+            Sickill::Rainbow.enabled = x
+          end
         end
         opts.separator "\nPARAMS SHORTCUT\n"+
           "\tzsteg fname.png 2b,b,lsb,xy  ==>  --bits 2 --channel b --lsb --order xy"
@@ -201,6 +209,8 @@ module ZSteg
           h[:order] = x
         when 'prime'
           h[:prime] = true
+        when 'zlib'
+          h[:zlib] = true
         else
           raise "uknown param #{x.inspect}"
         end
@@ -219,6 +229,8 @@ module ZSteg
         # zlib stream may contain extradata
         @img.imagedata
         @img.extradata[$1.to_i]
+      when /imagedata/
+        @img.imagedata
       else
         h = decode_param_string name
         h[:limit] = @options[:limit] if @options[:limit] != Checker::DEFAULT_LIMIT
@@ -234,7 +246,15 @@ module ZSteg
     end
 
     def extract name
-      print _extract_data(name)
+      data = _extract_data(name)
+      if name['zlib']
+        if r = Checker::Zlib.check_data(data)
+          data = r.data
+        else
+          raise "cannot decompress with zlib"
+        end
+      end
+      print data
     end
 
   end

data/lib/zsteg/cli/mask.rb

@@ -77,7 +77,11 @@ module ZSteg
           @options[:verbose] -= 1
         end
         opts.on "-C", "--[no-]color", "Force (or disable) color output (default: auto)" do |x|
-          Sickill::Rainbow.enabled = x
+          if defined?(Rainbow) && Rainbow.respond_to?(:enabled=)
+            Rainbow.enabled = x
+          else
+            Sickill::Rainbow.enabled = x
+          end
         end
       end
 

data/lib/zsteg/cli/reflow.rb

@@ -1,3 +1,4 @@
+#coding: binary
 require 'optparse'
 require 'stringio'
 require 'set'
@@ -42,10 +43,14 @@ module ZSteg
 
         opts.separator ""
 
-        opts.on "-a", "--all", "try all possible sizes (default)" do
+        opts.on "-a", "--all", "try all possible sizes" do
           @options[:try_all] = true
         end
 
+        opts.on "-r", "--rewrite", "just rewrite the header, keeping imagedata as-is" do
+          @options[:rewrite] = true
+        end
+
         opts.separator ""
 
         opts.on "-O", "--outfile FILENAME", "output single result to specified file" do |x|
@@ -64,7 +69,11 @@ module ZSteg
           @options[:verbose] -= 1
         end
         opts.on "-C", "--[no-]color", "Force (or disable) color output (default: auto)" do |x|
-          Sickill::Rainbow.enabled = x
+          if defined?(Rainbow) && Rainbow.respond_to?(:enabled=)
+            Rainbow.enabled = x
+          else
+            Sickill::Rainbow.enabled = x
+          end
         end
       end
 
@@ -150,12 +159,21 @@ module ZSteg
           h = @image.width*@image.height/w
           _reflow w,h
         end
-      else
+      elsif @options[:try_all]
         # enum all
         2.upto(@image.width*@image.height/2) do |w|
           h = @image.width*@image.height/w
           _reflow w,h
         end
+      else
+        # smart all
+        w = 4
+        loop do
+          h = @image.width*@image.height/w
+          break if h < 4
+          _reflow w,h
+          w += 1
+        end
       end
     end
 
@@ -202,37 +220,41 @@ module ZSteg
           data = fi.read(4+4+4)
           fo.write(data[0,4] + [w,h].pack("V2")) # write new size
 
-          # copy remaining header bytes
-          fo.write fi.read(imagedata_offset-fi.tell)
-
-          # FIXME: if scanline sizes differ in BITS, not bytes...
-
-          # scanline padding needs to be respected...
-          imagedata = StringIO.new
-          @image.height.times do
-            data = fi.read @old_total_sl_bytes
-            imagedata << data[0, @old_significant_sl_bytes]
-            #p data[@old_significant_sl_bytes..-1]
-          end
-          imagedata << fi.read # read extradata, if any
-
-          imagedata.rewind
-          imagedata_start = fo.tell
-          h.times do
-            fo << imagedata.read(new_significant_sl_bytes)
-            fo << padding
+          if @options[:rewrite]
+            IO.copy_stream fi, fo
+          else
+            # copy remaining header bytes
+            fo.write fi.read(imagedata_offset-fi.tell)
+
+            # FIXME: if scanline sizes differ in BITS, not bytes...
+
+            # scanline padding needs to be respected...
+            imagedata = StringIO.new
+            @image.height.times do
+              data = fi.read @old_total_sl_bytes
+              imagedata << data[0, @old_significant_sl_bytes]
+              #p data[@old_significant_sl_bytes..-1]
+            end
+            imagedata << fi.read # read extradata, if any
+
+            imagedata.rewind
+            imagedata_start = fo.tell
+            h.times do
+              fo << imagedata.read(new_significant_sl_bytes)
+              fo << padding
+            end
+            file_size = fo.tell
+            imagedata_size = fo.tell - imagedata_start
+            fo << imagedata.read # write extradata, if any
+
+            # write new BITMAPFILEHEADER.bfSize
+            fo.seek 2
+            fo.write [file_size].pack('V')
+
+            # write new BITMAPINFOHEADER.biSizeImage
+            fo.seek 14+20 # BITMAPFILEHEADER::SIZE + 20
+            fo.write [imagedata_size].pack('V')
           end
-          file_size = fo.tell
-          imagedata_size = fo.tell - imagedata_start
-          fo << imagedata.read # write extradata, if any
-
-          # write new BITMAPFILEHEADER.bfSize
-          fo.seek 2
-          fo.write [file_size].pack('V')
-
-          # write new BITMAPINFOHEADER.biSizeImage
-          fo.seek 14+20 # BITMAPFILEHEADER::SIZE + 20
-          fo.write [imagedata_size].pack('V')
         end
       end
     end

data/lib/zsteg/extractor/byte_extractor.rb

@@ -1,3 +1,4 @@
+#coding: binary
 module ZSteg
   class Extractor
     # ByteExtractor extracts bits from each scanline bytes
@@ -15,7 +16,7 @@ module ZSteg
         end
 
         data = ''.force_encoding('binary')
-        a = []
+        a = [0]*params[:shift].to_i        # prepend :shift zero bits
         byte_iterator(params) do |x,y|
           sl = @image.scanlines[y]
 

data/lib/zsteg/extractor/color_extractor.rb

@@ -1,3 +1,4 @@
+#coding: binary
 module ZSteg
   class Extractor
     # ColorExtractor extracts bits from each pixel's color
@@ -35,8 +36,7 @@ module ZSteg
         end
 
         data = ''.force_encoding('binary')
-        a = []
-        #puts
+        a = [0]*params[:shift].to_i        # prepend :shift zero bits
         catch :limit do
           coord_iterator(params) do |x,y|
             color = @image[x,y]

data/lib/zsteg/file_cmd.rb

@@ -94,7 +94,7 @@ module ZSteg
         rescue
           t = data.force_encoding('binary')
         end
-        if t.size >= Checker::MIN_TEXT_LENGTH
+        if t.size >= Checker::DEFAULT_MIN_STR_LEN
           ZSteg::Result::UnicodeText.new(t,0)
         end
       else

data/lib/zsteg/result.rb

@@ -1,3 +1,4 @@
+#coding: binary
 module ZSteg
   module Result
 

data/spec/cats_spec.rb

@@ -3,7 +3,9 @@ require 'spec_helper'
 describe "cats.png" do
   subject{ cli(sample("cats.png")) }
 
-  its(:size){ should < 4_000 }
+  it "size should be < 4k" do
+    subject.size.should < 4_000
+  end
 
   it "should get 2nd cat" do
     should include("Second cat is Marussia")

data/spec/newbiecontest_spec.rb

@@ -5,7 +5,8 @@ sample("newbiecontest/alph1-surprise.bmp") do |fname|
   describe fname do
     subject{ cli(fname) }
 
-    it { should include "PE32 executable for MS Windows" }
+    it { should include "PE32 executable" }
+    it { should include "MS Windows" }
     it { should include "is program canno" }
 
     describe "--extract" do

data/spec/polictf2012_spec.rb

@@ -7,37 +7,51 @@ sample('polictf2012_f200.bmp') do |fname|
     end
 
     describe "hidden BMP #1" do
-      subject(:data){ cli(fname, "--extract", "4b,lsb,bY") }
-      its(:size){ should == 416816 }
+      before(:all) do
+        @data = cli(fname, "--extract", "4b,lsb,bY")
+      end
+
+      it "should be 416816 bytes" do
+        @data.size.should == 416816
+      end
 
       it "should have BMP header" do
-        data[0,2].should == "BM"
+        @data[0,2].should == "BM"
       end
 
       it "should have 7zip after BMP" do
-        data.index("7z").should == 2005
+        @data.index("7z").should == 2005
       end
 
       describe "deeper" do
-        let(:tname){  File.join("tmp", File.basename(fname) + ".bmp") }
-        before(:all){ File.open(tname, "wb"){ |f| f<<data } }
+        before(:all) do
+          @tname = File.join("tmp", File.basename(fname) + ".bmp")
+          File.open(@tname, "wb"){ |f| f<<@data }
+        end
 
         it "should detect 7z & BMP" do
-          out = cli(tname)
+          out = cli(@tname)
           out.should include('7-zip archive')
           out.should include('PC bitmap, Windows 3.x format, 100 x 55 x 24')
         end
 
         describe "hidden BMP #2" do
-          subject(:data2){ cli(tname, "--extract", "2b,lsb,bY") }
-          its(:size){ should == 103875 }
+          before(:all) do
+            @data2 = cli(@tname, "--extract", "2b,lsb,bY")
+          end
+
+          it "should be 103875 bytes" do
+            @data2.size.should == 103875
+          end
 
           describe "deeper" do
-            let(:tname2){ File.join("tmp", File.basename(tname) + ".bmp") }
-            before(:all){ File.open(tname2, "wb"){ |f| f<<data2 } }
+            before(:all) do
+              @tname2 = File.join("tmp", File.basename(@tname) + ".bmp")
+              File.open(@tname2, "wb"){ |f| f<<@data2 }
+            end
 
             it "should detect text" do
-              out = cli(tname2)
+              out = cli(@tname2)
               out.should include('sticazziantanieancoraunavoltacomesefossestato')
             end
           end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+#coding: binary
 $:.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
 require 'zsteg'
 
@@ -19,7 +20,7 @@ def sample fname
 end
 
 def cli *args
-  @@cli_cache ||= {}
+  @cli_cache ||= {}
   args.map! do |arg|
     if arg.is_a?(String) && arg[' ']
       # split strings with spaces into arrays
@@ -29,7 +30,7 @@ def cli *args
     end
   end
   args.flatten!
-  @@cli_cache[args.inspect] ||=
+  @cli_cache[args.inspect] ||=
     begin
       klass =
         if args.first.is_a?(Symbol)
@@ -52,6 +53,7 @@ def cli *args
 end
 
 RSpec.configure do |config|
+  config.expect_with(:rspec) { |c| c.syntax = :should }
   config.before :suite do
     Dir[File.join(SAMPLES_DIR, "**", "*.7z")].each do |fname|
       next if File.exist?(fname.sub(/\.7z$/,''))

data/spec/zlib_spec.rb

@@ -1,6 +1,22 @@
 require 'spec_helper'
 
-describe "samples/ndh2k12_sp113.bmp" do
-  subject{ cli(sample("ndh2k12_sp113.bmp"), "-o", "all") }
-  it { should include("%PDF-1.4") }
+sample("ndh2k12_sp113.bmp") do |fname|
+  describe fname do
+    subject{ cli(fname, "-o", "all") }
+    it { should include("%PDF-1.4") }
+
+    describe "--extract" do
+      subject{ cli(fname, "--extract b1,rgb,lsb,yx") }
+
+      it { should_not include "%PDF-1.4" }
+      it { subject.size.should == 546750 }
+    end
+
+    describe "--extract zlib" do
+      subject{ cli(fname, "--extract b1,rgb,lsb,yx,zlib") }
+
+      it { should include "%PDF-1.4" }
+      it { subject.size.should == 202383 }
+    end
+  end
 end

data/zsteg.gemspec

@@ -2,17 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: zsteg 0.1.1 ruby lib
+# stub: zsteg 0.2.3 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "zsteg"
-  s.version = "0.1.1"
+  s.name = "zsteg".freeze
+  s.version = "0.2.3"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Andrey \"Zed\" Zaikin"]
-  s.date = "2013-09-20"
-  s.email = "zed.0xff@gmail.com"
-  s.executables = ["zsteg", "zsteg-mask", "zsteg-reflow"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Andrey \"Zed\" Zaikin".freeze]
+  s.date = "2021-02-18"
+  s.email = "zed.0xff@gmail.com".freeze
+  s.executables = ["zsteg".freeze, "zsteg-mask".freeze, "zsteg-reflow".freeze]
   s.extra_rdoc_files = [
     "README.md",
     "README.md.tpl",
@@ -100,34 +101,27 @@ Gem::Specification.new do |s|
     "writers/zlib_append.rb",
     "zsteg.gemspec"
   ]
-  s.homepage = "http://github.com/zed-0xff/zsteg"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.4"
-  s.summary = "Detect stegano-hidden data in PNG & BMP files."
+  s.homepage = "http://github.com/zed-0xff/zsteg".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "3.2.3".freeze
+  s.summary = "Detect stegano-hidden data in PNG & BMP files.".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<zpng>, [">= 0.2.3"])
-      s.add_runtime_dependency(%q<iostruct>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.8.0"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-    else
-      s.add_dependency(%q<zpng>, [">= 0.2.3"])
-      s.add_dependency(%q<iostruct>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 2.8.0"])
-      s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<zpng>.freeze, [">= 0.3.1"])
+    s.add_runtime_dependency(%q<iostruct>.freeze, [">= 0"])
+    s.add_development_dependency(%q<rspec>.freeze, ["~> 3.9.0"])
+    s.add_development_dependency(%q<bundler>.freeze, ["~> 2.2.3"])
+    s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3.9"])
   else
-    s.add_dependency(%q<zpng>, [">= 0.2.3"])
-    s.add_dependency(%q<iostruct>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 2.8.0"])
-    s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<zpng>.freeze, [">= 0.3.1"])
+    s.add_dependency(%q<iostruct>.freeze, [">= 0"])
+    s.add_dependency(%q<rspec>.freeze, ["~> 3.9.0"])
+    s.add_dependency(%q<bundler>.freeze, ["~> 2.2.3"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 2.3.9"])
   end
 end
 

metadata

@@ -1,86 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: zsteg
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Andrey "Zed" Zaikin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2021-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zpng
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: iostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: 2.3.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.4
-description: 
+        version: 2.3.9
+description:
 email: zed.0xff@gmail.com
 executables:
 - zsteg
@@ -176,24 +176,23 @@ homepage: http://github.com/zed-0xff/zsteg
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+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.1.4
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Detect stegano-hidden data in PNG & BMP files.
 test_files: []