fix to encryption bug

rubyzip · simonoff · Jan 17, 2015 · Dec 30, 2014 · Jan 3, 2015 · Jan 3, 2015
commit fd26052525455c00084f497024f74cf9b2fbabe4
diff --git a/lib/zip/deflater.rb b/lib/zip/deflater.rb
@@ -5,20 +5,22 @@ def initialize(output_stream, level = Zip.default_compression, encrypter = NullE
       super()
       @output_stream = output_stream
       @zlib_deflater = ::Zlib::Deflate.new(level, -::Zlib::MAX_WBITS)
-      @size          = 0
+      @size          = encrypter.header_bytesize
       @crc           = ::Zlib.crc32
       @encrypter     = encrypter
-      @output_stream << @encrypter.header(@crc)
+      @buffer_stream = ::StringIO.new('')
     end
 
     def << (data)
       val   = data.to_s
       @crc  = Zlib::crc32(val, @crc)
-      @size += val.bytesize + @encrypter.header_bytesize
-      @output_stream << @encrypter.encrypt(@zlib_deflater.deflate(data))
+      @size += val.bytesize
+      @buffer_stream << @zlib_deflater.deflate(data)
     end
 
     def finish
+      @output_stream << @encrypter.header(@crc)
+      @output_stream << @encrypter.encrypt(@buffer_stream.string)
       @output_stream << @encrypter.encrypt(@zlib_deflater.finish) until @zlib_deflater.finished?
     end