dh/ima-evm-utils-mirror
1
0
Fork 0
mirror of https://git.code.sf.net/p/linux-ima/ima-evm-utils synced 2025-04-28 06:33:36 +02:00
Code Releases Activity

Changed to conform Linux kernel coding style

Browse Source 
Changed to conform Linux kernel coding style, except 80 characters
line length limit.

Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
This commit is contained in:
Dmitry Kasatkin 2012-02-01 10:46:21 +02:00
parent e91cb01e9a
commit 7e89de565e
1 changed files with 177 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/evmctl.c
View File

@ -56,8 +56,8 @@
#define USE_FPRINTF
#ifdef USE_FPRINTF
#define do_log(level, fmt, args...) if (level <= verbose) fprintf(stderr, fmt, ##args)
#define do_log_dump(level, p, len) if (level <= verbose) do_dump(stderr, p, len)
#define do_log(level, fmt, args...) ({ if (level <= verbose) fprintf(stderr, fmt, ##args); })
#define do_log_dump(level, p, len) ({ if (level <= verbose) do_dump(stderr, p, len); })
#else
#define do_log(level, fmt, args...) syslog(level, fmt, ##args)
#define do_log_dump(p, len)
@ -114,7 +114,6 @@ struct pubkey_hdr {
char mpi[0];
} __attribute__ ((packed));
struct signature_hdr {
uint8_t version; /* signature format version */
time_t timestamp; /* signature made */
@ -125,7 +124,6 @@ struct signature_hdr {
char mpi[0];
} __attribute__ ((packed));
static char *evm_config_xattrnames[] = {
"security.selinux",
"security.SMACK64",
@ -146,13 +144,13 @@ static int verbose = LOG_INFO - 1;
static int g_argc;
static char **g_argv;
static int set_xattr = 1;
static int digest = 0;
static int digsig = 0;
static int digest;
static int digsig;
static char *hash_algo = "sha1";
static int binkey = 0;
static int binkey;
static char *keypass;
extern struct command cmds[];
struct command cmds[];
static void print_usage(struct command *cmd);
static void do_dump(FILE *fp, const void *ptr, int len)
@ -160,9 +158,8 @@ static void do_dump(FILE *fp, const void *ptr, int len)
int i;
uint8_t *data = (uint8_t *) ptr;
for (i = 0; i < len; i++) {
for (i = 0; i < len; i++)
fprintf(fp, "%02x", data[i]);
}
fprintf(fp, "\n");
}
@ -247,7 +244,6 @@ static int key2bin(RSA *key, unsigned char *pub)
offset += sizeof(*pkh);
// MPIs
len = BN_num_bytes(key->n);
b = BN_num_bits(key->n);
pub[offset++] = b >> 8;
@ -291,7 +287,6 @@ static int read_key(const char *inkey, unsigned char *pub)
return len;
}
static void calc_keyid(uint8_t *keyid, char *str, const unsigned char *pkey, int len)
{
uint8_t sha1[SHA_DIGEST_LENGTH];
@ -301,7 +296,7 @@ static void calc_keyid(uint8_t *keyid, char *str, const unsigned char *pkey, int
log_debug_dump(pkey, len);
SHA1(pkey, len, sha1);
//sha1[12 - 19] is exactly keyid from gpg file
/* sha1[12 - 19] is exactly keyid from gpg file */
memcpy(keyid, sha1 + 12, 8);
log_debug("keyid:\n");
log_debug_dump(keyid, 8);
@ -425,7 +420,7 @@ static int calc_evm_hash(const char *file, const char *keyfile, unsigned char *h
log_info("no attr: %s\n", *xattrname);
continue;
}
//log_debug("name: %s, value: %s, size: %d\n", *xattrname, xattr_value, err);
/*log_debug("name: %s, value: %s, size: %d\n", *xattrname, xattr_value, err);*/
log_info("name: %s, size: %d\n", *xattrname, err);
log_debug_dump(xattr_value, err);
err = EVP_DigestUpdate(&ctx, xattr_value, err);
@ -578,7 +573,7 @@ static int calc_dir_hash(const char *file, uint8_t *hash)
}
while ((de = readdir(dir))) {
//printf("entry: ino: %lu, %s\n", de->d_ino, de->d_name);
/*log_debug("entry: ino: %lu, %s\n", de->d_ino, de->d_name);*/
for (prev = NULL, pos = head; pos; prev = pos, pos = pos->next) {
if (de->d_ino < pos->de.d_ino)
break;
@ -622,7 +617,7 @@ static int calc_dir_hash(const char *file, uint8_t *hash)
static int hash_ima(const char *file)
{
unsigned char hash[65] = "\x01";// MAX hash size + 1
unsigned char hash[65] = "\x01"; /* MAX hash size + 1 */
int err;
struct stat st;
@ -788,7 +783,7 @@ static int verify_hash(const unsigned char *hash, int size, unsigned char *sig,
log_errno("Verification failed: %d", err);
return -1;
} else {
//log_info("Verification is OK\n");
/*log_info("Verification is OK\n");*/
printf("Verification is OK\n");
}
@ -1005,7 +1000,7 @@ static int calc_evm_hmac(const char *file, const char *keyfile, unsigned char *h
log_info("no attr: %s\n", *xattrname);
continue;
}
//log_debug("name: %s, value: %s, size: %d\n", *xattrname, xattr_value, err);
/*log_debug("name: %s, value: %s, size: %d\n", *xattrname, xattr_value, err);*/
log_info("name: %s, size: %d\n", *xattrname, err);
log_debug_dump(xattr_value, err);
HMAC_Update(&ctx, xattr_value, err);
@ -1203,7 +1198,8 @@ int main(int argc, char *argv[])
digsig = 1;
break;
case 'n':
set_xattr = 0; // do not set Extended Attributes... just print signature
/* do not set Extended Attributes... just print signature */
set_xattr = 0;
break;
case 'a':
hash_algo = optarg;