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

Select signing function in single place

Browse Source 
Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
This commit is contained in:
Dmitry Kasatkin 2014-01-24 15:01:17 +02:00
parent 454350d294
commit f9a3d7c378
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/evmctl.c
View File

@ -1564,8 +1564,6 @@ int main(int argc, char *argv[])
g_argv = argv; g_argv = argv;
g_argc = argc; g_argc = argc;
sign_hash = sign_hash_v1;
while (1) { while (1) {
c = getopt_long(argc, argv, "hvnsda:p:fu::xk:t:r", opts, &lind); c = getopt_long(argc, argv, "hvnsda:p:fu::xk:t:r", opts, &lind);
if (c == -1) if (c == -1)
@ -1610,7 +1608,6 @@ int main(int argc, char *argv[])
break; break;
case 'x': case 'x':
params.x509 = 1; params.x509 = 1;
sign_hash = sign_hash_v2;
break; break;
case 'k': case 'k':
params.keyfile = optarg; params.keyfile = optarg;
@ -1629,6 +1626,11 @@ int main(int argc, char *argv[])
} }
} }
if (params.x509)
sign_hash = sign_hash_v2;
else
sign_hash = sign_hash_v1;
OpenSSL_add_all_algorithms(); OpenSSL_add_all_algorithms();
ERR_load_crypto_strings(); ERR_load_crypto_strings();