diff --git a/.gitattributes b/.gitattributes
index f1592c0016f28505d3a09ef9c07a4a11e590e80b..23307cb17a6d2203256092d390031648d709e913 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -43,16 +43,28 @@ demos/demo.jan_21_2011/ps_demo.sh -text
demos/demo.jan_21_2011/run_gdb.sh -text
demos/demo.jan_21_2011/test_infinite.sh -text
dyna_examples/Makefile -text
+dyna_examples/awk.stock -text
dyna_examples/block_copy.c -text
+dyna_examples/bzip2.stock -text
+dyna_examples/cal.stock -text
+dyna_examples/cat.stock -text
+dyna_examples/clear.stock -text
dyna_examples/cmd_args_005.c -text
dyna_examples/concolic_test_handshake.c -text
dyna_examples/data.txt -text
+dyna_examples/date.stock -text
+dyna_examples/df.stock -text
+dyna_examples/diff.stock -text
+dyna_examples/du.stock -text
dyna_examples/dumbledore_cmd.c -text
dyna_examples/dumbledore_file.c -text
dyna_examples/dumbledore_file_with_fopen_check.c -text
dyna_examples/dumbledore_stdin.c -text
+dyna_examples/expr.stock -text
+dyna_examples/find.stock -text
dyna_examples/fptest.c -text
dyna_examples/globalfield.c -text
+dyna_examples/grep.stock -text
dyna_examples/hanoi.c -text
dyna_examples/hanoi_heap_overrun.c -text
dyna_examples/hanoi_nostrata.c -text
@@ -61,11 +73,22 @@ dyna_examples/hanoi_overrun_tainted.c -text
dyna_examples/hanoi_overrun_taintedenv.c -text
dyna_examples/hanoi_stack_overrun.c -text
dyna_examples/hello.c -text
+dyna_examples/hostname.stock -text
+dyna_examples/ipcs.stock -text
+dyna_examples/less.stock -text
+dyna_examples/ls.stock -text
dyna_examples/malloc.c -text
dyna_examples/memcpy.c -text
dyna_examples/myhanoi.c -text
+dyna_examples/nasm.stock -text
+dyna_examples/objdump.stock -text
dyna_examples/print_ptr.c -text
+dyna_examples/ps.stock -text
dyna_examples/recover_example.c -text
+dyna_examples/sdiff.stock -text
+dyna_examples/wc.stock -text
+dyna_examples/whoami.stock -text
+dyna_examples/xeyes.stock -text
examples/Makefile -text
examples/block_copy.c -text
examples/cmd_args_005.c -text
diff --git a/dyna_examples/Makefile b/dyna_examples/Makefile
index 7b44cf83918ef2202c14fafcad631c859ac80205..5308389d6534370a812c6482f714ef60bcb83453 100644
--- a/dyna_examples/Makefile
+++ b/dyna_examples/Makefile
@@ -6,29 +6,32 @@ CC=gcc
CXX=g++
CFLAGS=-O2
-.SUFFIXES: .o .c .cpp .exe
+.SUFFIXES: .o .c .cpp .exe .stock .protected
exes=hanoi.exe hanoi_overrun.exe hanoi_heap_overrun.exe hanoi_stack_overrun.exe print_ptr.exe malloc.exe block_copy.exe hello.exe hanoi_overrun_tainted.exe hanoi_overrun_taintedenv.exe memcpy.exe cmd_args_005.exe dumbledore_stdin.exe dumbledore_cmd.exe dumbledore_file.exe
+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
-all: env_check ${exes}
+all: env_check ${exes} ${protected_exes}
.PHONY: env_check
+.stock.protected: .PHONY
+ ${PEASOUP_HOME}/tools/ps_analyze.sh $< $@
-.o.exe:
+.o.exe: .PHONY
$(CC) $< -o $@
${PEASOUP_HOME}/tools/ps_analyze.sh $@ $@
-.c.o:
+.c.o: .PHONY
${CC} $< -c
-.cpp.o:
+.cpp.o: .PHONY
${CXX} $<
-chopzero:
+chopzero: .PHONY
@ if [ ! -f chopzero ]; then gcc chopzero.c -o chopzero -O3 ; fi
$(exes): ${STRATA}/lib/x86_linux/libstrata.a
@@ -62,8 +65,10 @@ clean:
rm -Rf peasoup_executable_directory.*
rm -f strata.log.*
rm -f *.sym
+ rm -f *.protected
if [ ! "X" = "X"${PGUSER} ]; then sh ../tools/db/drop_my_tables.sh; sh ../tools/db/pdb_setup.sh; fi
concclean:
rm -Rf concolic.files_*
rm strata.log.*
+
diff --git a/dyna_examples/awk.stock b/dyna_examples/awk.stock
new file mode 100755
index 0000000000000000000000000000000000000000..fefa5c1a37fc2bca7e80edf12b065fd51556e619
Binary files /dev/null and b/dyna_examples/awk.stock differ
diff --git a/dyna_examples/bzip2.stock b/dyna_examples/bzip2.stock
new file mode 100755
index 0000000000000000000000000000000000000000..8bc54a6c854081fa38a9c9bf50edc31ac9a362cb
Binary files /dev/null and b/dyna_examples/bzip2.stock differ
diff --git a/dyna_examples/cal.stock b/dyna_examples/cal.stock
new file mode 100755
index 0000000000000000000000000000000000000000..34d13409a40d6e4a92eca7e65396b1daf6cf0f36
Binary files /dev/null and b/dyna_examples/cal.stock differ
diff --git a/dyna_examples/cat.stock b/dyna_examples/cat.stock
new file mode 100755
index 0000000000000000000000000000000000000000..9799a8dda600a59282b693472ee482909a8f0288
Binary files /dev/null and b/dyna_examples/cat.stock differ
diff --git a/dyna_examples/clear.stock b/dyna_examples/clear.stock
new file mode 100755
index 0000000000000000000000000000000000000000..68931e065ca011a06547e579165bcd57ff8b57f6
Binary files /dev/null and b/dyna_examples/clear.stock differ
diff --git a/dyna_examples/date.stock b/dyna_examples/date.stock
new file mode 100755
index 0000000000000000000000000000000000000000..ed0b4d9c7e57720ad10af1cecb93bf6829c94640
Binary files /dev/null and b/dyna_examples/date.stock differ
diff --git a/dyna_examples/df.stock b/dyna_examples/df.stock
new file mode 100755
index 0000000000000000000000000000000000000000..78e5361bed8762ef4931023c76a8a2cb4a774670
Binary files /dev/null and b/dyna_examples/df.stock differ
diff --git a/dyna_examples/diff.stock b/dyna_examples/diff.stock
new file mode 100755
index 0000000000000000000000000000000000000000..a6e4b3daeeedfd3ebdb378d477b6c38f89b660d6
Binary files /dev/null and b/dyna_examples/diff.stock differ
diff --git a/dyna_examples/du.stock b/dyna_examples/du.stock
new file mode 100755
index 0000000000000000000000000000000000000000..22c8fd296cea0bee2bab1c133867f93b441de71d
Binary files /dev/null and b/dyna_examples/du.stock differ
diff --git a/dyna_examples/expr.stock b/dyna_examples/expr.stock
new file mode 100755
index 0000000000000000000000000000000000000000..1002dca63ac38feb3096c1f8d8092c4222d6c989
Binary files /dev/null and b/dyna_examples/expr.stock differ
diff --git a/dyna_examples/find.stock b/dyna_examples/find.stock
new file mode 100755
index 0000000000000000000000000000000000000000..0b43107573c9c73735d45e191c98804b80af97d2
Binary files /dev/null and b/dyna_examples/find.stock differ
diff --git a/dyna_examples/grep.stock b/dyna_examples/grep.stock
new file mode 100755
index 0000000000000000000000000000000000000000..9b90861c728ad95e4faf6761b7402d184d858eba
Binary files /dev/null and b/dyna_examples/grep.stock differ
diff --git a/dyna_examples/hostname.stock b/dyna_examples/hostname.stock
new file mode 100755
index 0000000000000000000000000000000000000000..315832dfce81178e0d6325cf58064d8419023d7d
Binary files /dev/null and b/dyna_examples/hostname.stock differ
diff --git a/dyna_examples/ipcs.stock b/dyna_examples/ipcs.stock
new file mode 100755
index 0000000000000000000000000000000000000000..70e3a7b017de4b06eda8930d43ced0c0497f525d
Binary files /dev/null and b/dyna_examples/ipcs.stock differ
diff --git a/dyna_examples/less.stock b/dyna_examples/less.stock
new file mode 100755
index 0000000000000000000000000000000000000000..adab082ebda13632f4222da8bfa6c04c35fb350f
Binary files /dev/null and b/dyna_examples/less.stock differ
diff --git a/dyna_examples/ls.stock b/dyna_examples/ls.stock
new file mode 100755
index 0000000000000000000000000000000000000000..a64d6b1764a6334d29834e7e10ca04b6ee760502
Binary files /dev/null and b/dyna_examples/ls.stock differ
diff --git a/dyna_examples/nasm.stock b/dyna_examples/nasm.stock
new file mode 100755
index 0000000000000000000000000000000000000000..baba93a87e39fa0ab045ef41fdaeffc2095ae2ff
Binary files /dev/null and b/dyna_examples/nasm.stock differ
diff --git a/dyna_examples/objdump.stock b/dyna_examples/objdump.stock
new file mode 100755
index 0000000000000000000000000000000000000000..b06c12a368b724e0b0f6a57b640a2471058d5612
Binary files /dev/null and b/dyna_examples/objdump.stock differ
diff --git a/dyna_examples/ps.stock b/dyna_examples/ps.stock
new file mode 100755
index 0000000000000000000000000000000000000000..88630d0dd5d12177a94bf98d2ccaa1d92938fbcd
Binary files /dev/null and b/dyna_examples/ps.stock differ
diff --git a/dyna_examples/sdiff.stock b/dyna_examples/sdiff.stock
new file mode 100755
index 0000000000000000000000000000000000000000..6591aa88e18b6e3e547e3a0e9342d4bfd7ab211f
Binary files /dev/null and b/dyna_examples/sdiff.stock differ
diff --git a/dyna_examples/wc.stock b/dyna_examples/wc.stock
new file mode 100755
index 0000000000000000000000000000000000000000..ad2fff07052320666f6889ed90cc4842abe2c6c6
Binary files /dev/null and b/dyna_examples/wc.stock differ
diff --git a/dyna_examples/whoami.stock b/dyna_examples/whoami.stock
new file mode 100755
index 0000000000000000000000000000000000000000..a534f1e90483a7a1f57d58e1bbb06bce3c27cba9
Binary files /dev/null and b/dyna_examples/whoami.stock differ
diff --git a/dyna_examples/xeyes.stock b/dyna_examples/xeyes.stock
new file mode 100755
index 0000000000000000000000000000000000000000..d0597e65914fdcbc5b36cf2a9d8f356f13e14887
Binary files /dev/null and b/dyna_examples/xeyes.stock differ
diff --git a/tools/ps_run.sh b/tools/ps_run.sh
index c3753d390b5e3e98ab9047f258fb0a8f9d71fa15..3aa5c7d1cf7dbbe92328bc7a7713677c69db01d3 100755
--- a/tools/ps_run.sh
+++ b/tools/ps_run.sh
@@ -24,14 +24,14 @@ fi
#
if [ ! -z $VERBOSE ]; then
- echo STRATA_SPRI_FILE=$STRATA_SPRI_FILE STRATA_DOUBLE_FREE=1 STRATA_HEAPRAND=1 STRATA_PC_CONFINE=1 STRATA_PC_CONFINE_XOR=1 STRATA_PC_CONFINE_XOR_KEY_LENGTH=1024 STRATA_ANNOT_FILE=$datapath/a.ncexe.annot STRATA_SIEVE=1 STRATA_RC=1 STRATA_PARTIAL_INLINING=0 $datapath/a.stratafied "$@"
+ echo STRATA_SPRI_FILE=$STRATA_SPRI_FILE STRATA_DOUBLE_FREE=1 STRATA_HEAPRAND=1 STRATA_PC_CONFINE=1 STRATA_PC_CONFINE_XOR=0 STRATA_PC_CONFINE_XOR_KEY_LENGTH=1024 STRATA_ANNOT_FILE=$datapath/a.ncexe.annot STRATA_SIEVE=1 STRATA_RC=1 STRATA_PARTIAL_INLINING=0 $datapath/a.stratafied "$@"
fi
STRATA_DOUBLE_FREE=1 \
STRATA_HEAPRAND=1 \
STRATA_PC_CONFINE=1 \
- STRATA_PC_CONFINE_XOR=1 \
+ STRATA_PC_CONFINE_XOR=0 \
STRATA_PC_CONFINE_XOR_KEY_LENGTH=1024 \
STRATA_ANNOT_FILE=$datapath/a.ncexe.annot \
STRATA_SIEVE=1 \