Menu
▾
▴
Re: [LTP] [PATCH] Fix C coding issues and integrate ima into LTP
|
From: Garrett C. <yan...@gm...> - 2009-07-31 08:40:36
|
On Fri, Jul 31, 2009 at 1:38 AM, Garrett Cooper<yan...@gm...> wrote:
> 1. None of the ima C files which required openssl/sha.h were using the
> HAVE_OPENSSL_SHA_H macro define.
> 2. Add tst_resm support.
> 3. Fix some missing includes in ima_mmap.c.
> 4. Remove an unused var.
> 5. Shuffle around some fields in ima_boot_aggregate.c so that it
> compiles with -Wunused and consumes less memory when 1. applies.
>
> Signed-off-by: Garrett Cooper <yan...@gm...>
>
> Index: testcases/kernel/security/integrity/ima/src/ima_boot_aggregate.c
> ===================================================================
> RCS file: /cvsroot/ltp/ltp/testcases/kernel/security/integrity/ima/src/ima_boot_aggregate.c,v
> retrieving revision 1.1
> diff -u -r1.1 ima_boot_aggregate.c
> --- testcases/kernel/security/integrity/ima/src/ima_boot_aggregate.c 31
> Mar 2009 13:58:14 -0000 1.1
> +++ testcases/kernel/security/integrity/ima/src/ima_boot_aggregate.c 31
> Jul 2009 08:37:08 -0000
> @@ -23,14 +23,21 @@
> #include <fcntl.h>
> #include <string.h>
> #include <unistd.h>
> +#include "config.h"
> +#include "test.h"
> +#if HAVE_OPENSSL_SHA_H
> #include <openssl/sha.h>
> +#endif
>
> #define MAX_EVENT_SIZE 500
> #define EVENT_HEADER_SIZE 32
> #define MAX_EVENT_DATA_SIZE (MAX_EVENT_SIZE - EVENT_HEADER_SIZE)
> #define NUM_PCRS 8 /* PCR registers 0-7 in boot aggregate */
>
> -static void *display_sha1_digest(char *pcr)
> +char *TCID = "ima_boot_aggregate";
> +int TST_TOTAL = 1;
> +
> +static void display_sha1_digest(unsigned char *pcr)
> {
> int i;
>
> @@ -39,8 +46,10 @@
> printf("\n");
> }
>
> -int main(int argc, char *argv[])
> +int
> +main(int argc, char *argv[])
> {
> +#if HAVE_OPENSSL_SHA_H
> unsigned char boot_aggregate[SHA_DIGEST_LENGTH];
> struct {
> struct {
> @@ -74,7 +83,7 @@
> memset(&pcr[i].digest, 0, SHA_DIGEST_LENGTH);
>
> /* Extend the pseudo PCRs with the event digest */
> - while (fread(&event, sizeof event.header, 1, fp)) {
> + while (fread(&event, sizeof(event.header), 1, fp)) {
> if (debug) {
> printf("%03u ", event.header.pcr);
> display_sha1_digest(event.header.digest);
> @@ -105,6 +114,8 @@
>
> printf("boot_aggregate:");
> display_sha1_digest(boot_aggregate);
> -
> - return 0;
> +#else
> + tst_resm(TCONF, "System doesn't have openssl/sha.h");
> +#endif
> + tst_exit();
> }
> Index: testcases/kernel/security/integrity/ima/src/ima_measure.c
> ===================================================================
> RCS file: /cvsroot/ltp/ltp/testcases/kernel/security/integrity/ima/src/ima_measure.c,v
> retrieving revision 1.1
> diff -u -r1.1 ima_measure.c
> --- testcases/kernel/security/integrity/ima/src/ima_measure.c 31 Mar
> 2009 13:58:14 -0000 1.1
> +++ testcases/kernel/security/integrity/ima/src/ima_measure.c 31 Jul
> 2009 08:37:08 -0000
> @@ -22,18 +22,23 @@
> #include <fcntl.h>
> #include <string.h>
> #include <unistd.h>
> +//#include "config.h"
> +#include "test.h"
> +#if HAVE_OPENSSL_SHA_H
> #include <openssl/sha.h>
> +#endif
>
> #define TCG_EVENT_NAME_LEN_MAX 255
>
> -static int verbose = 0;
> -static int validate = 0;
> -static int verify = 0;
> +char *TCID = "ima_measure";
> +int TST_TOTAL = 1;
>
> #define print_info(format, arg...) \
> if (verbose) \
> printf(format, ##arg)
>
> +#if HAVE_OPENSSL_SHA_H
> +
> static u_int8_t zero[SHA_DIGEST_LENGTH];
> static u_int8_t fox[SHA_DIGEST_LENGTH];
>
> @@ -90,6 +95,8 @@
> return 0;
> }
>
> +#endif
> +
> /*
> * ima_measurements.c - calculate the SHA1 aggregate-pcr value based
> * on the IMA runtime binary measurements.
> @@ -120,13 +127,19 @@
> * Return code: if verification enabled, returns number of verification
> * errors.
> */
> -int main(int argc, char *argv[])
> +int
> +main(int argc, char *argv[])
> {
> +
> +#if HAVE_OPENSSL_SHA_H
> FILE *fp;
> struct event template;
> u_int8_t pcr[SHA_DIGEST_LENGTH];
> int i, count = 0, len;
> - int failed_count = 0; /* number of template verifications failed */
> +
> + int verbose = 0;
> + int validate = 0;
> + int verify = 0;
>
> if (argc < 2) {
> printf("format: %s binary_runtime_measurements" \
> @@ -191,12 +204,17 @@
> print_info(" %s\n", template.ima_data.filename);
>
> if (verify)
> - failed_count += verify_template_hash(&template);
> + if (verify_template_hash(&template) != 0) {
> + tst_resm(TFAIL, "Hash failed");
> + }
> }
> fclose(fp);
>
> verbose=1;
> print_info("PCRAggr (re-calculated):");
> display_sha1_digest(pcr);
> - return failed_count;
> +#else
> + tst_resm(TCONF, "System doesn't have openssl/sha.h");
> +#endif
> + tst_exit();
> }
> Index: testcases/kernel/security/integrity/ima/src/ima_mmap.c
> ===================================================================
> RCS file: /cvsroot/ltp/ltp/testcases/kernel/security/integrity/ima/src/ima_mmap.c,v
> retrieving revision 1.2
> diff -u -r1.2 ima_mmap.c
> --- testcases/kernel/security/integrity/ima/src/ima_mmap.c 19 May 2009
> 09:57:42 -0000 1.2
> +++ testcases/kernel/security/integrity/ima/src/ima_mmap.c 31 Jul 2009
> 08:37:08 -0000
> @@ -16,16 +16,20 @@
> */
> #include <stdio.h>
> #include <string.h>
> +#include <unistd.h>
> #include <sys/stat.h>
> #include <sys/mman.h>
> #include <fcntl.h>
> +#include "test.h"
> +
> +char *TCID = "ima_mmap";
> +int TST_TOTAL = 1;
>
> int main(int argc, char *argv[])
> {
> int fd;
> void *file;
> char *filename;
> - int rc;
>
> if (argc != 2)
> printf("%s: filename\n", argv[1]);
> @@ -48,6 +52,5 @@
> perror("unmap");
> return(-1);
> }
> -
> - return 0;
> + tst_exit();
> }
This also requires that -lltp be added to the src/Makefile Makefile,
so I'm not sure whether or not this has any value beyond just being a
review tool.
Thanks,
-Garrett
|