ruby-macho 1.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50aeda7d9f7ac3c91c6e34a9d150ffbf79d89389cb591d06494fb0eb4e48023b
-  data.tar.gz: e7f56ff39f7159c20572e66bd07b506e826152e8b1da3d78afe22f4e8516b4a9
+  metadata.gz: 6341c1a29aeae7169fea7f1e7fc11339331f21c2b07a3a19e7f68b5dd76af03d
+  data.tar.gz: 9b5dd29c4a03c18bf6261e20641c95c584958ee142d4d64a37f9db8352065727
 SHA512:
-  metadata.gz: 2bb5bd7d605eb023b8cdf95446776507ddcfb08a7d30bc45acf3fff24d3b4edc5666b8c5f4801e226524ba60dad043a3c251819ff8b0cdd77e0e5b491a4a2e81
-  data.tar.gz: a2d553f64c0e73882dcbce972bf8cdab7554c98f1c6daf2d504588e11d05d194ac417127d61a32f93263fa3487ab1655cf16867994018464c8d5a9f4df9b6073
+  metadata.gz: c3964af02f0b1abf51de625e1d69a8fd966c30d5bf93cfde410ac127fab57864ae6331441d2afa1acdd100c7187f5d05883ecd8736d88076507823b16627ab10
+  data.tar.gz: c5a8ec50db69dccef0161dd96d6b7f23a47713a0fb8551d1bae10afa2690ed6837b52f9f3f49bd0826610b7c7a1841fadda2d1c53f6ab91f118732e36a3a4bd7

data/lib/macho.rb

@@ -12,7 +12,7 @@ require_relative "macho/tools"
 # The primary namespace for ruby-macho.
 module MachO
   # release version
-  VERSION = "1.4.0".freeze
+  VERSION = "2.0.0".freeze
 
   # Opens the given filename as a MachOFile or FatFile, depending on its magic.
   # @param filename [String] the file being opened

data/lib/macho/exceptions.rb

@@ -194,14 +194,4 @@ module MachO
       super "Unimplemented: #{thing}"
     end
   end
-
-  # Raised when attempting to create a {FatFile} from one or more {MachOFile}s
-  #  whose offsets will not fit within the resulting 32-bit {Headers::FatArch#offset} fields.
-  class FatArchOffsetOverflowError < MachOError
-    # @param offset [Integer] the offending offset
-    def initialize(offset)
-      super "Offset #{offset} exceeds the 32-bit width of a fat_arch offset." \
-            " Consider merging with `fat64: true`"
-    end
-  end
 end

data/lib/macho/fat_file.rb

@@ -14,7 +14,7 @@ module MachO
     # @return [Headers::FatHeader] the file's header
     attr_reader :header
 
-    # @return [Array<Headers::FatArch>, Array<Headers::FatArch64] an array of fat architectures
+    # @return [Array<Headers::FatArch>] an array of fat architectures
     attr_reader :fat_archs
 
     # @return [Array<MachOFile>] an array of Mach-O binaries
@@ -22,53 +22,37 @@ module MachO
 
     # Creates a new FatFile from the given (single-arch) Mach-Os
     # @param machos [Array<MachOFile>] the machos to combine
-    # @param fat64 [Boolean] whether to use {Headers::FatArch64}s to represent each slice
     # @return [FatFile] a new FatFile containing the give machos
     # @raise [ArgumentError] if less than one Mach-O is given
-    # @raise [FatArchOffsetOverflowError] if the Mach-Os are too big to be represented
-    #  in a 32-bit {Headers::FatArch} and `fat64` is `false`.
-    def self.new_from_machos(*machos, fat64: false)
+    def self.new_from_machos(*machos)
       raise ArgumentError, "expected at least one Mach-O" if machos.empty?
 
