zsteg 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05bf462c6bc2696efead731d0ce3bda8cf371435cc9448b100892b7084364c64
-  data.tar.gz: c12f610fe42706271d763620100a71572477696c07010d9323c1bb97f7440fbe
+  metadata.gz: 517af804bb6892894d053fe80139d31ca23746c02c42f33dd5574bf25e41f8c2
+  data.tar.gz: 399a3f35dc307eb44d1b3e4cb776e32887428d25f311b42a8facb33ecb8ba7f0
 SHA512:
-  metadata.gz: 3340516e94d8248446ddb5df7a64269aed8fb4b09a1bf10057d603581b352e39adc595104ae4b75fa042d8895459532dac21c2304cc49bfe222ffc0df358fa55
-  data.tar.gz: d4bd9eaf13356a534eeb3be2807b524c73549dc0d3fbe44f349393930f0f4a31be1430b434d4ef8fb42ea2c2eda42dd13eb013222fc37714ce9801973358ba8e
+  metadata.gz: cf416358da42bab09505d7f54d3e5df0b9e26cc4b29e3b6e0aa73bb13900c7367d5e941298917bb6286a6e8b5f430eca36547a4f66efd4d06b3c2a8316b17ffd
+  data.tar.gz: 49f2ac63384acc20790882c5542375b655c4462a6099d0ba999fe300ca91766c9d65ec08f2288f9e628c6c11b552f91490ae24be55c6ffbd96b0c94998a64002

data/Gemfile

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

data/Gemfile.lock

@@ -1,13 +1,36 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
-    builder (3.2.4)
+    activesupport (7.1.6)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      mutex_m
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
+    base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (4.0.1)
+    builder (3.3.0)
+    cgi (0.5.1)
+    concurrent-ruby (1.3.6)
+    connection_pool (2.5.5)
+    date (3.5.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.5.0)
-    faraday (1.10.3)
+    diff-lcs (1.6.2)
+    drb (2.2.3)
+    erb (4.0.4)
+      cgi (>= 0.3.3)
+    faraday (1.10.4)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -20,19 +43,21 @@ GEM
       faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
+    faraday-em_synchrony (1.0.1)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
+    faraday-multipart (1.2.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    forwardable (1.3.3)
-    git (1.13.2)
+    forwardable (1.4.0)
+    git (2.3.3)
+      activesupport (>= 5.0)
       addressable (~> 2.8)
+      process_executer (~> 1.1)
       rchardet (~> 1.8)
     github_api (0.19.0)
       addressable (~> 2.4)
@@ -41,8 +66,12 @@ GEM
       hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
     hashie (3.6.0)
-    highline (2.1.0)
-    iostruct (0.0.5)
+    highline (3.1.2)
+      reline
+    i18n (1.14.8)
+      concurrent-ruby (~> 1.0)
+    io-console (0.8.2)
+    iostruct (0.7.0)
     juwelier (2.4.9)
       builder
       bundler
@@ -55,15 +84,19 @@ GEM
       rake
       rdoc
       semver2
-    jwt (2.7.0)
+    jwt (2.10.2)
+      base64
     kamelcase (0.0.2)
       semver2 (~> 3)
-    mini_portile2 (2.8.1)
-    multi_json (1.15.0)
+    logger (1.7.0)
+    mini_portile2 (2.8.9)
+    minitest (5.26.1)
+    multi_json (1.19.1)
     multi_xml (0.6.0)
-    multipart-post (2.3.0)
-    nokogiri (1.14.2)
-      mini_portile2 (~> 2.8.0)
+    multipart-post (2.4.1)
+    mutex_m (0.3.0)
+    nokogiri (1.17.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
@@ -71,49 +104,60 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 4)
-    prime (0.1.2)
+    prime (0.1.4)
       forwardable
       singleton
-    psych (5.1.0)
+    process_executer (1.1.2)
+    psych (5.3.1)
+      date
       stringio
-    public_suffix (5.0.1)
-    racc (1.6.2)
-    rack (3.0.4.1)
+    public_suffix (6.0.2)
+    racc (1.8.1)
+    rack (3.2.4)
     rainbow (3.1.1)
-    rake (13.0.6)
-    rchardet (1.8.0)
-    rdoc (6.5.0)
+    rake (13.3.1)
+    rchardet (1.10.0)
+    rdoc (7.1.0)
+      erb
       psych (>= 4.0.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)
+      tsort
+    reline (0.6.3)
+      io-console (~> 0.5)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.7)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.6)
     ruby2_keywords (0.0.5)
