diff --git a/Makefile.am b/Makefile.am index 17fd478..e686d65 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,8 @@ SUBDIRS = src tests +if HAVE_PANDOC +SUBDIRS += doc +endif + if MANPAGE_DOCBOOK_XSL dist_man_MANS = evmctl.1 endif diff --git a/configure.ac b/configure.ac index 90646da..bc664fa 100644 --- a/configure.ac +++ b/configure.ac @@ -16,6 +16,8 @@ AM_PROG_CC_C_O #AC_PROG_CPP AC_PROG_INSTALL #AC_PROG_LN_S +AC_CHECK_PROG(have_pandoc, [pandoc], [yes], [no]) +AM_CONDITIONAL([HAVE_PANDOC], [test "x$have_pandoc" = "xyes"]) LT_INIT # FIXME: Replace `main' with a function in `-lpthread': @@ -79,6 +81,8 @@ AX_DEFAULT_HASH_ALGO([$KERNEL_HEADERS]) AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile + doc/Makefile + doc/sf/Makefile packaging/ima-evm-utils.spec ]) AC_OUTPUT @@ -96,4 +100,5 @@ echo " ibmtss: $ac_cv_header_ibmtss_tss_h" echo " sigv1: $enable_sigv1" echo " engine: $enable_engine" echo " doc: $have_doc" +echo " pandoc: $have_pandoc" echo diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..a75e3b9 --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = sf diff --git a/doc/sf/Makefile.am b/doc/sf/Makefile.am new file mode 100644 index 0000000..6c4158c --- /dev/null +++ b/doc/sf/Makefile.am @@ -0,0 +1,6 @@ +noinst_DATA = sf-wiki.html + +sf-wiki.html:sf-wiki.md + pandoc $+ -f markdown -t html > $@ + +CLEANFILES = sf-wiki.html diff --git a/doc/sf/sf-diagram.html b/doc/sf/sf-diagram.html new file mode 100644 index 0000000..8c4d8b7 --- /dev/null +++ b/doc/sf/sf-diagram.html @@ -0,0 +1,46 @@ + + + +
+
+
+See documentation at Linux IMA/EVM Wiki
+
+Linux Integrity Subsystem
+
The goals of the kernel integrity subsystem are to detect if files have +been accidentally or maliciously altered, both remotely and locally, +appraise a file's measurement against a "good" value stored as an extended +attribute, and enforce local file integrity. These goals are complementary +to Mandatory Access Control(MAC) protections provided by LSM modules, such as +SElinux and Smack, which, depending on policy, can attempt to protect file +integrity. The following modules provide several integrity functions:
+ +The first three functions were introduced with Integrity Measurement +Architecture (IMA) in 2.6.30. The EVM/IMA-appraisal patches add support for +the last two features.
+For additional information about the Linux integrity subsystem, refer to the +Wiki. +
+IMA measurement, one component of the kernel's integrity subsystem, is part +of an overall Integrity Architecture based on the +Trusted Computing Group's + open standards, including Trusted Platform Module (TPM), Trusted Boot, +Trusted Software Stack (TSS), Trusted Network Connect (TNC), and Platform +Trust Services (PTS). The diagram shows how these standards relate, and +provides links to the respective specifications and open source +implementations. IMA and EVM can still run on platforms without a +hardware TPM, although without the hardware guarantee of compromise +detection. +
+ diff --git a/doc/sf/sf-tcg.html b/doc/sf/sf-tcg.html new file mode 100644 index 0000000..6a7fd78 --- /dev/null +++ b/doc/sf/sf-tcg.html @@ -0,0 +1,99 @@ + + + +Applications +
|
+||||||
Libraries +
|
+||||||
Linux Kernel +
|
+||||||
Boot +
| ||||||
Hardware +
|
+