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

fix the crash when key file is not found

Browse Source 
Error in error handling caused crash when key file is not found.

Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
This commit is contained in:
Dmitry Kasatkin 2013-08-27 15:44:18 +03:00
parent 971b286169
commit 15dab873b5
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/evmctl.c
View File

@ -1342,10 +1342,10 @@ static int cmd_import(struct command *cmd)
{ {
char *inkey, *ring = NULL; char *inkey, *ring = NULL;
unsigned char _pub[1024], *pub = _pub; unsigned char _pub[1024], *pub = _pub;
int id, len, err = -1; int id, len, err = 0;
char name[20]; char name[20];
uint8_t keyid[8]; uint8_t keyid[8];
RSA *key = NULL; RSA *key;
inkey = g_argv[optind++]; inkey = g_argv[optind++];
if (!inkey) { if (!inkey) {
@ -1361,7 +1361,7 @@ static int cmd_import(struct command *cmd)
key = read_pub_key(inkey); key = read_pub_key(inkey);
if (!key) if (!key)
goto out; return 1;
if (x509) { if (x509) {
pub = file2bin(inkey, NULL, &len); pub = file2bin(inkey, NULL, &len);
@ -1378,19 +1378,15 @@ static int cmd_import(struct command *cmd)
id = add_key(x509 ? "asymmetric" : "user", x509 ? NULL : name, pub, len, id); id = add_key(x509 ? "asymmetric" : "user", x509 ? NULL : name, pub, len, id);
if (id < 0) { if (id < 0) {
log_err("add_key failed\n"); log_err("add_key failed\n");
goto out; err = id;
} else {
log_info("keyid: %d\n", id);
printf("%d\n", id);
} }
log_info("keyid: %d\n", id);
printf("%d\n", id);
err = 0;
out:
if (key)
RSA_free(key);
if (x509) if (x509)
free(pub); free(pub);
out:
RSA_free(key);
return err; return err;
} }