apparmor/parser/libapparmor_re/Makefile

# Profiling:
#EXTRA_CFLAGS = -pg

TARGET=libapparmor_re.a

CFLAGS ?= -g -Wall -O2 ${EXTRA_CFLAGS} -std=gnu++0x
CXXFLAGS := ${CFLAGS}

ARFLAGS=-rcs

BISON := bison

all : ${TARGET}

UNITTESTS = tst_parse

libapparmor_re.a: parse.o expr-tree.o hfa.o chfa.o aare_rules.o
	ar ${ARFLAGS} $@ $^

expr-tree.o: expr-tree.cc expr-tree.h

hfa.o: hfa.cc apparmor_re.h hfa.h ../immunix.h

aare_rules.o: aare_rules.cc aare_rules.h apparmor_re.h expr-tree.h hfa.h chfa.h parse.h ../immunix.h

chfa.o: chfa.cc chfa.h ../immunix.h

parse.o : parse.cc apparmor_re.h expr-tree.h

parse.cc : parse.y parse.h flex-tables.h ../immunix.h
	${BISON} -o $@ $<

clean:
	rm -f *.o parse.cc ${TARGET} *.gcda *.gcno
Add dfa support to the parser 2007-02-27 02:29:16 +00:00			`# Profiling:`
			`#EXTRA_CFLAGS = -pg`

			`TARGET=libapparmor_re.a`

parser: convert array into unordered map This patch converts the problematic-with-g++ 4.6 state_names array into a C++ unordered_map type. Using this depends on using the c++0x (aka c++11) standard, and as we have gnuisms elsewhere (using the typeof builtin), the patch also adds/converts to using -std=gnu++c0x in the build rules (which conveniently eliminates some other warnings we had due to other c++11-isms). Signed-off-by: Steve Beattie <steve@nxnw.org> Acked-By: Seth Arnold <seth.arnold@canonical.com> 2013-11-18 16:23:23 -08:00			`CFLAGS ?= -g -Wall -O2 ${EXTRA_CFLAGS} -std=gnu++0x`
			`CXXFLAGS := ${CFLAGS}`
Add dfa support to the parser 2007-02-27 02:29:16 +00:00
			`ARFLAGS=-rcs`

			`BISON := bison`

			`all : ${TARGET}`

Unify escape sequence processing into a set of library fns. Fix the octal escape sequence that was broken, so that short escapes \0, \00 \xa, didn't work and actually resulted in some encoding bugs. Also we were missing support for the decimal # conversion \d123 Incorporate and update Steve Beattie's unit tests of escape sequences patch v2 - unify escape sequence processing, creating lib fns. - address Steve Beattie's feedback - incorporate Steve Beattie's feedback v3 - address Seth's feedback - add missing strn_escseq tests - expand strn_escseq to take a 3rd parameter to allow specifying chars to convert straight across. . eg "+" will cause it to convert \+ as + - fix libapparmor/parse.y failed escape pass through to match processunqoted Unit tests by Steve Beattie Signed-off-by: John Johansen <john.johansen@canonical.com> Acked-by: Seth Arnold <seth.arnold@canonical.com> 2014-04-15 14:59:41 -07:00			`UNITTESTS = tst_parse`

Rename compressed_hfa.{c,h} and TransitionTable within them to chfa. This is done to be clear what TransitionTable is, as we will then add matching capabilities. Renaming the files is just to make them consistent with the class in the file. Signed-off-by: John Johansen <john.johansen@canonical.com> Acked-by: Kees Cook <kees@ubuntu.com> 2011-12-15 05:06:32 -08:00			`libapparmor_re.a: parse.o expr-tree.o hfa.o chfa.o aare_rules.o`
Add dfa support to the parser 2007-02-27 02:29:16 +00:00			`ar ${ARFLAGS} $@ $^`