-      fa_klass, magic = if fat64
-        [Headers::FatArch64, Headers::FAT_MAGIC_64]
-      else
-        [Headers::FatArch, Headers::FAT_MAGIC]
-      end
-
       # put the smaller alignments further forwards in fat macho, so that we do less padding
       machos = machos.sort_by(&:segment_alignment)
 
-      bin = if String.instance_methods.include? :+@
-        +""
-      else
-        ""
-      end
+      bin = +""
 
-      bin << Headers::FatHeader.new(magic, machos.size).serialize
-      offset = Headers::FatHeader.bytesize + (machos.size * fa_klass.bytesize)
+      bin << Headers::FatHeader.new(Headers::FAT_MAGIC, machos.size).serialize
+      offset = Headers::FatHeader.bytesize + (machos.size * Headers::FatArch.bytesize)
 
       macho_pads = {}
+      macho_bins = {}
 
       machos.each do |macho|
-        macho_offset = Utils.round(offset, 2**macho.segment_alignment)
-
-        if !fat64 && macho_offset > (2**32 - 1)
-          raise FatArchOffsetOverflowError, macho_offset
-        end
-
+        macho_offset      = Utils.round(offset, 2**macho.segment_alignment)
         macho_pads[macho] = Utils.padding_for(offset, 2**macho.segment_alignment)
+        macho_bins[macho] = macho.serialize
 
-        bin << fa_klass.new(macho.header.cputype, macho.header.cpusubtype,
-                            macho_offset, macho.serialize.bytesize,
-                            macho.segment_alignment).serialize
+        bin << Headers::FatArch.new(macho.header.cputype, macho.header.cpusubtype,
+                                    macho_offset, macho_bins[macho].bytesize,
+                                    macho.segment_alignment).serialize
 
-        offset += (macho.serialize.bytesize + macho_pads[macho])
+        offset += (macho_bins[macho].bytesize + macho_pads[macho])
       end
 
       machos.each do |macho|
         bin << Utils.nullpad(macho_pads[macho])
-        bin << macho.serialize
+        bin << macho_bins[macho]
       end
 
       new_from_bin(bin)
@@ -294,7 +278,6 @@ module MachO
     # @note Overwrites all data in the file!
     def write!
       raise MachOError, "no initial file to write to" if filename.nil?
-
       File.open(@filename, "wb") { |f| f.write(@raw_data) }
     end
 
@@ -344,12 +327,10 @@ module MachO
     def populate_fat_archs
       archs = []
 
-      fa_klass = Utils.fat_magic32?(header.magic) ? Headers::FatArch : Headers::FatArch64
-      fa_off   = Headers::FatHeader.bytesize
-      fa_len   = fa_klass.bytesize
-
+      fa_off = Headers::FatHeader.bytesize
+      fa_len = Headers::FatArch.bytesize
       header.nfat_arch.times do |i|
-        archs << fa_klass.new_from_bin(:big, @raw_data[fa_off + (fa_len * i), fa_len])
+        archs << Headers::FatArch.new_from_bin(:big, @raw_data[fa_off + (fa_len * i), fa_len])
       end
 
       archs
@@ -399,7 +380,6 @@ module MachO
 
           # Strict mode: Immediately re-raise. Otherwise: Retain, check later.
           raise error if strict
-
           errors << error
         end
       end

data/lib/macho/headers.rb

@@ -6,19 +6,11 @@ module MachO
     FAT_MAGIC = 0xcafebabe
 
     # little-endian fat magic
-    # @note This is defined for completeness, but should never appear in ruby-macho code,
-    #  since fat headers are always big-endian.
+    # this is defined, but should never appear in ruby-macho code because
+    # fat headers are always big-endian and therefore always unpacked as such.
     # @api private
     FAT_CIGAM = 0xbebafeca
 
-    # 64-bit big-endian fat magic
-    FAT_MAGIC_64 = 0xcafebabf
-
-    # 64-bit little-endian fat magic
-    # @note This is defined for completeness, but should never appear in ruby-macho code,
-    #   since fat headers are always big-endian.
-    FAT_CIGAM_64 = 0xbfbafeca
-
     # 32-bit big-endian magic
     # @api private
     MH_MAGIC = 0xfeedface
