diff --git a/.gitattributes b/.gitattributes index 93c01ca06166b4d7cc05424b9cb2b6a79abce76e..551819aa2f6654118ed28f11dcbb6726b54e2d3e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1034,6 +1034,7 @@ stock_examples/du.stock -text stock_examples/expr.stock -text stock_examples/find.stock -text stock_examples/firefox-bin.stock -text +stock_examples/gcc-4.4.stock -text stock_examples/gnash.stock -text stock_examples/grep.stock -text stock_examples/hostname.stock -text diff --git a/stock_examples/Makefile b/stock_examples/Makefile index f5684bc882863d156281ac57f33066b6f41b9e68..9bdd15e9d743ad48902ce5a87edf4dbaf9e7c041 100644 --- a/stock_examples/Makefile +++ b/stock_examples/Makefile @@ -5,7 +5,7 @@ CFLAGS=-O2 .SUFFIXES: .stock .protected -protected_exes=awk.protected bzip2.protected cal.protected cat.protected clear.protected date.protected df.protected diff.protected du.protected expr.protected find.protected grep.protected hostname.protected ipcs.protected less.protected ls.protected nasm.protected objdump.protected ps.protected sdiff.protected wc.protected whoami.protected xeyes.protected xcalc.protected xpdf.protected firefox-bin.protected lighttpd.protected mplayer.protected gnash.protected xpdfsrc.protected +protected_exes=awk.protected bzip2.protected cal.protected cat.protected clear.protected date.protected df.protected diff.protected du.protected expr.protected find.protected grep.protected hostname.protected ipcs.protected less.protected ls.protected nasm.protected objdump.protected ps.protected sdiff.protected wc.protected whoami.protected xeyes.protected xcalc.protected xpdf.protected firefox-bin.protected lighttpd.protected mplayer.protected gnash.protected xpdfsrc.protected gcc-4.4.protected ilr=on stratafy_with_pc_confine=on diff --git a/stock_examples/gcc-4.4.stock b/stock_examples/gcc-4.4.stock new file mode 100755 index 0000000000000000000000000000000000000000..0772b9eec3c6b5227ff1547e36bcf4bae98d8dcb Binary files /dev/null and b/stock_examples/gcc-4.4.stock differ diff --git a/tools/do_gatherlibs.sh b/tools/do_gatherlibs.sh index 9ceed7c6d439df328d008927aaf02f0c5b4eb47b..74a1cdf31574a67d90cff47fe23a8a57ef2e23ed 100755 --- a/tools/do_gatherlibs.sh +++ b/tools/do_gatherlibs.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -x # # note: no trailing slashes, as the comparison will fail. diff --git a/tools/ps_analyze.sh b/tools/ps_analyze.sh index c2e74539ccb601caee156c3cdb6cafac6b25f891..601c4dd09cc4ab7ac3b58a98f3e59ed2fe7aa158 100755 --- a/tools/ps_analyze.sh +++ b/tools/ps_analyze.sh @@ -197,20 +197,12 @@ stop_if_error() meds_static) return 1; ;; - # registering the program is necessary - pdb_register) + # DB operations are necessary + pdb_register|clone|fix_calls|fill_in_indtargs|spasm,fast_spri,generate_spri) return 2; ;; - # cloning is necessary - clone) - return 3; - ;; - # cloning is necessary - spasm) - return 4; - ;; gather_libraries) - return 4; + return 3; ;; # other steps are optional *) @@ -561,11 +553,6 @@ if [ -z "$cloneid" -o ! "$cloneid" -gt 0 ]; then fail_gracefully "Failed to create variant. Is postgres running properly?" fi -#fuck -#echo perform_step fix_calls $SECURITY_TRANSFORMS_HOME/libIRDB/test/fix_calls.exe $cloneid -#exit 0 -#end - # do the basic tranforms we're performing for peasoup perform_step fix_calls $SECURITY_TRANSFORMS_HOME/libIRDB/test/fix_calls.exe $cloneid