mirror of
https://git.code.sf.net/p/linux-ima/ima-evm-utils
synced 2025-04-28 06:33:36 +02:00
Changed to conform Linux kernel coding style
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
parent
e91cb01e9a
commit
7e89de565e
146
src/evmctl.c
146
src/evmctl.c
@ -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)
|
||||
@ -107,25 +107,23 @@ enum digest_algo {
|
||||
};
|
||||
|
||||
struct pubkey_hdr {
|
||||
uint8_t version; /* key format version */
|
||||
time_t timestamp; /* key made, always 0 for now */
|
||||
uint8_t algo;
|
||||
uint8_t nmpi;
|
||||
char mpi[0];
|
||||
uint8_t version; /* key format version */
|
||||
time_t timestamp; /* key made, always 0 for now */
|
||||
uint8_t algo;
|
||||
uint8_t nmpi;
|
||||
char mpi[0];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
|
||||
struct signature_hdr {
|
||||
uint8_t version; /* signature format version */
|
||||
time_t timestamp; /* signature made */
|
||||
uint8_t algo;
|
||||
uint8_t hash;
|
||||
uint8_t keyid[8];
|
||||
uint8_t nmpi;
|
||||
char mpi[0];
|
||||
uint8_t version; /* signature format version */
|
||||
time_t timestamp; /* signature made */
|
||||
uint8_t algo;
|
||||
uint8_t hash;
|
||||
uint8_t keyid[8];
|
||||
uint8_t nmpi;
|
||||
char mpi[0];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
|
||||
static char *evm_config_xattrnames[] = {
|
||||
"security.selinux",
|
||||
"security.SMACK64",
|
||||
@ -135,35 +133,34 @@ static char *evm_config_xattrnames[] = {
|
||||
};
|
||||
|
||||
struct command {
|
||||
char *name;
|
||||
int (*func)(struct command *cmd);
|
||||
int cmd;
|
||||
char *arg;
|
||||
char *msg; /* extra info message */
|
||||
char *name;
|
||||
int (*func)(struct command *cmd);
|
||||
int cmd;
|
||||
char *arg;
|
||||
char *msg; /* extra info message */
|
||||
};
|
||||
|
||||
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 char *hash_algo = "sha1";
|
||||
static int binkey = 0;
|
||||
static char *keypass;
|
||||
static int verbose = LOG_INFO - 1;
|
||||
static int g_argc;
|
||||
static char **g_argv;
|
||||
static int set_xattr = 1;
|
||||
static int digest;
|
||||
static int digsig;
|
||||
static char *hash_algo = "sha1";
|
||||
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)
|
||||
{
|
||||
int i;
|
||||
uint8_t *data = (uint8_t *)ptr;
|
||||
int i;
|
||||
uint8_t *data = (uint8_t *) ptr;
|
||||
|
||||
for (i = 0; i < len; i++) {
|
||||
fprintf(fp, "%02x", data[i]);
|
||||
}
|
||||
fprintf(fp, "\n");
|
||||
for (i = 0; i < len; i++)
|
||||
fprintf(fp, "%02x", data[i]);
|
||||
fprintf(fp, "\n");
|
||||
}
|
||||
|
||||
static void dump(const void *ptr, int len)
|
||||
@ -176,7 +173,7 @@ static inline int get_filesize(const char *filename)
|
||||
struct stat stats;
|
||||
/* Need to know the file length */
|
||||
stat(filename, &stats);
|
||||
return (int) stats.st_size;
|
||||
return (int)stats.st_size;
|
||||
}
|
||||
|
||||
static inline int get_fdsize(int fd)
|
||||
@ -184,7 +181,7 @@ static inline int get_fdsize(int fd)
|
||||
struct stat stats;
|
||||
/* Need to know the file length */
|
||||
fstat(fd, &stats);
|
||||
return (int) stats.st_size;
|
||||
return (int)stats.st_size;
|
||||
}
|
||||
|
||||
static int bin2file(const char *file, const char *ext, const unsigned char *data, int len)
|
||||
@ -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,12 +296,12 @@ 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);
|
||||
|
||||
id = __be64_to_cpup((__be64 *)keyid);
|
||||
id = __be64_to_cpup((__be64 *) keyid);
|
||||
sprintf(str, "%llX", (unsigned long long)id);
|
||||
log_info("keyid: %s\n", str);
|
||||
}
|
||||
@ -366,7 +361,7 @@ static int sign_hash(const unsigned char *hash, int size, const char *keyfile, u
|
||||
len = err;
|
||||
|
||||
/* we add bit length of the signature to make it gnupg compatible */
|
||||
blen = (uint16_t *)(sig + sizeof(*hdr));
|
||||
blen = (uint16_t *) (sig + sizeof(*hdr));
|
||||
*blen = __cpu_to_be16(len << 3);
|
||||
len += sizeof(*hdr) + 2;
|
||||
log_info("evm/ima signature: %d bytes\n", len);
|
||||
@ -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);
|
||||
@ -442,7 +437,7 @@ static int calc_evm_hash(const char *file, const char *keyfile, unsigned char *h
|
||||
hmac_misc.gid = st.st_gid;
|
||||
hmac_misc.mode = st.st_mode;
|
||||
|
||||
err = EVP_DigestUpdate(&ctx, (const unsigned char*)&hmac_misc, sizeof(hmac_misc));
|
||||
err = EVP_DigestUpdate(&ctx, (const unsigned char *)&hmac_misc, sizeof(hmac_misc));
|
||||
if (!err) {
|
||||
log_errno("EVP_DigestUpdate() failed");
|
||||
return -1;
|
||||
@ -483,7 +478,7 @@ static int calc_file_hash(const char *file, uint8_t *hash)
|
||||
{
|
||||
EVP_MD_CTX ctx;
|
||||
const EVP_MD *md;
|
||||
uint8_t *data;
|
||||
uint8_t *data;
|
||||
int err, size, bs = DATA_SIZE;
|
||||
size_t len;
|
||||
unsigned int mdlen;
|
||||
@ -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");
|
||||
}
|
||||
|
||||
@ -875,11 +870,11 @@ static int cmd_import_bin(struct command *cmd)
|
||||
inkey = g_argv[optind++];
|
||||
if (!inkey)
|
||||
inkey = "/etc/keys/pubkey_evm.bin";
|
||||
else
|
||||
ring = g_argv[optind++];
|
||||
else
|
||||
ring = g_argv[optind++];
|
||||
|
||||
if (!ring)
|
||||
id = KEY_SPEC_USER_KEYRING;
|
||||
if (!ring)
|
||||
id = KEY_SPEC_USER_KEYRING;
|
||||
else
|
||||
id = atoi(ring);
|
||||
|
||||
@ -889,7 +884,7 @@ static int cmd_import_bin(struct command *cmd)
|
||||
|
||||
calc_keyid(keyid, name, (unsigned char *)key, len);
|
||||
|
||||
log_info("Importing public key %s from file %s into keyring %d\n", name, inkey, id);
|
||||
log_info("Importing public key %s from file %s into keyring %d\n", name, inkey, id);
|
||||
|
||||
id = add_key("user", name, key, len, id);
|
||||
if (id < 0) {
|
||||
@ -919,11 +914,11 @@ static int cmd_import(struct command *cmd)
|
||||
inkey = g_argv[optind++];
|
||||
if (!inkey)
|
||||
inkey = "/etc/keys/pubkey_evm.pem";
|
||||
else
|
||||
ring = g_argv[optind++];
|
||||
else
|
||||
ring = g_argv[optind++];
|
||||
|
||||
if (!ring)
|
||||
id = KEY_SPEC_USER_KEYRING;
|
||||
if (!ring)
|
||||
id = KEY_SPEC_USER_KEYRING;
|
||||
else
|
||||
id = atoi(ring);
|
||||
|
||||
@ -933,7 +928,7 @@ static int cmd_import(struct command *cmd)
|
||||
|
||||
calc_keyid(keyid, name, key, len);
|
||||
|
||||
log_info("Importing public key %s from file %s into keyring %d\n", name, inkey, id);
|
||||
log_info("Importing public key %s from file %s into keyring %d\n", name, inkey, id);
|
||||
|
||||
id = add_key("user", name, key, len, id);
|
||||
if (id < 0) {
|
||||
@ -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);
|
||||
@ -1018,7 +1013,7 @@ static int calc_evm_hmac(const char *file, const char *keyfile, unsigned char *h
|
||||
hmac_misc.gid = st.st_gid;
|
||||
hmac_misc.mode = st.st_mode;
|
||||
|
||||
HMAC_Update(&ctx, (const unsigned char*)&hmac_misc, sizeof(hmac_misc));
|
||||
HMAC_Update(&ctx, (const unsigned char *)&hmac_misc, sizeof(hmac_misc));
|
||||
HMAC_Final(&ctx, hash, &mdlen);
|
||||
HMAC_CTX_cleanup(&ctx);
|
||||
|
||||
@ -1097,7 +1092,7 @@ static void print_full_usage(struct command *cmd)
|
||||
|
||||
static int print_command_usage(struct command *cmds, char *command)
|
||||
{
|
||||
struct command *cmd;
|
||||
struct command *cmd;
|
||||
|
||||
for (cmd = cmds; cmd->name; cmd++) {
|
||||
if (strcmp(cmd->name, command) == 0) {
|
||||
@ -1106,12 +1101,12 @@ static int print_command_usage(struct command *cmds, char *command)
|
||||
}
|
||||
}
|
||||
printf("invalid command: %s\n", command);
|
||||
return 1;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void print_all_usage(struct command *cmds)
|
||||
{
|
||||
struct command *cmd;
|
||||
struct command *cmd;
|
||||
|
||||
for (cmd = cmds; cmd->name; cmd++) {
|
||||
if (cmd->arg)
|
||||
@ -1123,7 +1118,7 @@ static void print_all_usage(struct command *cmds)
|
||||
|
||||
static int call_command(struct command *cmds, char *command)
|
||||
{
|
||||
struct command *cmd;
|
||||
struct command *cmd;
|
||||
|
||||
for (cmd = cmds; cmd->name; cmd++) {
|
||||
if (strcasecmp(cmd->name, command) == 0)
|
||||
@ -1151,17 +1146,17 @@ static void usage(void)
|
||||
|
||||
struct command cmds[] = {
|
||||
{"help", cmd_help, 0, "<command>"},
|
||||
{"import", cmd_import, 0, "[--bin] inkey keyring", "Import public key (PEM/bin) into the keyring.\n" },
|
||||
{"convert", cmd_convert, 0, "inkey outkey", "Convert PEM public key into IMA/EVM kernel friendly format.\n" },
|
||||
{"sign", cmd_sign_evm, 0, "[--imahash | --imasig ] file [key]", "Sign file metadata.\n" },
|
||||
{"verify", cmd_verify_evm, 0, "file", "Verify EVM signature (for debugging).\n" },
|
||||
{"ima_sign", cmd_sign_ima, 0, "file [key]", "Sign file content.\n" },
|
||||
{"ima_hash", cmd_hash_ima, 0, "file", "Hash file content.\n" },
|
||||
{"hmac", cmd_hmac_evm, 0, "[--imahash | --imasig ] file [key]", "Sign file metadata with HMAC (for debugging).\n" },
|
||||
{"import", cmd_import, 0, "[--bin] inkey keyring", "Import public key (PEM/bin) into the keyring.\n"},
|
||||
{"convert", cmd_convert, 0, "inkey outkey", "Convert PEM public key into IMA/EVM kernel friendly format.\n"},
|
||||
{"sign", cmd_sign_evm, 0, "[--imahash | --imasig ] file [key]", "Sign file metadata.\n"},
|
||||
{"verify", cmd_verify_evm, 0, "file", "Verify EVM signature (for debugging).\n"},
|
||||
{"ima_sign", cmd_sign_ima, 0, "file [key]", "Sign file content.\n"},
|
||||
{"ima_hash", cmd_hash_ima, 0, "file", "Hash file content.\n"},
|
||||
{"hmac", cmd_hmac_evm, 0, "[--imahash | --imasig ] file [key]", "Sign file metadata with HMAC (for debugging).\n"},
|
||||
{0, 0, 0, NULL}
|
||||
};
|
||||
|
||||
static struct option opts[] = {
|
||||
static struct option opts[] = {
|
||||
{"help", 0, 0, 'h'},
|
||||
{"inkey", 1, 0, 'k'},
|
||||
{"imasig", 0, 0, 's'},
|
||||
@ -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;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user