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

Remove verify_hash parameter

Browse Source 
Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
This commit is contained in:
Dmitry Kasatkin 2014-01-24 15:59:24 +02:00
parent fd7e949c29
commit 86a605eb10
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libevm.c
View File

@ -460,14 +460,15 @@ int verify_hash(const unsigned char *hash, int size, unsigned char *sig, int sig
{ {
char *key; char *key;
int x509; int x509;
verify_hash_fn_t verify_hash;
/* Get signature type from sig header */ /* Get signature type from sig header */
if (sig[0] == DIGSIG_VERSION_1) { if (sig[0] == DIGSIG_VERSION_1) {
params.verify_hash = verify_hash_v1; verify_hash = verify_hash_v1;
/* Read pubkey from RSA key */ /* Read pubkey from RSA key */
x509 = 0; x509 = 0;
} else if (sig[0] == DIGSIG_VERSION_2) { } else if (sig[0] == DIGSIG_VERSION_2) {
params.verify_hash = verify_hash_v2; verify_hash = verify_hash_v2;
/* Read pubkey from x509 cert */ /* Read pubkey from x509 cert */
x509 = 1; x509 = 1;
} else } else
@ -478,7 +479,7 @@ int verify_hash(const unsigned char *hash, int size, unsigned char *sig, int sig
"/etc/keys/x509_evm.der" : "/etc/keys/x509_evm.der" :
"/etc/keys/pubkey_evm.pem"; "/etc/keys/pubkey_evm.pem";
return params.verify_hash(hash, size, sig, siglen, key); return verify_hash(hash, size, sig, siglen, key);
} }
int ima_verify_signature(const char *file, unsigned char *sig, int siglen) int ima_verify_signature(const char *file, unsigned char *sig, int siglen)

1
src/libevm.h
View File

@ -129,7 +129,6 @@ struct libevm_params {
int verbose; int verbose;
const char *hash_algo; const char *hash_algo;
char *keyfile; char *keyfile;
verify_hash_fn_t verify_hash;
}; };
struct RSA_ASN1_template { struct RSA_ASN1_template {