feh-bin 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6ae7f744caaaea5469cdccc2df546cc75ecc47113065e1dd23f683e55bcd929
-  data.tar.gz: 23d4587f451147c72a4612b9b259ea308e05bedc747b16fc6fc11b63f5161e15
+  metadata.gz: 0304cfd58f785acb4908eb96856da9380ae89e6161d7d450ab2e40ea2d465ce0
+  data.tar.gz: 671afa221a5a7d418c6baec3d8517a38b1dcd6f0a83da55a712f515ea3db71ce
 SHA512:
-  metadata.gz: 8bb752115f14ba7815a8faadc7bedb7772501f2ec4bb66270cf14fd2850a6646cf519df407ab60b21e4fa34fa0e41f086873e7abf79f4d831fd1e762bdbfd429
-  data.tar.gz: ba17da68e9538d5a094fc50e7801b35c5b983d4449bbec9cc78245d107e298c77e04af094f826b8503a1a6b8c89ae7a4c1ee85acfd616bf1338a735aa41e3905
+  metadata.gz: 7f3585ad8d91ffc43b3af67fd918ffe74435155f33f247d605175352805c7edf709566de3b3e0bc10fa8efbf29fa58f188535e73c3175c6a2a1c5bec545a53aa
+  data.tar.gz: 01baff5c76e53a9cdd6b2e6432be210197fec4158292dbc0c26e38015bc24627f15e6fb3de1da3362e0142fdb3569921a36ce4a50cd634107b33b9700f3872df

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    feh-bin (0.1.0)
+    feh-bin (0.1.2)
 
 GEM
   remote: https://rubygems.org/
@@ -19,4 +19,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.16.3
+   1.16.5

data/README.md

@@ -26,6 +26,16 @@ Dir.glob('assets/Common/SRPGMap/*.bin.lz').each do |fname|
 end
 ```
 
+## Changelog
+
+### V0.1.2
+
+- Fixed double encryption issue in `Feh::Bin.compress`
+
+### V0.1.0
+
+- Initial release
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/feh/bin.rb

@@ -10,10 +10,9 @@ module Feh
     # @return [Symbol] error code if the input is not a valid .bin.lz file
     def self.decompress(buf)
       buf = buf.bytes if buf.is_a?(String)
-      read_bin_lz(buf)
-#      buf = read_bin_lz(buf)
-#      return buf if buf.is_a?(Symbol)
-#      LZ11.new(buf).decompress
+      buf2 = read_bin_lz(buf)
+      return buf2 if buf2.is_a?(Symbol)
+      LZ11.new(buf2).decompress
     end
 
     # Compresses data into a .bin.lz file.
@@ -22,9 +21,9 @@ module Feh
     # @return [Symbol] error code if the input is not a valid data buffer
     def self.compress(buf)
       buf = buf.bytes if buf.is_a?(String)
-      buf = LZ11.new(buf).compress
-      return buf if buf.is_a?(Symbol)
-      write_bin_lz(buf)
+      buf2 = LZ11.new(buf).compress
+      return buf2 if buf2.is_a?(Symbol)
+      write_bin_lz(buf2, buf.size)
     end
 
     # Unpacks a Fire Emblem Heroes .bin.lz file.
@@ -41,29 +40,27 @@ module Feh
           4.times {|j| buf[i + j] ^= xorkey[j]}
           4.times {|j| xorkey[j] ^= buf[i + j]}
         end
-        LZ11.new(buf).decompress
-      elsif header.first == 0x04 && xorseed == buf.size
-        xorkey = [0x8083 * xorseed].pack('<I').bytes
-        (0...buf.size).step(4).each do |i|
-          4.times {|j| buf[i + j] ^= xorkey[j]}
-          4.times {|j| xorkey[j] ^= buf[i + j]}
-        end
         buf
+#      elsif header.first == 0x04 && xorseed == buf.size
+#        xorkey = [0x8083 * xorseed].pack('<I').bytes
+#        (0...buf.size).step(4).each do |i|
+#          4.times {|j| buf[i + j] ^= xorkey[j]}
+#          4.times {|j| xorkey[j] ^= buf[i + j]}
+#        end
+#        buf
       else
         :invalid_archive
       end
     end
 
     # Packs a Fire Emblem Heroes .bin.lz file.
-    # @param buf [Array<Integer>, String] content of an LZ11 archive
+    # @param bytes [Array<Integer>, String] content of an LZ11 archive
+    # @param xorseed [Integer, nil] optional XOR encryption value
     # @return [Array<Integer>] content of the packed .bin.lz file
-    # @return [Symbol] error code if the input is not a valid LZ11 archive
-    def self.write_bin_lz(buf)
-      buf = buf.bytes if buf.is_a?(String)
-      bytes = LZ11.new(buf).compress
-      return bytes if bytes.is_a?(Symbol)
+    def self.write_bin_lz(bytes, xorseed = nil)
+      bytes = bytes.bytes if bytes.is_a?(String)
       bytes += [0] * ((-bytes.size) % 4)
-      xorseed = buf.size
+      xorseed = bytes.size if xorseed.nil?
       header = [xorseed * 0x100 + 0x17].pack('<I').bytes
       xorkey = [0x8083 * xorseed].pack('<I').bytes
       4.times {|j| bytes[4 + j] ^= xorkey[j]}

data/lib/feh/bin/version.rb

@@ -1,6 +1,6 @@
 module Feh
   module Bin
     # Version number.
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feh-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Quinton Miller