From 3b539dec645f4c088753ac528010d649b55090af Mon Sep 17 00:00:00 2001
From: jdh8d <jdh8d@git.zephyr-software.com>
Date: Tue, 17 May 2016 14:38:45 +0000
Subject: [PATCH] zipr: removed stratafier/cgc mode. using elfwriter
exclusively now. security_transforms: no scoops for executable segs. bugfix
for texttoprintf Former-commit-id: 7ef71d7e1556927f277b8926c4d7e659e904ae1d
---
libIRDB/include/core/scoop.hpp | 2 +-
libIRDB/test/fill_in_cfg.cpp | 4 ++--
libIRDB/test/fill_in_indtargs.cpp | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libIRDB/include/core/scoop.hpp b/libIRDB/include/core/scoop.hpp
index 160fc3150..b8f5b004e 100644
--- a/libIRDB/include/core/scoop.hpp
+++ b/libIRDB/include/core/scoop.hpp
@@ -67,7 +67,7 @@ class DataScoop_t : public BaseObj_t
bool isWriteable() const { return (permissions & permissions_w) == permissions_w; };
bool isExecuteable() const { return (permissions & permissions_x) == permissions_x; };
int getRawPerms() const { return permissions; }
- int setRawPerms(int newperms) { permissions=newperms; }
+ void setRawPerms(int newperms) { permissions=newperms; }
void SetName(const std::string &n) { name=n; }
void SetContents(const std::string &n) { contents=n; }
diff --git a/libIRDB/test/fill_in_cfg.cpp b/libIRDB/test/fill_in_cfg.cpp
index 897d43de0..27fe45b69 100644
--- a/libIRDB/test/fill_in_cfg.cpp
+++ b/libIRDB/test/fill_in_cfg.cpp
@@ -445,13 +445,13 @@ void fill_in_scoops(FileIR_t *firp)
fout<<"Found that section "<<elfiop->sections[secndx]->get_name()<<" is both writeable and executable. Program is inherently unsafe!"<<endl;
}
-#if 0
- /* executable sections handled by other bits. */
+ /* executable sections handled by zipr/spri. */
if(elfiop->sections[secndx]->isExecutable())
{
cout<<"Skipping scoop for section (executable) "<<elfiop->sections[secndx]->get_name()<<endl;
continue;
}
+#if 0
// we decided to skip BSS for a bad reason. trying again.
if(elfiop->sections[secndx]->isBSS())
{
diff --git a/libIRDB/test/fill_in_indtargs.cpp b/libIRDB/test/fill_in_indtargs.cpp
index 037fe4064..2a8915625 100644
--- a/libIRDB/test/fill_in_indtargs.cpp
+++ b/libIRDB/test/fill_in_indtargs.cpp
@@ -323,7 +323,7 @@ bool IsParameterWrite(FileIR_t *firp,Instruction_t* insn, string& output_dst)
if(k < insn->GetFunction()->GetOutArgsRegionSize())
{
- output_dst=d.Argument1.ArgMnemonic;
+ output_dst=string("[")+d.Argument1.ArgMnemonic+string("]");
return true;
}
--
GitLab