crokus 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc241276f39be6875db2caf5b00a5a4922906163c97bbe183d0e05dd697162c1
-  data.tar.gz: 1491b17c9072e7c1c52a7dc136b3a604444a36ff39548754eb3ca87654e20b6a
+  metadata.gz: 7712eb73a1d5f62f9b9b7a63eae496dbd67a346b5a17b56b4e31d60fd9deee3d
+  data.tar.gz: fed83c851d88bc36a18bd060883644be97ffe4c6cddf7765aedd4a1c37da3add
 SHA512:
-  metadata.gz: 6d2f4763cf304256a1a08ab6974535e5c6448e354eeef787389e1c27424c276268a6cf3b702428c68dafbc8b60f260d143f39b52634152ccd0302537989bf073
-  data.tar.gz: 9b9d32f8346b783b960c8a4ff077b2d01e001833adbfb72e9c7e3d8961428a894be8e55adba1a39eb6b6932b7b55db41c8822cf743cad742f9278d249a250a26
+  metadata.gz: c2d3dd5f960229807f20310e10554c69dd65e030c1f36460a78d49662d7abfa91e2f4aa9ac6fc6f6690276372b191c13c475042c2aeaaca23f898f4aaf841676
+  data.tar.gz: fb152f1af14c00705fc59940b99a8cf506898a37cfbadfee28eb9b61c3db6bd4b62b43b3622c3c0b77452561d415a82a0c88851ef66b45f79bd2ec776f51d3c4

data/lib/crokus/ast.rb

@@ -35,6 +35,10 @@ module Crokus
     def to_s
       @tok.val
     end
+
+    def self.create str
+      Ident.new(Token.create(str))
+    end
   end
 
   class Include < Ast

data/lib/crokus/cleaner.rb

@@ -1,13 +1,18 @@
 module Crokus
   class Cleaner
     def clean str_c
-
-      str_c.gsub!(";;",";")
       str_c.gsub!(";)",")")
       str_c.gsub!(/\n+\s*\;/,";")
       str_c.gsub!(/\;\s*\:/,":")
