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 14:43:37 +02:00
Code Releases Activity

Use verify_hash() for EVM verification as well

Browse Source 
Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
This commit is contained in:
Dmitry Kasatkin 2014-01-24 14:50:09 +02:00
parent 3299fba40d
commit ff5f07e171
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/evmctl.c
View File

@ -776,7 +776,7 @@ static int cmd_sign_evm(struct command *cmd)
return err; return err;
} }
static int verify_evm(const char *file, const char *key) static int verify_evm(const char *file)
{ {
unsigned char hash[20]; unsigned char hash[20];
unsigned char sig[1024]; unsigned char sig[1024];
@ -797,12 +797,12 @@ static int verify_evm(const char *file, const char *key)
return -1; return -1;
} }
return params.verify_hash(hash, sizeof(hash), sig + 1, len - 1, key); return verify_hash(hash, sizeof(hash), sig + 1, len - 1);
} }
static int cmd_verify_evm(struct command *cmd) static int cmd_verify_evm(struct command *cmd)
{ {
char *key, *file = g_argv[optind++]; char *file = g_argv[optind++];
if (!file) { if (!file) {
log_err("Parameters missing\n"); log_err("Parameters missing\n");
@ -810,11 +810,7 @@ static int cmd_verify_evm(struct command *cmd)
return -1; return -1;
} }
key = params.keyfile ? : params.x509 ? return verify_evm(file);
"/etc/keys/x509_evm.der" :
"/etc/keys/pubkey_evm.pem";
return verify_evm(file, key);
} }
static int verify_ima(const char *file) static int verify_ima(const char *file)