dh/ima-evm-utils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

split signature verification function for passing signature as an argument

Browse Source 
Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
This commit is contained in:
Dmitry Kasatkin 2013-11-12 18:26:54 +02:00
parent 092d5cc15d
commit 6918bfbf20
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/evmctl.c
View File

@ -1262,29 +1262,12 @@ static int get_hash_algo_from_sig(unsigned char *sig)
return -1; return -1;
} }
static int verify_ima(const char *file) static int verify_signature(const char *file, unsigned char *sig, int siglen)
{ {
unsigned char hash[64]; unsigned char hash[64];
unsigned char sig[1024]; int hashlen, sig_hash_algo;
int len, hashlen;
int sig_hash_algo;
char *key; char *key;
if (xattr) {
len = getxattr(file, "security.ima", sig, sizeof(sig));
if (len < 0) {
log_err("getxattr failed\n");
return len;
}
}
if (sigfile) {
void *tmp;
tmp = file2bin(file, "sig", &len);
memcpy(sig, tmp, len);
free(tmp);
}
if (sig[0] != 0x03) { if (sig[0] != 0x03) {
log_err("security.ima has no signature\n"); log_err("security.ima has no signature\n");
return -1; return -1;
@ -1322,7 +1305,30 @@ static int verify_ima(const char *file)
"/etc/keys/x509_evm.der" : "/etc/keys/x509_evm.der" :
"/etc/keys/pubkey_evm.pem"; "/etc/keys/pubkey_evm.pem";
return verify_hash(hash, hashlen, sig + 1, len - 1, key); return verify_hash(hash, hashlen, sig + 1, siglen - 1, key);
}
static int verify_ima(const char *file)
{
unsigned char sig[1024];
int len;
if (xattr) {
len = getxattr(file, "security.ima", sig, sizeof(sig));
if (len < 0) {
log_err("getxattr failed\n");
return len;
}
}
if (sigfile) {
void *tmp;
tmp = file2bin(file, "sig", &len);
memcpy(sig, tmp, len);
free(tmp);
}
return verify_signature(file, sig, len);
} }
static int cmd_verify_ima(struct command *cmd) static int cmd_verify_ima(struct command *cmd)