zsteg 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68101c2a1131eef8343b68bc8176274d0d8d0a3e
-  data.tar.gz: 090dabdfd430f5ef61dd2f70c84610842bdfffea
+  metadata.gz: 9c404bfeb56a154e348ab6b9317d39f2ed111909
+  data.tar.gz: 4757c7c83b8cc4b7ed7ce818df237846784c9e72
 SHA512:
-  metadata.gz: fa1a8dd3e81074ce70c3019d08f27d33a31b245b0f2ca12b7f28c2824a08fac1c0740b3bdcdcd86f83e38888267c6f0524a590b3dc1511ea62702468a308a76e
-  data.tar.gz: c0f4e62456de78b373695f2cbd0f8ae4ea1e9c13f959a5554f0472eb7d35847c039331a5c5ea724fcbcfed1c80db09903f17c6428bb08bafd7ad0b224d8eb202
+  metadata.gz: 5bedebed7ee62ad32d4eebdcd881ede8ac8750d85c39107138ce5ddd3532947afd7114876017191c274ae34398243f9cacaf9b949d3304d5f326ae029cd4b6d1
+  data.tar.gz: 90f91286daabad120e67ba8f1eb15c531c8f17fbc1e85e79fda39841d8ef265fac7ac5067acc23521ac016ef139bc829474427afcdb1957b266b64e6a8cc544a

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem 'zpng', ">= 0.2.3"
+gem 'zpng', ">= 0.2.5"
 gem "iostruct"
 
 group :development do

data/Gemfile.lock

@@ -4,7 +4,7 @@ GEM
     addressable (2.3.5)
     builder (3.2.2)
     diff-lcs (1.1.3)
-    faraday (0.8.8)
+    faraday (0.8.9)
       multipart-post (~> 1.2.0)
     git (1.2.6)
     github_api (0.10.1)
@@ -15,10 +15,9 @@ GEM
       nokogiri (~> 1.5.2)
       oauth2
     hashie (2.0.5)
-    highline (1.6.19)
-    httpauth (0.2.0)
+    highline (1.6.21)
     iostruct (0.0.1)
-    jeweler (1.8.7)
+    jeweler (1.8.8)
       builder
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -27,24 +26,23 @@ GEM
       nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.8.0)
-    jwt (0.1.8)
+    json (1.8.1)
+    jwt (0.1.11)
       multi_json (>= 1.5)
-    multi_json (1.8.0)
+    multi_json (1.8.4)
     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)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      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)
+    rainbow (2.0.0)
+    rake (10.1.1)
+    rdoc (4.1.1)
       json (~> 1.4)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
@@ -54,7 +52,7 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.1)
-    zpng (0.2.3)
+    zpng (0.2.5)
       rainbow
 
 PLATFORMS
@@ -65,4 +63,4 @@ DEPENDENCIES
   iostruct
   jeweler (~> 1.8.4)
   rspec (>= 2.8.0)
-  zpng (>= 0.2.3)
+  zpng (>= 0.2.5)

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

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/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

data/lib/zsteg/cli/reflow.rb

@@ -42,10 +42,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|
@@ -150,12 +154,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 +215,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

@@ -15,7 +15,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

@@ -35,8 +35,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/zsteg.gemspec

@@ -2,15 +2,14 @@
 # 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
 
 Gem::Specification.new do |s|
   s.name = "zsteg"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   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.date = "2014-03-01"
   s.email = "zed.0xff@gmail.com"
   s.executables = ["zsteg", "zsteg-mask", "zsteg-reflow"]
   s.extra_rdoc_files = [
@@ -103,27 +102,27 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/zed-0xff/zsteg"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.4"
+  s.rubygems_version = "2.0.3"
   s.summary = "Detect stegano-hidden data in PNG & BMP files."
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     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<zpng>, [">= 0.2.5"])
       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<zpng>, [">= 0.2.5"])
       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
   else
-    s.add_dependency(%q<zpng>, [">= 0.2.3"])
+    s.add_dependency(%q<zpng>, [">= 0.2.5"])
     s.add_dependency(%q<iostruct>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2.8.0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zsteg
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andrey "Zed" Zaikin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2014-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zpng
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: iostruct
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.4
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Detect stegano-hidden data in PNG & BMP files.