Select verification function version in the library code

Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>

diff --git a/src/evmctl.c b/src/evmctl.c
index a36853b..438e026 100644 (file)
--- a/src/evmctl.c
+++ b/src/evmctl.c
@@ -1565,7 +1565,6 @@ int main(int argc, char *argv[])
        g_argc = argc;
 
        sign_hash = sign_hash_v1;
-       params.verify_hash = verify_hash_v1;
 
        while (1) {
                c = getopt_long(argc, argv, "hvnsda:p:fu::xk:t:r", opts, &lind);
@@ -1612,7 +1611,6 @@ int main(int argc, char *argv[])
                case 'x':
                        params.x509 = 1;
                        sign_hash = sign_hash_v2;
-                       params.verify_hash = verify_hash_v2;
                        break;
                case 'k':
                        params.keyfile = optarg;

diff --git a/src/libevm.h b/src/libevm.h
index 2eee090..841bfc4 100644 (file)
--- a/src/libevm.h
+++ b/src/libevm.h
@@ -148,8 +148,6 @@ int get_filesize(const char *filename);
 int ima_calc_hash(const char *file, uint8_t *hash);
 int get_hash_algo(const char *algo);
 RSA *read_pub_key(const char *keyfile);
-int verify_hash_v1(const unsigned char *hash, int size, unsigned char *sig, int siglen, const char *keyfile);
-int verify_hash_v2(const unsigned char *hash, int size, unsigned char *sig, int siglen, const char *keyfile);
 
 int verify_hash(const unsigned char *hash, int size, unsigned char *sig, int siglen);
 int ima_verify_signature(const char *file, unsigned char *sig, int siglen);