zsteg 0.2.11 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 492cf8819fa642e0485ae66c7b0942746f785b25fa10c3d0b6029ad93078783a
-  data.tar.gz: cde21ec01b7e5b3ea7a85e6817df0497ac2f91fb145739ae6702dcf7b3ee6832
+  metadata.gz: 05bf462c6bc2696efead731d0ce3bda8cf371435cc9448b100892b7084364c64
+  data.tar.gz: c12f610fe42706271d763620100a71572477696c07010d9323c1bb97f7440fbe
 SHA512:
-  metadata.gz: e0894f6e7d76dee86646251dd6768c0887c654ae0f5d560be4c65726666a4b7cf6028fb003ab0468cb8f33706fdecaabcd3b19b36e25e39537b7539482bb6455
-  data.tar.gz: ac61068f1b9d4c914f9543a81623c387e826d996e35a57ed5db6fa449cff9a303345e44d7d1e0070e70aacdf03509441589824d6978208ce5b63957c0adb99de
+  metadata.gz: 3340516e94d8248446ddb5df7a64269aed8fb4b09a1bf10057d603581b352e39adc595104ae4b75fa042d8895459532dac21c2304cc49bfe222ffc0df358fa55
+  data.tar.gz: d4bd9eaf13356a534eeb3be2807b524c73549dc0d3fbe44f349393930f0f4a31be1430b434d4ef8fb42ea2c2eda42dd13eb013222fc37714ce9801973358ba8e

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
-gem "zpng", ">= 0.4.3"
-gem "iostruct"
+gem "zpng", ">= 0.4.5"
+gem "iostruct", ">= 0.0.5"
 gem "prime"
 
 group :development do

data/Gemfile.lock

@@ -1,13 +1,13 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     builder (3.2.4)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.5.0)
-    faraday (1.10.0)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -30,8 +30,9 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    forwardable (1.3.2)
-    git (1.11.0)
+    forwardable (1.3.3)
+    git (1.13.2)
+      addressable (~> 2.8)
       rchardet (~> 1.8)
     github_api (0.19.0)
       addressable (~> 2.4)
@@ -40,8 +41,8 @@ GEM
       hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
     hashie (3.6.0)
-    highline (2.0.3)
-    iostruct (0.0.4)
+    highline (2.1.0)
+    iostruct (0.0.5)
     juwelier (2.4.9)
       builder
       bundler
@@ -54,65 +55,65 @@ GEM
       rake
       rdoc
       semver2
-    jwt (2.4.1)
+    jwt (2.7.0)
     kamelcase (0.0.2)
       semver2 (~> 3)
-    mini_portile2 (2.8.0)
+    mini_portile2 (2.8.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.2.3)
-    nokogiri (1.13.6)
+    multipart-post (2.3.0)
+    nokogiri (1.14.2)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    oauth2 (1.4.9)
+    oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
+      rack (>= 1.2, < 4)
     prime (0.1.2)
       forwardable
       singleton
-    psych (4.0.4)
+    psych (5.1.0)
       stringio
-    public_suffix (4.0.7)
-    racc (1.6.0)
-    rack (2.2.3.1)
+    public_suffix (5.0.1)
+    racc (1.6.2)
+    rack (3.0.4.1)
     rainbow (3.1.1)
     rake (13.0.6)
     rchardet (1.8.0)
-    rdoc (6.4.0)
+    rdoc (6.5.0)
       psych (>= 4.0.0)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     ruby2_keywords (0.0.5)
     semver2 (3.4.2)
     singleton (0.1.1)
-    stringio (3.0.2)
+    stringio (3.0.5)
     thread_safe (0.3.6)
