elf-mithril 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 006667100c2ec68be447f345468a69b68b450488
+  data.tar.gz: 40c28aef0c8505fe182f18371da24057d81c5d68
+SHA512:
+  metadata.gz: bac9ad01b34f4b1a71c70d0a2f73110fd1f81a7d7a460e0450d8bb08cb2d59ba2d3e4f71f29833854a8e18ece9ae20b3844e368fb21cde5683d9da908791a8f5
+  data.tar.gz: 977a274054223feb5bf9ab48787ea547bfafa6c4d6571cd5ef3c328a1b0692c7b7f26e60d5d8203f3f4f2e2de26dd2406f1ace1452cf9ff4228798b54a94ae12

data/lib/mithril/policy/default/twostate.rb

@@ -6,7 +6,7 @@ module Elf::Policy::Generator
       section('.init')
       section('.fini')
       section('.text')
-      section('.plt')
+    #  section('.plt')
       section('.data')
       section('.bss')
       section('.rodata')
@@ -51,6 +51,7 @@ module Elf::Policy::Generator
         H::initializer_functions(filename).each {|initializer|
           call initializer
         }
+        call section_start('.init')
         call '_fini'
       end
     end 

data/lib/mithril/policy/dsl.rb

@@ -45,11 +45,15 @@ module Elf
           if t.is_a? Data
             x= data
             x[t.from] ||= {}
-            x[t.from][t.to] ||= {}
-            x[t.from][t.to][t.tag] ||= t
-            x[t.from][t.to][t.tag].read ||= t.read
-            x[t.from][t.to][t.tag].write ||= t.write
-            x[t.from][t.to][t.tag].exec ||= t.exec            
+            x[t.from][t.tag] ||= t
+            if(x[t.from][t.tag].to  != t.to)
+              raise ArgumentError "Invalid Policy, different to states on same tag" #TODO: allow
+              #different accesses to go to different tags. at the moment, this is moot, because data
+              #access is unconditional
+            end
+            x[t.from][t.tag].read ||= t.read
+            x[t.from][t.tag].write ||= t.write
+            x[t.from][t.tag].exec ||= t.exec            
           elsif t.is_a? Call
             calls << t
           else
@@ -169,7 +173,7 @@ module Elf
           }
           out.calls.last.off = resolve_reference(elffile,relocations,out.calls.last.off.offset, call.symbol)
         end
-        self.data.values.map(&:values).flatten.map(&:values).flatten.each do |data|
+        self.data.values.map(&:values).flatten.each do |data|
           out.data << factory.elfp_data.new.tap {|x|
             x.from = state_ids[data.from]
             x.to = state_ids[data.to]
@@ -179,6 +183,7 @@ module Elf
             x.type |= ELFP::ELFP_RW_EXEC if data.exec
             raise RuntimeError.new "Unknown tag #{data.tag}" unless tag_ids.include? data.tag
             x.tag =   tag_ids[data.tag]
+            print "#{x.from} to #{x.to} data #{data.tag} = #{x.tag} #{data.read ? "r":" "}#{data.write ? "w":" "}#{data.exec ? "x":" "}\n" 
           }
         end
         out = Elf::ProgBits.new(".elfbac",nil,out.to_binary_s)

data/lib/mithril/version.rb

@@ -1,3 +1,3 @@
 module Mithril
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/mithril.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_dependency 'bindata', '>=1.5.0'
+  spec.add_dependency 'jbangert-bindata', '>=1.5.0'
   spec.add_dependency 'renum'  , '1.4.0'
   spec.add_dependency 'andand'
   spec.add_dependency 'segment_tree'

metadata

@@ -1,68 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: elf-mithril
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Julian Bangert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2015-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bindata
+  name: jbangert-bindata
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: renum
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -78,49 +69,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: andand
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: segment_tree
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rbtree-pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: In Soviet Russia, Mithril forges Elf
@@ -133,7 +118,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -171,27 +156,26 @@ files:
 homepage: https://github.com/jbangert/mithril
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The Mithril toolkit for canonical elf manipulation
 test_files:
 - test/hash_test.rb