dh/ima-evm-utils-mirror
1
0
Fork 0
mirror of https://git.code.sf.net/p/linux-ima/ima-evm-utils synced 2025-04-28 14:43:37 +02:00
Code Releases Activity

ima-evm-utils: Convert read_pub_key to EVP_PKEY API

Browse Source 
Introduce read_pub_pkey() to read keys using EVP_PKEY, and change
read_pub_key() to be wrapper for it.

Signed-off-by: Vitaly Chikunov <vt@altlinux.org>
Acked-by: Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
This commit is contained in:
Vitaly Chikunov 2019-07-03 18:50:07 +03:00 committed by Mimi Zohar
parent 2308132957
commit 71c1be47e7
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/imaevm.h
View File

@ -216,6 +216,7 @@ int get_filesize(const char *filename);
int ima_calc_hash(const char *file, uint8_t *hash); int ima_calc_hash(const char *file, uint8_t *hash);
int get_hash_algo(const char *algo); int get_hash_algo(const char *algo);
RSA *read_pub_key(const char *keyfile, int x509); RSA *read_pub_key(const char *keyfile, int x509);
EVP_PKEY *read_pub_pkey(const char *keyfile, int x509);
void calc_keyid_v1(uint8_t *keyid, char *str, const unsigned char *pkey, int len); void calc_keyid_v1(uint8_t *keyid, char *str, const unsigned char *pkey, int len);
void calc_keyid_v2(uint32_t *keyid, char *str, RSA *key); void calc_keyid_v2(uint32_t *keyid, char *str, RSA *key);

33
src/libimaevm.c
View File

@ -355,10 +355,9 @@ int ima_calc_hash(const char *file, uint8_t *hash)
return mdlen; return mdlen;
} }
RSA *read_pub_key(const char *keyfile, int x509) EVP_PKEY *read_pub_pkey(const char *keyfile, int x509)
{ {
FILE *fp; FILE *fp;
RSA *key = NULL;
X509 *crt = NULL; X509 *crt = NULL;
EVP_PKEY *pkey = NULL; EVP_PKEY *pkey = NULL;
@ -375,24 +374,36 @@ RSA *read_pub_key(const char *keyfile, int x509)
goto out; goto out;
} }
pkey = X509_extract_key(crt); pkey = X509_extract_key(crt);
X509_free(crt);
if (!pkey) { if (!pkey) {
log_err("X509_extract_key() failed\n"); log_err("X509_extract_key() failed\n");
goto out; goto out;
} }
key = EVP_PKEY_get1_RSA(pkey);
} else { } else {
key = PEM_read_RSA_PUBKEY(fp, NULL, NULL, NULL); pkey = PEM_read_PUBKEY(fp, NULL, NULL, NULL);
if (!pkey)
log_err("PEM_read_PUBKEY() failed\n");
} }
if (!key)
log_err("PEM_read_RSA_PUBKEY() failed\n");
out: out:
if (pkey)
EVP_PKEY_free(pkey);
if (crt)
X509_free(crt);
fclose(fp); fclose(fp);
return pkey;
}
RSA *read_pub_key(const char *keyfile, int x509)
{
EVP_PKEY *pkey;
RSA *key;
pkey = read_pub_pkey(keyfile, x509);
if (!pkey)
return NULL;
key = EVP_PKEY_get1_RSA(pkey);
EVP_PKEY_free(pkey);
if (!key) {
log_err("read_pub_key: unsupported key type\n");
return NULL;
}
return key; return key;
} }