+    securerandom (0.3.2)
     semver2 (3.4.2)
-    singleton (0.1.1)
-    stringio (3.0.5)
+    singleton (0.3.0)
+    stringio (3.2.0)
     thread_safe (0.3.6)
-    zpng (0.4.5)
+    tsort (0.2.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    zpng (0.4.6)
+      iostruct (>= 0.7.0)
       rainbow (~> 3.1.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  iostruct (>= 0.0.5)
+  iostruct (>= 0.7.0)
   juwelier
   prime
   rspec
-  zpng (>= 0.4.5)
+  zpng (>= 0.4.6)
 
 BUNDLED WITH
-   2.3.12
+   2.4.22

data/TODO

@@ -11,6 +11,8 @@
 [ ] advices on what tool to use
 [ ] SilentEye
 [ ] chunks length check, as in pngcheck
+[ ] hiding data in iCCP
+[ ] hiding data before/after ICC apply
 
 [ ] CLI: self-describe
 

data/VERSION

@@ -1 +1 @@
-0.2.13
+0.2.14

data/lib/zsteg/checker/steganography_png.rb

@@ -11,13 +11,13 @@ module ZSteg
       #   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
+      class Result < IOStruct.new("nCNa*", :magic, :bitloss, :secret_size, :secret_type, struct_name: 'SteganographyPNG')
         def valid?
           magic == 0x116b && (1..8).include?(bitloss)
         end
 
         def to_s
-          super.sub('#<struct ZSteg::Checker::SteganographyPNG::Result', 'SteganographyPNG').sub(/>$/,'').bright_red
+          super.sub(/>$/,'').bright_red
         end
       end
 

data/lib/zsteg/checker/wbstego.rb

@@ -11,7 +11,7 @@ module ZSteg
         "Rijndael",  # 4
       ]
 
-      class Result < IOStruct.new "a3a3a*", :size, :ext, :data, :even, :hdr, :enc, :mix, :controlbyte
+      class Result < IOStruct.new("a3a3a*", :size, :ext, :data, :even, :hdr, :enc, :mix, :controlbyte, struct_name: 'wbStego')
         attr_accessor :color
 
         def initialize *args
@@ -39,7 +39,6 @@ module ZSteg
 
         def to_s
           s = inspect.
-              sub("#<struct #{self.class.to_s}", "<wbStego").
               gsub(/, \w+=nil/,'')
 
           color = @color

data/lib/zsteg/checker/zlib.rb

@@ -21,6 +21,7 @@ module ZSteg
       # http://blog.w3challs.com/index.php?post/2012/03/25/NDH2k12-Prequals-We-are-looking-for-a-real-hacker-Wallpaper-image
       # http://blog.w3challs.com/public/ndh2k12_prequalls/sp113.bmp
       def self.check_data data
+        data = data.force_encoding('ASCII-8BIT')
         return unless idx = data.index(/\x78[\x9c\xda\x01]/n)
 
         zi = ::Zlib::Inflate.new

data/lib/zsteg/checker.rb

@@ -76,6 +76,7 @@ module ZSteg
         check_extradata
         check_metadata
         check_imagedata
+        check_chunks
       end
 
       if @image.format == :bmp
@@ -143,6 +144,16 @@ module ZSteg
       process_result @image.imagedata, h
     end
 
+    def check_chunks
+      @image.chunks.each_with_index do |chunk, idx|
+        next unless chunk.respond_to?(:size) && chunk.respond_to?(:data)
+        next unless chunk.size && chunk.data
+        next if chunk.size < 5 || chunk.is_a?(ZPNG::TextChunk) || chunk.is_a?(ZPNG::Chunk::IDAT)
+        h = { :title => "chunk:#{idx}:#{chunk.type}", :show_title => true }
+        process_result chunk.data, h
+      end
+    end
+
     def check_extradata
       # accessing imagedata implicitly unpacks zlib stream
       # zlib stream may contain extradata

data/lib/zsteg/cli/cli.rb

@@ -244,6 +244,17 @@ module ZSteg
         @img.extradata[$1.to_i]
       when /imagedata/
         @img.imagedata
+      when /\Achunk:(\d+):(.+)\Z/
+        # chunk with type check
+        idx, type = $1.to_i, $2
+        chunk = @img.chunks[idx]
+        raise "chunk ##{idx}: expected #{type} type, but got #{chunk.type}" if chunk.type != type
+        chunk.data
+      when /\Achunk:(\d+)\Z/
+        # chunk without type check
+        idx, type = $1.to_i, $2
+        chunk = @img.chunks[idx]
+        chunk.data
       else
         h = decode_param_string name
         h[:limit] = @options[:limit] if @options[:limit] != Checker::DEFAULT_LIMIT

data/lib/zsteg/result.rb

@@ -8,8 +8,9 @@ module ZSteg
       end
     end
 
-    class OpenStego < IOStruct.new "CVCCCC",
-      :version, :data_len, :channel_bits, :fname_len, :compress, :encrypt, :fname
+    class OpenStego < IOStruct.new("CVCCCC",
+                                   :version, :data_len, :channel_bits, :fname_len, :compress, :encrypt, :fname,
+                                   struct_name: 'OpenStego')
 
       def self.read io
         super.tap do |r|
@@ -18,7 +19,7 @@ module ZSteg
       end
 
       def to_s
-        super.sub(/^<Result::/,'').sub(/>$/,'').bright_red
+        super.sub(/>$/,'').bright_red
       end
     end
 

data/spec/plte_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe "samples/plte1.png" do
+  subject{ cli(sample("plte1.png")) }
+  it { should include("Zip archive data") }
+
+  describe "--extract" do
+    it "should extract zip file from PLTE with type check" do
+      r = cli(sample("plte1.png"), "--extract", "chunk:1:PLTE")
+      md5(r).should == 'e125f0f322fd1e99050dba688968385c'
+    end
+    it "should extract zip file from PLTE without type check" do
+      r = cli(sample("plte1.png"), "--extract", "chunk:1")
+      md5(r).should == 'e125f0f322fd1e99050dba688968385c'
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,9 +1,14 @@
 #coding: binary
 $:.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
 require 'zsteg'
+require 'digest/md5'
 
 SAMPLES_DIR = File.expand_path("../samples", File.dirname(__FILE__))
 
+def md5 data
+  Digest::MD5.hexdigest(data)
+end
+
 def each_sample glob="*.png"
   Dir[File.join(SAMPLES_DIR, glob)].each do |fname|
     yield fname.sub(Dir.pwd+'/','')

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.13 ruby lib
+# stub: zsteg 0.2.14 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "zsteg".freeze
-  s.version = "0.2.13"
+  s.version = "0.2.14"
 
   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 = "2023-02-19"
+  s.date = "2026-01-28"
   s.email = "zed.0xff@gmail.com".freeze
   s.executables = ["zsteg".freeze, "zsteg-mask".freeze, "zsteg-reflow".freeze]
   s.extra_rdoc_files = [
@@ -59,6 +59,7 @@ Gem::Specification.new do |s|
     "spec/mask_spec.rb",
     "spec/newbiecontest_spec.rb",
     "spec/openstego_spec.rb",
+    "spec/plte_spec.rb",
     "spec/polictf2012_spec.rb",
     "spec/prime_spec.rb",
     "spec/r3g2b3_spec.rb",
@@ -75,7 +76,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/zed-0xff/zsteg".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.3.7".freeze
+  s.rubygems_version = "3.2.33".freeze
   s.summary = "Detect stegano-hidden data in PNG & BMP files.".freeze
 
   if s.respond_to? :specification_version then
@@ -83,14 +84,14 @@ Gem::Specification.new do |s|
   end
 
   if s.respond_to? :add_runtime_dependency then
-    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<zpng>.freeze, [">= 0.4.6"])
+    s.add_runtime_dependency(%q<iostruct>.freeze, [">= 0.7.0"])
     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.5"])
-    s.add_dependency(%q<iostruct>.freeze, [">= 0.0.5"])
+    s.add_dependency(%q<zpng>.freeze, [">= 0.4.6"])
+    s.add_dependency(%q<iostruct>.freeze, [">= 0.7.0"])
     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.13
+  version: 0.2.14
 platform: ruby
 authors:
 - Andrey "Zed" Zaikin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-19 00:00:00.000000000 Z
+date: 2026-01-28 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.5
+        version: 0.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
 - !ruby/object:Gem::Dependency
   name: iostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: prime
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +131,7 @@ files:
 - spec/mask_spec.rb
 - spec/newbiecontest_spec.rb
 - spec/openstego_spec.rb
+- spec/plte_spec.rb
 - spec/polictf2012_spec.rb
 - spec/prime_spec.rb
 - spec/r3g2b3_spec.rb
@@ -163,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Detect stegano-hidden data in PNG & BMP files.