Split out parsing and expression trees from regexp.y Start of splitting regexp.y into logical components instead of the mess it is today. Split out the expr-tree and parsing components from regexp.y int expr-tree.x and parse.y and since regexp.y no longer does parsing rename it to hfa.cc Some code cleanups snuck their way into this patch and since I am to lazy to redo it, I have left them in. Signed-off-by: John Johansen <john.johansen@canonical.com> Acked-By: Steve Beattie <sbeattie@ubuntu.com> 2011-03-13 05:46:29 -07:00			`expr-tree.o: expr-tree.cc expr-tree.h`
Add dfa support to the parser 2007-02-27 02:29:16 +00:00
Update Makefile dependencies Signed-off-by: John Johansen <john.johansen@canonical.com> Acked-By: Steve Beattie <sbeattie@ubuntu.com> 2011-03-13 06:00:31 -07:00			`hfa.o: hfa.cc apparmor_re.h hfa.h ../immunix.h`
Split out parsing and expression trees from regexp.y Start of splitting regexp.y into logical components instead of the mess it is today. Split out the expr-tree and parsing components from regexp.y int expr-tree.x and parse.y and since regexp.y no longer does parsing rename it to hfa.cc Some code cleanups snuck their way into this patch and since I am to lazy to redo it, I have left them in. Signed-off-by: John Johansen <john.johansen@canonical.com> Acked-By: Steve Beattie <sbeattie@ubuntu.com> 2011-03-13 05:46:29 -07:00
Rename compressed_hfa.{c,h} and TransitionTable within them to chfa. This is done to be clear what TransitionTable is, as we will then add matching capabilities. Renaming the files is just to make them consistent with the class in the file. Signed-off-by: John Johansen <john.johansen@canonical.com> Acked-by: Kees Cook <kees@ubuntu.com> 2011-12-15 05:06:32 -08:00			`aare_rules.o: aare_rules.cc aare_rules.h apparmor_re.h expr-tree.h hfa.h chfa.h parse.h ../immunix.h`
Split out aare_rules which are used to encapsulate creating the dfa Split out the aare_rule bits that encapsulate the convertion of apparmor rules into the final compressed dfa. This patch will not compile because of the it needs hfa to export an interface but hfa is going to be split so just delay until hfa and transtable are split and they can each export their own interface. Signed-off-by: John Johansen <john.johansen@canonical.com> Acked-By: Steve Beattie <sbeattie@ubuntu.com> 2011-03-13 05:49:15 -07:00
Rename compressed_hfa.{c,h} and TransitionTable within them to chfa. This is done to be clear what TransitionTable is, as we will then add matching capabilities. Renaming the files is just to make them consistent with the class in the file. Signed-off-by: John Johansen <john.johansen@canonical.com> Acked-by: Kees Cook <kees@ubuntu.com> 2011-12-15 05:06:32 -08:00			`chfa.o: chfa.cc chfa.h ../immunix.h`
Split out compressed dfa "transition table" compression Split hfa into hfa and compressed_hfa files. The hfa portion focuses on creating an manipulating hfas, while compressed_hfa is used for creating compressed hfas that can be used/reused at run time with much less memory usage than the full blown hfa. Signed-off-by: John Johansen <john.johansen@canonical.com> Acked-By: Steve Beattie <sbeattie@ubuntu.com> 2011-03-13 05:50:34 -07:00
Split out parsing and expression trees from regexp.y Start of splitting regexp.y into logical components instead of the mess it is today. Split out the expr-tree and parsing components from regexp.y int expr-tree.x and parse.y and since regexp.y no longer does parsing rename it to hfa.cc Some code cleanups snuck their way into this patch and since I am to lazy to redo it, I have left them in. Signed-off-by: John Johansen <john.johansen@canonical.com> Acked-By: Steve Beattie <sbeattie@ubuntu.com> 2011-03-13 05:46:29 -07:00			`parse.o : parse.cc apparmor_re.h expr-tree.h`

Update Makefile dependencies Signed-off-by: John Johansen <john.johansen@canonical.com> Acked-By: Steve Beattie <sbeattie@ubuntu.com> 2011-03-13 06:00:31 -07:00			`parse.cc : parse.y parse.h flex-tables.h ../immunix.h`
Add dfa support to the parser 2007-02-27 02:29:16 +00:00			`${BISON} -o $@ $<`

			`clean:`
parser: add build option for coverage (v3) This patch adds a parser make variable and a make target for building the compiler with coverage compilation flags. With this, coverage information can be generated by running tests/test suites against the built parser and run through tools like gcovr. Patch History: v1: initial version v2: refreshed/no change v3: address feedback from sarnold: - mark coverage target as phony - correct missing '.' typo in clean target - make coverage extensions consistent in clean targets Signed-off-by: Steve Beattie <steve@nxnw.org> Acked-by: Seth Arnold <seth.arnold@canonical.com> 2013-12-06 05:31:11 -08:00			`rm -f .o parse.cc ${TARGET} .gcda *.gcno`