-    zpng (0.4.3)
+    zpng (0.4.5)
       rainbow (~> 3.1.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  iostruct
+  iostruct (>= 0.0.5)
   juwelier
   prime
   rspec
-  zpng (>= 0.4.3)
+  zpng (>= 0.4.5)
 
 BUNDLED WITH
    2.3.12

data/README.md

@@ -28,26 +28,32 @@ Usage
 
     Usage: zsteg [options] filename.png [param_string]
     
+        -a, --all                        try all known methods
+        -E, --extract NAME               extract specified payload, NAME is like '1b,rgb,lsb'
+    
+    Iteration/extraction params:
+        -o, --order X                    pixel iteration order (default: 'auto')
+                                         valid values: ALL,xy,yx,XY,YX,xY,Xy,bY,...
         -c, --channels X                 channels (R/G/B/A) or any combination, comma separated
                                          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, 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
+            --lsb                        least significant bit comes first
+            --msb                        most significant bit comes first
         -P, --prime                      analyze/extract only prime bytes/pixels
+            --shift N                    prepend N zero bits
+            --step N                     step
             --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'
+            --pixel-align                pixel-align hidden data
+    
+    Analysis params:
+        -l, --limit N                    limit bytes checked, 0 = no limit (default: 256)
     
             --[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)
@@ -85,23 +91,6 @@ Examples
 
     # zsteg wbstego/wbsteg_noenc_even.bmp 1b,lsb,bY -v
 
-    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|

data/Rakefile

@@ -24,7 +24,7 @@ Juwelier::Tasks.new do |gem|
   #gem.executables = %w'zsteg'
   gem.files.include "lib/**/*.rb"
   gem.files.include "bin/*"
-  gem.files.exclude "samples/*"
+  gem.files.exclude "samples/**/*"
   # dependencies defined in Gemfile
 end
 Juwelier::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.11
+0.2.13

data/cmp_png.rb

@@ -5,7 +5,7 @@ require 'awesome_print'
 images = ARGV.map{ |fname| ZPNG::Image.load(fname) }
 raise "need at least 2 images" if images.size < 2
 
-limit = 20
+limit = 100
 alpha_used = images.any?(&:alpha_used?)
 channels = alpha_used ? %w'r g b a' : %w'r g b'
 

data/lib/zsteg/checker/steganography_png.rb

@@ -0,0 +1,36 @@
+# coding: binary
+module ZSteg
+  class Checker
+    module SteganographyPNG
+
+      URL = "https://github.com/pedrooaugusto/steganography-png"
+
+      # https://github.com/pedrooaugusto/steganography-png/blob/2a0e038c135e41438b4c2c93821227a2289b4203/scanlines/scanlines.go#L234
+      #
+      # The secret metadata is stored in the last bytes of the last scanline in the form of:
+      #   17 107 [bitloss] [secret size - 4 bytes] [secret type] [secret type length]
+      #   17 107     1             4096             "text/plain"          10
+      
+      class Result < IOStruct.new "nCNa*", :magic, :bitloss, :secret_size, :secret_type
+        def valid?
+          magic == 0x116b && (1..8).include?(bitloss)
+        end
+
+        def to_s
+          super.sub('#<struct ZSteg::Checker::SteganographyPNG::Result', 'SteganographyPNG').sub(/>$/,'').bright_red
+        end
+      end
+
+      def self.check_image image, _params = {}
+        ls = image.scanlines.last
+        data = ls.decoded_bytes
+        secret_type_length = data[-1].ord
+        return nil if secret_type_length > data.size - 8
+        data = data[ -secret_type_length-8 .. -2 ]
+        # data.size to prevent "want 8 bytes, got 7" IOStruct warning when secret_type_length == 0
+        r = Result.read(data, data.size)
+        r.valid? && [r, URL]
+      end
+    end
+  end
+end

data/lib/zsteg/checker.rb

@@ -3,6 +3,11 @@ require 'stringio'
 require 'zlib'
 require 'set'
 
+require 'zsteg/checker/scanline_checker'
+require 'zsteg/checker/steganography_png'
+require 'zsteg/checker/wbstego'
+require 'zsteg/checker/zlib'
+
 module ZSteg
   class Checker
     attr_accessor :params, :channels, :verbose, :results
@@ -46,20 +51,20 @@ module ZSteg
 
     private
 
-    # catch Kernel#print for easier verbosity handling
-    def print *args
-      Kernel.print(*args) if @verbose >= 0
-    end
-
-    # catch Kernel#printf for easier verbosity handling
-    def printf *args
-      Kernel.printf(*args) if @verbose >= 0
-    end
-
-    # catch Kernel#puts for easier verbosity handling
-    def puts *args
-      Kernel.puts(*args) if @verbose >= 0
-    end
+#   # catch Kernel#print for easier verbosity handling
+#    def print *args
+#      Kernel.print(*args) if @verbose >= 0
+#    end
+#
+#    # catch Kernel#printf for easier verbosity handling
+#    def printf *args
+#      Kernel.printf(*args) if @verbose >= 0
+#    end
+#
+#    # catch Kernel#puts for easier verbosity handling
+#    def puts *args
+#      Kernel.puts(*args) if @verbose >= 0
+#    end
 
     public
 
@@ -92,12 +97,26 @@ module ZSteg
       Array(params[:order]).uniq.each do |order|
         (params[:prime] == :all ? [false,true] : [params[:prime]]).each do |prime|
           Array(params[:bits]).uniq.each do |bits|
-            p1 = @params.merge :bits => bits, :order => order, :prime => prime
-            if order[/b/i]
-              # byte iterator does not need channels
-              check_channels nil, p1
+            if params[:pixel_align] == :all
+              [false, true].each do |pixel_align|
+                # skip cases when output will be identical for pixel_align true/false
+                next if pixel_align && (8%bits) == 0
+                p1 = @params.merge bits: bits, order: order, prime: prime, pixel_align: pixel_align
+                if order[/b/i]
+                  # byte iterator does not need channels
+                  check_channels nil, p1
+                else
+                  channels.each{ |c| check_channels c, p1 }
+                end
+              end
             else
-              channels.each{ |c| check_channels c, p1 }
+              p1 = @params.merge bits: bits, order: order, prime: prime
+              if order[/b/i]
+                # byte iterator does not need channels
+                check_channels nil, p1
+              else
+                channels.each{ |c| check_channels c, p1 }
+              end
             end
           end
         end
@@ -150,6 +169,13 @@ module ZSteg
         show_title title, :bright_red
         process_result data, :special => true, :title => title
       end
+
+      if r = SteganographyPNG.check_image(@image, @params)
+        @found_anything = true
+        title = "image"
+        show_title title, :bright_red
+        process_result nil, title: title, result: r
+      end
     end
 
     def check_metadata
@@ -220,6 +246,8 @@ module ZSteg
           end
         end
 
+      bits_tag << "p" if params[:pixel_align]
+
       title = [
         bits_tag,
         channels,
@@ -268,21 +296,26 @@ module ZSteg
     def process_result data, params
       verbose = params[:special] ? [@verbose,1.5].max : @verbose
 
-      if @cache[data]
-        if verbose > 1
-          puts "[same as #{@cache[data].inspect}]".gray
-          return true
-        else
-          # silent return
-          return false
+      result = nil
+      if data
+        if @cache[data]
+          if verbose > 1
+            puts "[same as #{@cache[data].inspect}]".gray
+            return true
+          else
+            # silent return
+            return false
+          end
         end
-      end
 
-      # TODO: store hash of data for large datas
-      @cache[data] = params[:title]
+        # TODO: store hash of data for large datas
+        @cache[data] = params[:title]
 
-      if result = data2result(data, params)
-        @results << result
+        if result = data2result(data, params)
+          @results << result
+        end
+      elsif !(result = params[:result])
+        raise "[?] No data nor result"
       end
 
       case verbose
@@ -309,7 +342,7 @@ module ZSteg
       else
         show_result result, params
       end
-      if data.size > 0 && !result.is_a?(Result::OneChar) && !result.is_a?(Result::WholeText)
+      if data && 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

data/lib/zsteg/cli/cli.rb

@@ -11,14 +11,39 @@ module ZSteg
     def run
       @actions = []
       @options = {
-        :verbose => 0,
-        :limit => Checker::DEFAULT_LIMIT,
-        :order => Checker::DEFAULT_ORDER
+        verbose: 0,
+        limit: Checker::DEFAULT_LIMIT,
+        order: Checker::DEFAULT_ORDER,
+        step: 1, 
+        ystep: 1, 
       }
       optparser = OptionParser.new do |opts|
         opts.banner = "Usage: zsteg [options] filename.png [param_string]"
         opts.separator ""
 
+        opts.on "-a", "--all", "try all known methods" do
+          @options[:prime] = :all
+          @options[:order] = :all
+          @options[:pixel_align] = :all
+          @options[:bits]  = (1..8).to_a
+          # specifying --all on command line explicitly enables extra checks
+          @options[:extra_checks] = true
+        end
+
+        opts.on "-E", "--extract NAME", "extract specified payload, NAME is like '1b,rgb,lsb'" do |x|
+          @options[:verbose] = -2 # silent ZPNG warnings
+          @actions << [:extract, x]
+        end
+
+        #################################################################################
+        opts.separator "\nIteration/extraction params:"
+        #################################################################################
+
+        opts.on("-o", "--order X", /all|auto|[bxy,]+/i,
+                "pixel iteration order (default: '#{@options[:order]}')",
+                "valid values: ALL,xy,yx,XY,YX,xY,Xy,bY,...",
+        ){ |x| @options[:order] = x.split(',') }
+
         opts.on("-c", "--channels X", /[rgba,1-8]+/,
                 "channels (R/G/B/A) or any combination, comma separated",
                 "valid values: r,g,b,a,rg,bgr,rgba,r3g2b3,..."
@@ -28,14 +53,14 @@ module ZSteg
           @options[:extra_checks] = false
         end
 
-        opts.on("-l", "--limit N", Integer,
-                "limit bytes checked, 0 = no limit (default: #{@options[:limit]})"
-        ){ |n| @options[:limit] = n }
-
         opts.on("-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'"
         ) do |x|
           a = []
+          if x[-1] == 'p'
+            @options[:pixel_align] = true
+            x = x[0..-2]
+          end
           x = '1-8' if x == 'all'
           x.split(',').each do |x1|
             if x1['-']
@@ -50,10 +75,10 @@ module ZSteg
           @options[:extra_checks] = false
         end
 
-        opts.on "--lsb", "least significant BIT comes first" do
+        opts.on "--lsb", "least significant bit comes first" do
           @options[:bit_order] = :lsb
         end
-        opts.on "--msb", "most significant BIT comes first" do
+        opts.on "--msb", "most significant bit comes first" do
           @options[:bit_order] = :msb
         end
 
@@ -62,31 +87,20 @@ module ZSteg
           # specifying prime on command line disables extra checks
           @options[:extra_checks] = false
         end
-        opts.on "--invert", "invert bits (XOR 0xff)" do
-          @options[:invert] = true
-        end
 
-#        opts.on "--pixel-align", "pixel-align hidden data (EasyBMP)" do
-#          @options[:pixel_align] = true
-#        end
+        opts.on("--shift N", Integer, "prepend N zero bits"){ |x| @options[:shift] = x }
+        #opts.on("--step N",  Integer, "step")               { |x| @options[:step] = x }
+        opts.on("--invert", "invert bits (XOR 0xff)")       { @options[:invert] = true }
 
-        opts.on "-a", "--all", "try all known methods" do
-          @options[:prime] = :all
-          @options[:order] = :all
-          @options[:bits]  = (1..8).to_a
-          # specifying --all on command line explicitly enables extra checks
-          @options[:extra_checks] = true
+        opts.on "--pixel-align", "pixel-align hidden data" do
+          @options[:pixel_align] = true
         end
 
-        opts.on("-o", "--order X", /all|auto|[bxy,]+/i,
-                "pixel iteration order (default: '#{@options[:order]}')",
-                "valid values: ALL,xy,yx,XY,YX,xY,Xy,bY,...",
-        ){ |x| @options[:order] = x.split(',') }
+        #################################################################################
+        opts.separator "\nAnalysis params:"
+        #################################################################################
 
-        opts.on "-E", "--extract NAME", "extract specified payload, NAME is like '1b,rgb,lsb'" do |x|
-          @options[:verbose] = -2 # silent ZPNG warnings
-          @actions << [:extract, x]
-        end
+        opts.on("-l", "--limit N", Integer, "limit bytes checked, 0 = no limit (default: #{@options[:limit]})"){ |n| @options[:limit] = n }
 
         opts.separator ""
 
@@ -112,10 +126,6 @@ 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
@@ -201,8 +211,11 @@ module ZSteg
           h[:bit_order] = :lsb
         when 'msb'
           h[:bit_order] = :msb
-        when /^(\d)b$/, /^b(\d)$/
+        when /^(\d)b$/, /^b(\d+)$/
+          h[:bits] = parse_bits($1)
+        when /^(\d)bp$/, /^b(\d+)p$/
           h[:bits] = parse_bits($1)
+          h[:pixel_align] = true
         when /\A[rgba]+\Z/
           h[:channels] = [x]
         when /\Axy|yx|yb|by\Z/i

data/lib/zsteg/extractor/byte_extractor.rb

@@ -32,8 +32,8 @@ module ZSteg
             else
               8.times{ |i| byte |= (a.shift<<(7-i))}
             end
-            #printf "[d] %02x %08b\n", byte, byte
             data << byte.chr
+            #a = []
             if data.size >= @limit
               print "[limit #@limit]".gray if @verbose > 1
               break
@@ -77,12 +77,15 @@ module ZSteg
             [@image.height-1, 0, -1]
           end
 
+        xstep *= params[:step] if params[:step]
+        ystep *= params[:ystep] if params[:ystep]
+
         # cannot join these lines from ByteExtractor and ColorExtractor into
         # one method for performance reason:
         #   it will require additional yield() for EACH BYTE iterated
 
         if type[0,1].downcase == 'b'
-          # ROW iterator
+          # ROW iterator (natural)
           if params[:prime]
             idx = 0
             y0.step(y1,ystep){ |y| x0.step(x1,xstep){ |x|

data/lib/zsteg/extractor/color_extractor.rb

@@ -6,7 +6,7 @@ module ZSteg
 
       def color_extract params = {}
         channels = Array(params[:channels])
-        #pixel_align = params[:pixel_align]
+        pixel_align = params[:pixel_align]
 
         ch_masks = []
         case channels.first.size
@@ -42,28 +42,28 @@ module ZSteg
             color = @image[x,y]
 
             ch_masks.each do |c,bidxs|
+              bidxs = bidxs[a.size-8..] if pixel_align && a.size + bidxs.size > 8
               value = color.send(c)
               bidxs.each do |bidx|
                 a << value[bidx]
               end
             end
-            #p [x,y,a.size,a]
 
             while a.size >= 8
               byte = 0
-              #puts a.join
+              # a0 = a.dup
               if params[:bit_order] == :msb
                 8.times{ |i| byte |= (a.shift<<i)}
               else
                 8.times{ |i| byte |= (a.shift<<(7-i))}
               end
-              #printf "[d] %02x %08b\n", byte, byte
+              # printf "[d] %-10s -> %-10s : %s %02x %08b  x=%d y=%d\n", a0.join, a.join, byte.chr.inspect, byte, byte, x, y
               data << byte.chr
               if data.size >= @limit
                 print "[limit #@limit]".gray if @verbose > 1
                 throw :limit
               end
-              #a.clear if pixel_align
+              a.clear if pixel_align && a.size < 8
             end
           end
         end

data/lib/zsteg.rb

@@ -9,10 +9,6 @@ require 'zsteg/checker'
 require 'zsteg/result'
 require 'zsteg/file_cmd'
 
-require 'zsteg/checker/wbstego'
-require 'zsteg/checker/scanline_checker'
-require 'zsteg/checker/zlib'
-
 require 'zsteg/masker'
 
 require 'zsteg/analyzer'

data/spec/checker_spec.rb

@@ -17,9 +17,9 @@ describe Checker do
           end
         end
 
-        it "should be quiet by default" do
-          @out.should == ""
-        end
+#        it "should be quiet by default" do
+#          @out.should == ""
+#        end
 
         it "returned results should be equal to #results" do
           @results.should == @checker.results

data/spec/spec_helper.rb

@@ -40,6 +40,7 @@ def cli *args
         else
           ZSteg::CLI
         end
+      args << "-qqq"
       args << "--no-color" unless args.any?{|x| x['color']}
       orig_stdout, out = $stdout, ""
       begin
@@ -48,7 +49,7 @@ def cli *args
       ensure
         $stdout = orig_stdout
       end
-      out.strip
+      out
     end
 end
 

data/spec/steganography_png_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+# https://github.com/pedrooaugusto/steganography-png
+each_sample("steganography-png/*.png") do |fname|
+  describe fname do
+    it "should reveal secret message" do
+      r = cli fname, "--limit", "64", "-a", "--no-file"
+      r.should include("SteganographyPNG")
+      r.should include(ZSteg::Checker::SteganographyPNG::URL)
+      r.should_not include("ZSteg::Checker::SteganographyPNG")
+    end
+  end
+end

data/spec/zlib_spec.rb

@@ -16,7 +16,7 @@ sample("ndh2k12_sp113.bmp") do |fname|
       subject{ cli(fname, "--extract b1,rgb,lsb,yx,zlib") }
 
       it { should include "%PDF-1.4" }
-      it { subject.size.should == 202383 }
+      it { subject.size.should == 202386 }
     end
   end
 end

data/zsteg.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: zsteg 0.2.11 ruby lib
+# stub: zsteg 0.2.13 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "zsteg".freeze
-  s.version = "0.2.11"
+  s.version = "0.2.13"
 
   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 = "2022-08-29"
+  s.date = "2023-02-19"
   s.email = "zed.0xff@gmail.com".freeze
   s.executables = ["zsteg".freeze, "zsteg-mask".freeze, "zsteg-reflow".freeze]
   s.extra_rdoc_files = [
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
     "lib/zsteg/analyzer.rb",
     "lib/zsteg/checker.rb",
     "lib/zsteg/checker/scanline_checker.rb",
+    "lib/zsteg/checker/steganography_png.rb",
     "lib/zsteg/checker/wbstego.rb",
     "lib/zsteg/checker/zlib.rb",
     "lib/zsteg/cli/cli.rb",
@@ -47,36 +48,6 @@ Gem::Specification.new do |s|
     "lib/zsteg/file_cmd.rb",
     "lib/zsteg/masker.rb",
     "lib/zsteg/result.rb",
-    "pngsteg.gemspec",
-    "samples/hackquest/crypt.bmp",
-    "samples/hackquest/square.bmp",
-    "samples/newbiecontest/alph1-surprise.bmp.7z",
-    "samples/wbstego/wbsteg_blowfish_pass_1.bmp",
-    "samples/wbstego/wbsteg_cast128_pass_1.bmp",
-    "samples/wbstego/wbsteg_enc_pass_pass.bmp",
-    "samples/wbstego/wbsteg_enc_pass_pass_even.bmp",
-    "samples/wbstego/wbsteg_mix_pass_1.bmp",
-    "samples/wbstego/wbsteg_mix_pass_1_even.bmp",
-    "samples/wbstego/wbsteg_mix_pass_foobar.bmp",
-    "samples/wbstego/wbsteg_mix_pass_pass.bmp",
-    "samples/wbstego/wbsteg_mixenc_pass_pass_even.bmp",
-    "samples/wbstego/wbsteg_noenc.bmp",
-    "samples/wbstego/wbsteg_noenc.png",
-    "samples/wbstego/wbsteg_noenc_.bmp",
-    "samples/wbstego/wbsteg_noenc_17.bmp",
-    "samples/wbstego/wbsteg_noenc__.bmp",
-    "samples/wbstego/wbsteg_noenc_even.bmp",
-    "samples/wbstego/wbsteg_noenc_even2.bmp",
-    "samples/wbstego/wbsteg_noenc_even_17.bmp",
-    "samples/wbstego/wbsteg_noenc_even_17_.bmp",
-    "samples/wbstego/wbsteg_noenc_ext_ABC.bmp",
-    "samples/wbstego/wbsteg_rijndael_pass_1.bmp",
-    "samples/wbstego/wbsteg_rijndael_pass_pass.bmp",
-    "samples/wbstego/wbsteg_rijndael_pass_pass_even.bmp",
-    "samples/wbstego/wbsteg_twofish_pass_1.bmp",
-    "samples/wechall/5ZMGcCLxpcpsru03.g00000010.png",
-    "samples/wechall/5ZMGcCLxpcpsru03.png",
-    "samples/wechall/stegano1.bmp",
     "spec/bin_spec.rb",
     "spec/camouflage_spec.rb",
     "spec/cats_spec.rb",
@@ -93,6 +64,7 @@ Gem::Specification.new do |s|
     "spec/r3g2b3_spec.rb",
     "spec/simple_spec.rb",
     "spec/spec_helper.rb",
+    "spec/steganography_png_spec.rb",
     "spec/wbstego_spec.rb",
     "spec/wechall_spec.rb",
     "spec/zlib_spec.rb",
@@ -103,7 +75,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/zed-0xff/zsteg".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.1.6".freeze
+  s.rubygems_version = "3.3.7".freeze
   s.summary = "Detect stegano-hidden data in PNG & BMP files.".freeze
 
   if s.respond_to? :specification_version then
@@ -111,14 +83,14 @@ Gem::Specification.new do |s|
   end
 
   if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<zpng>.freeze, [">= 0.4.3"])
-    s.add_runtime_dependency(%q<iostruct>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<zpng>.freeze, [">= 0.4.5"])
+    s.add_runtime_dependency(%q<iostruct>.freeze, [">= 0.0.5"])
     s.add_runtime_dependency(%q<prime>.freeze, [">= 0"])
     s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
     s.add_development_dependency(%q<juwelier>.freeze, [">= 0"])
   else
-    s.add_dependency(%q<zpng>.freeze, [">= 0.4.3"])
-    s.add_dependency(%q<iostruct>.freeze, [">= 0"])
+    s.add_dependency(%q<zpng>.freeze, [">= 0.4.5"])
+    s.add_dependency(%q<iostruct>.freeze, [">= 0.0.5"])
     s.add_dependency(%q<prime>.freeze, [">= 0"])
     s.add_dependency(%q<rspec>.freeze, [">= 0"])
     s.add_dependency(%q<juwelier>.freeze, [">= 0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zsteg
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.13
 platform: ruby
 authors:
 - Andrey "Zed" Zaikin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-29 00:00:00.000000000 Z
+date: 2023-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zpng
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: iostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: prime
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,7 @@ files:
 - lib/zsteg/analyzer.rb
 - lib/zsteg/checker.rb
 - lib/zsteg/checker/scanline_checker.rb
+- lib/zsteg/checker/steganography_png.rb
 - lib/zsteg/checker/wbstego.rb
 - lib/zsteg/checker/zlib.rb
 - lib/zsteg/cli/cli.rb
@@ -119,36 +120,6 @@ files:
 - lib/zsteg/file_cmd.rb
 - lib/zsteg/masker.rb
 - lib/zsteg/result.rb
-- pngsteg.gemspec
-- samples/hackquest/crypt.bmp
-- samples/hackquest/square.bmp
-- samples/newbiecontest/alph1-surprise.bmp.7z
-- samples/wbstego/wbsteg_blowfish_pass_1.bmp
-- samples/wbstego/wbsteg_cast128_pass_1.bmp
-- samples/wbstego/wbsteg_enc_pass_pass.bmp
-- samples/wbstego/wbsteg_enc_pass_pass_even.bmp
-- samples/wbstego/wbsteg_mix_pass_1.bmp
-- samples/wbstego/wbsteg_mix_pass_1_even.bmp
-- samples/wbstego/wbsteg_mix_pass_foobar.bmp
-- samples/wbstego/wbsteg_mix_pass_pass.bmp
-- samples/wbstego/wbsteg_mixenc_pass_pass_even.bmp
-- samples/wbstego/wbsteg_noenc.bmp
-- samples/wbstego/wbsteg_noenc.png
-- samples/wbstego/wbsteg_noenc_.bmp
-- samples/wbstego/wbsteg_noenc_17.bmp
-- samples/wbstego/wbsteg_noenc__.bmp
-- samples/wbstego/wbsteg_noenc_even.bmp
-- samples/wbstego/wbsteg_noenc_even2.bmp
-- samples/wbstego/wbsteg_noenc_even_17.bmp
-- samples/wbstego/wbsteg_noenc_even_17_.bmp
-- samples/wbstego/wbsteg_noenc_ext_ABC.bmp
-- samples/wbstego/wbsteg_rijndael_pass_1.bmp
-- samples/wbstego/wbsteg_rijndael_pass_pass.bmp
-- samples/wbstego/wbsteg_rijndael_pass_pass_even.bmp
-- samples/wbstego/wbsteg_twofish_pass_1.bmp
-- samples/wechall/5ZMGcCLxpcpsru03.g00000010.png
-- samples/wechall/5ZMGcCLxpcpsru03.png
-- samples/wechall/stegano1.bmp
 - spec/bin_spec.rb
 - spec/camouflage_spec.rb
 - spec/cats_spec.rb
@@ -165,6 +136,7 @@ files:
 - spec/r3g2b3_spec.rb
 - spec/simple_spec.rb
 - spec/spec_helper.rb
+- spec/steganography_png_spec.rb
 - spec/wbstego_spec.rb
 - spec/wechall_spec.rb
 - spec/zlib_spec.rb
@@ -191,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Detect stegano-hidden data in PNG & BMP files.

data/pngsteg.gemspec

@@ -1,65 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "pngsteg"
-  s.version = "0.0.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Andrey \"Zed\" Zaikin"]
-  s.date = "2013-01-06"
-  s.email = "zed.0xff@gmail.com"
-  s.executables = ["pngsteg"]
-  s.files = [
-    "Gemfile",
-    "Gemfile.lock",
-    "Rakefile",
-    "VERSION",
-    "bin/pngsteg",
-    "lib/pngsteg.rb",
-    "lib/pngsteg/checker.rb",
-    "lib/pngsteg/cli.rb",
-    "lib/pngsteg/extractor.rb",
-    "samples/flower.png",
-    "samples/flower_rgb1.png",
-    "samples/flower_rgb2.png",
-    "samples/flower_rgb3.png",
-    "samples/flower_rgb4.png",
-    "samples/flower_rgb5.png",
-    "samples/flower_rgb6.png",
-    "spec/samples_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = "http://github.com/zed-0xff/pngsteg"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "Detect stegano-hidden data in PNG files"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<zpng>, [">= 0.2.1"])
-      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"])
-      s.add_development_dependency(%q<awesome_print>, [">= 0"])
-    else
-      s.add_dependency(%q<zpng>, [">= 0.2.1"])
-      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<awesome_print>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<zpng>, [">= 0.2.1"])
-    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<awesome_print>, [">= 0"])
-  end
-end
-