@@ -39,7 +31,6 @@ module MachO
     # @api private
     MH_MAGICS = {
       FAT_MAGIC => "FAT_MAGIC",
-      FAT_MAGIC_64 => "FAT_MAGIC_64",
       MH_MAGIC => "MH_MAGIC",
       MH_CIGAM => "MH_CIGAM",
       MH_MAGIC_64 => "MH_MAGIC_64",
@@ -50,11 +41,6 @@ module MachO
     # @api private
     CPU_ARCH_ABI64 = 0x01000000
 
-    # mask for CPUs with 64-bit architectures (when running a 32-bit ABI?)
-    # @see https://github.com/Homebrew/ruby-macho/issues/113
-    # @api private
-    CPU_ARCH_ABI32 = 0x02000000
-
     # any CPU (unused?)
     # @api private
     CPU_TYPE_ANY = -1
@@ -83,10 +69,6 @@ module MachO
     # @api private
     CPU_TYPE_ARM64 = (CPU_TYPE_ARM | CPU_ARCH_ABI64)
 
-    # 64-bit ARM compatible CPUs (running in 32-bit mode?)
-    # @see https://github.com/Homebrew/ruby-macho/issues/113
-    CPU_TYPE_ARM64_32 = (CPU_TYPE_ARM | CPU_ARCH_ABI32)
-
     # PowerPC compatible CPUs
     # @api private
     CPU_TYPE_POWERPC = 0x12
@@ -103,7 +85,6 @@ module MachO
       CPU_TYPE_X86_64 => :x86_64,
       CPU_TYPE_ARM => :arm,
       CPU_TYPE_ARM64 => :arm64,
-      CPU_TYPE_ARM64_32 => :arm64_32,
       CPU_TYPE_POWERPC => :ppc,
       CPU_TYPE_POWERPC64 => :ppc64,
     }.freeze
@@ -237,14 +218,6 @@ module MachO
     # @api private
     CPU_SUBTYPE_ARM64_V8 = 1
 
-    # the v8 sub-type for `CPU_TYPE_ARM64_32`
-    # @api private
-    CPU_SUBTYPE_ARM64_32_V8 = 1
-
-    # the e (A12) sub-type for `CPU_TYPE_ARM64`
-    # @api private
-    CPU_SUBTYPE_ARM64E = 2
-
     # the lowest common sub-type for `CPU_TYPE_MC88000`
     # @api private
     CPU_SUBTYPE_MC88000_ALL = 0