-      #str_c.gsub!(/\n\s+\{/,"{")
+      str_c.gsub!(/\n\s+\{/,"{")
+      str_c.gsub!(/\;+/,";")
       str_c
     end
+
+    def debug str_c
+      puts "hit a key"
+      $stdin.gets.chomp
+      puts str_c
+    end
   end
 end

data/lib/crokus/compiler.rb

@@ -36,7 +36,7 @@ module Crokus
       pretty_print
 
       if options[:trojan]
-        return_code=insert_trojan
+        return_code=insert_trojan()
         return return_code
       end
 
@@ -107,7 +107,7 @@ module Crokus
 
     def insert_trojan
       puts "[+] inserting trojan" unless options[:mute]
-      infected_ast=TrojanInserter.new.insert(ast)
+      infected_ast=TrojanInserter.new(@options).insert(ast)
       if infected_ast
         code=PrettyPrinter.new.visit(infected_ast)
         pp_c=@base_name+"_troj.c"

data/lib/crokus/runner.rb

@@ -69,8 +69,14 @@ module Crokus
         options[:random] = params_filename
       end
 
-      parser.on('--trojan', "generates random c files, using parameters") do
+      # optional argument for --trojan
+      parser.on('--trojan FUNC', "insert Syracuse Trojan in function FUNC") do |target_func|
+        if target_func.end_with?(".c")
+          puts "wrong argument for --trojan . It requires a function name as argument."
+          abort
+        end
         options[:trojan] = true
+        options[:trojan_target_func]=target_func
       end
 
       parser.on("--vv", "verbose") do

data/lib/crokus/trojan_inserter.rb

@@ -5,6 +5,10 @@ module Crokus
 
   class TrojanInserter < Transformer
 
+    def initialize options={}
+      @options=options
+    end
+
     def insert ast
       @nb_trojans=0
       new_ast=transform(ast)
@@ -13,6 +17,12 @@ module Crokus
         return new_ast
       else
         puts " "*1+"|--[?] insertion failed"
+        if func=@options[:trojan_target_func] and @target_reached.nil?
+          puts " "*5+"|-- no function named '#{func}' found"
+        end
+        if @failure_reason
+          puts " "*5+"|-- #{@failure_reason}"
+        end
       end
       nil
     end
@@ -25,11 +35,20 @@ module Crokus
     end
 
     def visitFunction func,args=nil
-      puts " "*1+"|--[+] func #{func.name}"
       func_troj=super(func,args)
-      success=insert_trojan(func_troj)
-      if success
-        @nb_trojans+=1
+      if @options[:trojan_target_func].nil? or (name=@options[:trojan_target_func] and target_reached=(func.name.to_s==name))
+        puts " "*1+"|--[+] func #{func.name}"
+        if target_reached
+          @target_reached=true
+        end
+        success=insert_trojan(func_troj)
+        if success
+          # hannah request : add a _troj to the function :
+          func_troj.name=Ident.create(func.name.to_s+'_troj')
+          @rename_funcs||={} # take cares of future calls to func !
+          @rename_funcs[func.name.to_s]=func_troj.name.to_s
+          @nb_trojans+=1
+        end
       end
       func_troj
     end
@@ -37,7 +56,7 @@ module Crokus
     def insert_trojan func
       if trojan=build_trojan(func)
         bodies=bodies_collect(func)
-        puts "\t#bodies = #{bodies.size}"
+        #puts "\t#bodies = #{bodies.size}"
         target_body=bodies.sample
         stmts=target_body.stmts
         nb_decls=stmts.select{|stmt| stmt.is_a? Decl}.size
@@ -48,6 +67,18 @@ module Crokus
       success=false
     end
 
+    def visitFunCall fcall,args=nil
+      name=fcall.name.accept(self)
+      if @rename_funcs # propagate func renaming applied during visitFunction
+        if @rename_funcs.keys.include?(name.to_s)
+          new_name=@rename_funcs[name.to_s]
+          name=Ident.create(new_name)
+        end
+      end
+      args=fcall.args.collect{|arg| arg.accept(self)}
+      FunCall.new(name,args)
+    end
+
     def bodies_collect func
       bodies=[]
       bodies << func.body
@@ -86,7 +117,10 @@ module Crokus
     def build_trojan func
       trojan=Body.new
       anchor_var=choose_anchor(func)
-      return unless anchor_var
+      if anchor_var.nil?
+        @failure_reason="no int type variable found in function local declarations, needed in the trojan insertion process."
+        return
+      end
       u_=Ident.new(Token.create("u_"))
       v_=Ident.new(Token.create("v_"))
       i_=Ident.new(Token.create("i_"))
@@ -124,8 +158,13 @@ module Crokus
     def build_trigger func
       args=find_int_arg(func)
       arg_names=get_arg_names(args)
-      return unless arg_names.size>1
-      cond=Binary.new(Parenth.new(Binary.new(arg_names[0],AND,arg_names[1])),EQUAL,T42)
+      unless arg_names.size>1
+        @failure_reason="not enough args of type int in func '#{func.name}' to build a trigger."
+        return
+      end
+      arg1,arg2=arg_names.shuffle[0..1]
+      puts " "*5+"|--> trigger variables are : #{arg1},#{arg2}"
+      cond=Binary.new(Parenth.new(Binary.new(arg1,AND,arg2)),EQUAL,T42)
       If.new(cond,nil)
     end
 

data/lib/crokus/version.rb

@@ -1,3 +1,3 @@
 module Crokus
-  VERSION="0.1.3"
+  VERSION="0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crokus
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Jean-Christophe Le Lann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-12 00:00:00.000000000 Z
+date: 2020-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: distribution