@@ -354,10 +327,6 @@ module MachO
       CPU_TYPE_ARM64 => {
         CPU_SUBTYPE_ARM64_ALL => :arm64,
         CPU_SUBTYPE_ARM64_V8 => :arm64v8,
-        CPU_SUBTYPE_ARM64E => :arm64e,
-      }.freeze,
-      CPU_TYPE_ARM64_32 => {
-        CPU_SUBTYPE_ARM64_32_V8 => :arm64_32v8,
       }.freeze,
       CPU_TYPE_POWERPC => {
         CPU_SUBTYPE_POWERPC_ALL => :ppc,
@@ -517,10 +486,8 @@ module MachO
       end
     end
 
-    # 32-bit fat binary header architecture structure. A 32-bit fat Mach-O has one or more of
-    #  these, indicating one or more internal Mach-O blobs.
-    # @note "32-bit" indicates the fact that this structure stores 32-bit offsets, not that the
-    #  Mach-Os that it points to necessarily *are* 32-bit.
+    # Fat binary header architecture structure. A Fat binary has one or more of
+    # these, representing one or more internal Mach-O blobs.
     # @see MachO::Headers::FatHeader
     class FatArch < MachOStructure
       # @return [Integer] the CPU type of the Mach-O
@@ -538,10 +505,10 @@ module MachO
       # @return [Integer] the alignment, as a power of 2
       attr_reader :align
 
-      # @note Always big endian.
+      # always big-endian
       # @see MachOStructure::FORMAT
       # @api private
-      FORMAT = "L>5".freeze
+      FORMAT = "N5".freeze
 
       # @see MachOStructure::SIZEOF
       # @api private
@@ -575,43 +542,6 @@ module MachO
       end
     end
 
-    # 64-bit fat binary header architecture structure. A 64-bit fat Mach-O has one or more of
-    #  these, indicating one or more internal Mach-O blobs.
-    # @note "64-bit" indicates the fact that this structure stores 64-bit offsets, not that the
-    #  Mach-Os that it points to necessarily *are* 64-bit.
-    # @see MachO::Headers::FatHeader
-    class FatArch64 < FatArch
-      # @return [void]
-      attr_reader :reserved
-
-      # @note Always big endian.
-      # @see MachOStructure::FORMAT
-      # @api private
-      FORMAT = "L>2Q>2L>2".freeze
-
-      # @see MachOStructure::SIZEOF
-      # @api private
-      SIZEOF = 32
-
-      # @api private
-      def initialize(cputype, cpusubtype, offset, size, align, reserved = 0)
-        super(cputype, cpusubtype, offset, size, align)
-        @reserved = reserved
-      end
-
-      # @return [String] the serialized fields of the fat arch
-      def serialize
-        [cputype, cpusubtype, offset, size, align, reserved].pack(FORMAT)
-      end
-
-      # @return [Hash] a hash representation of this {FatArch64}
-      def to_h
-        {
-          "reserved" => reserved,
-        }.merge super
-      end
-    end
-
     # 32-bit Mach-O file header structure
     class MachHeader < MachOStructure
       # @return [Integer] the magic number
@@ -663,9 +593,7 @@ module MachO
       # @return [Boolean] true if `flag` is present in the header's flag section
       def flag?(flag)
         flag = MH_FLAGS[flag]
-
         return false if flag.nil?
-
         flags & flag == flag
       end
 

data/lib/macho/load_commands.rb

@@ -242,7 +242,6 @@ module MachO
       # @api private
       def serialize(context)
         raise LoadCommandNotSerializableError, LOAD_COMMANDS[cmd] unless serializable?
-
         format = Utils.specialize_format(FORMAT, context.endianness)
         [cmd, SIZEOF].pack(format)
       end
@@ -299,9 +298,7 @@ module MachO
             lc_end = view.offset + lc.cmdsize - 1
             raw_string = view.raw_data.slice(lc_str_abs..lc_end)
             @string, null_byte, _padding = raw_string.partition("\x00")
-
             raise LCStrMalformedError, lc if null_byte.empty?
-
             @string_offset = lc_str
           else
             @string = lc_str
@@ -476,9 +473,7 @@ module MachO
       # @return [Boolean] true if `flag` is present in the segment's flag field
       def flag?(flag)
         flag = SEGMENT_FLAGS[flag]
-
         return false if flag.nil?
-
         flags & flag == flag
       end
 

data/lib/macho/macho_file.rb

@@ -431,7 +431,6 @@ module MachO
     # @note Overwrites all data in the file!
     def write!
       raise MachOError, "no initial file to write to" if @filename.nil?
-
       File.open(@filename, "wb") { |f| f.write(@raw_data) }
     end
 

data/lib/macho/sections.rb

@@ -150,9 +150,7 @@ module MachO
       # @return [Boolean] whether the flag is present in the section's {flags}
       def flag?(flag)
         flag = SECTION_FLAGS[flag]
-
         return false if flag.nil?
-
         flags & flag == flag
       end
 

data/lib/macho/tools.rb

@@ -89,9 +89,8 @@ module MachO
     # Merge multiple Mach-Os into one universal (Fat) binary.
     # @param filename [String] the fat binary to create
     # @param files [Array<String>] the files to merge
-    # @param fat64 [Boolean] whether to use {Headers::FatArch64}s to represent each slice
     # @return [void]
-    def self.merge_machos(filename, *files, fat64: false)
+    def self.merge_machos(filename, *files)
       machos = files.map do |file|
         macho = MachO.open(file)
         case macho
@@ -102,7 +101,7 @@ module MachO
         end
       end.flatten
 
-      fat_macho = MachO::FatFile.new_from_machos(*machos, :fat64 => fat64)
+      fat_macho = MachO::FatFile.new_from_machos(*machos)
       fat_macho.write(filename)
     end
   end

data/lib/macho/utils.rb

@@ -27,7 +27,7 @@ module MachO
     # @return [String] the null string (or empty string, for `size = 0`)
     # @raise [ArgumentError] if a non-positive nullpad is requested
     def self.nullpad(size)
-      raise ArgumentError, "size < 0: #{size}" if size < 0
+      raise ArgumentError, "size < 0: #{size}" if size.negative?
 
       "\x00" * size
     end
@@ -75,49 +75,35 @@ module MachO
     # @param num [Integer] the number being checked
     # @return [Boolean] whether `num` is a valid Fat magic number
     def self.fat_magic?(num)
-      [Headers::FAT_MAGIC, Headers::FAT_MAGIC_64].include? num
-    end
-
-    # Compares the given number to valid 32-bit Fat magic numbers.
-    # @param num [Integer] the number being checked
-    # @return [Boolean] whether `num` is a valid 32-bit fat magic number
-    def self.fat_magic32?(num)
       num == Headers::FAT_MAGIC
     end
 
-    # Compares the given number to valid 64-bit Fat magic numbers.
-    # @param num [Integer] the number being checked
-    # @return [Boolean] whether `num` is a valid 64-bit fat magic number
-    def self.fat_magic64?(num)
-      num == Headers::FAT_MAGIC_64
-    end
-
     # Compares the given number to valid 32-bit Mach-O magic numbers.
     # @param num [Integer] the number being checked
     # @return [Boolean] whether `num` is a valid 32-bit magic number
     def self.magic32?(num)
-      [Headers::MH_MAGIC, Headers::MH_CIGAM].include? num
+      num == Headers::MH_MAGIC || num == Headers::MH_CIGAM
     end
 
     # Compares the given number to valid 64-bit Mach-O magic numbers.
     # @param num [Integer] the number being checked
     # @return [Boolean] whether `num` is a valid 64-bit magic number
     def self.magic64?(num)
-      [Headers::MH_MAGIC_64, Headers::MH_CIGAM_64].include? num
+      num == Headers::MH_MAGIC_64 || num == Headers::MH_CIGAM_64
     end
 
     # Compares the given number to valid little-endian magic numbers.
     # @param num [Integer] the number being checked
     # @return [Boolean] whether `num` is a valid little-endian magic number
     def self.little_magic?(num)
-      [Headers::MH_CIGAM, Headers::MH_CIGAM_64].include? num
+      num == Headers::MH_CIGAM || num == Headers::MH_CIGAM_64
     end
 
     # Compares the given number to valid big-endian magic numbers.
     # @param num [Integer] the number being checked
     # @return [Boolean] whether `num` is a valid big-endian magic number
     def self.big_magic?(num)
-      [Headers::MH_MAGIC, Headers::MH_MAGIC_64].include? num
+      num == Headers::MH_CIGAM || num == Headers::MH_CIGAM_64
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macho
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-21 00:00:00.000000000 Z
+date: 2018-07-03 00:00:00.000000000 Z
 dependencies: []
 description: A library for viewing and manipulating Mach-O files in Ruby.
 email: william@yossarian.net
@@ -42,14 +42,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ruby-macho - Mach-O file analyzer.