From: Mimi Zohar <zohar@linux.ibm.com>
To: linux-integrity@vger.kernel.org
Cc: Mimi Zohar <zohar@linux.ibm.com>, Petr Vorel <pvorel@suse.cz>,
Vitaly Chikunov <vt@altlinux.org>,
Stefan Berger <stefanb@linux.ibm.com>
Subject: [PATCH ima-evm-utils v3 04/15] Replace the low level SHA1 calls when calculating the TPM 1.2 PCRs
Date: Tue, 13 Sep 2022 22:29:45 -0400 [thread overview]
Message-ID: <20220914022956.1359218-5-zohar@linux.ibm.com> (raw)
In-Reply-To: <20220914022956.1359218-1-zohar@linux.ibm.com>
OpenSSL v3 emits deprecated warnings for SHA1 functions. Use the
EVP_ functions when walking the TPM 1.2 binary bios measurements
to calculate the TPM 1.2 PCRs.
Reviewed-by: Petr Vorel <pvorel@suse.cz>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
---
src/evmctl.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 59 insertions(+), 6 deletions(-)
diff --git a/src/evmctl.c b/src/evmctl.c
index 13b0105af8c4..641504047a36 100644
--- a/src/evmctl.c
+++ b/src/evmctl.c
@@ -2295,6 +2295,11 @@ static int cmd_ima_measurement(struct command *cmd)
return ima_measurement(file);
}
+/*
+ * read_binary_bios_measurements - read the TPM 1.2 event log
+ *
+ * Returns 0 on success, 1 on failure.
+ */
#define MAX_EVENT_DATA_SIZE 200000
static int read_binary_bios_measurements(char *file, struct tpm_bank_info *bank)
{
@@ -2307,12 +2312,19 @@ static int read_binary_bios_measurements(char *file, struct tpm_bank_info *bank)
} header;
unsigned char data[MAX_EVENT_DATA_SIZE];
} event;
+ EVP_MD_CTX *mdctx;
+ const EVP_MD *md;
+ unsigned int mdlen;
+ int evp_err = 1; /* success */
struct stat s;
FILE *fp;
- SHA_CTX c;
int err = 0;
int len;
int i;
+#if OPENSSL_VERSION_NUMBER < 0x10100000
+ EVP_MD_CTX ctx;
+ mdctx = &ctx;
+#endif
if (stat(file, &s) == -1) {
errno = 0;
@@ -2334,6 +2346,23 @@ static int read_binary_bios_measurements(char *file, struct tpm_bank_info *bank)
if (imaevm_params.verbose > LOG_INFO)
log_info("Reading the TPM 1.2 event log %s.\n", file);
+ md = EVP_get_digestbyname(bank->algo_name);
+ if (!md) {
+ log_errno("Unknown message digest %s\n", bank->algo_name);
+ errno = 0;
+ fclose(fp);
+ return 1;
+ }
+
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
+ mdctx = EVP_MD_CTX_new();
+ if (!mdctx) {
+ log_err("EVP_MD_CTX_new failed\n");
+ fclose(fp);
+ return 1;
+ }
+#endif
+
/* Extend the pseudo TPM PCRs with the event digest */
while (fread(&event, sizeof(event.header), 1, fp) == 1) {
if (imaevm_params.verbose > LOG_INFO) {
@@ -2342,13 +2371,30 @@ static int read_binary_bios_measurements(char *file, struct tpm_bank_info *bank)
}
if (event.header.pcr >= NUM_PCRS) {
log_err("Invalid PCR %d.\n", event.header.pcr);
- err = 1;
break;
}
- SHA1_Init(&c);
- SHA1_Update(&c, bank->pcr[event.header.pcr], 20);
- SHA1_Update(&c, event.header.digest, 20);
- SHA1_Final(bank->pcr[event.header.pcr], &c);
+
+ evp_err = EVP_DigestInit(mdctx, md);
+ if (evp_err == 0) {
+ log_err("EVP_DigestInit() failed\n");
+ break;
+ }
+
+ evp_err = EVP_DigestUpdate(mdctx, bank->pcr[event.header.pcr], 20);
+ if (evp_err == 0) {
+ log_err("EVP_DigestUpdate() failed\n");
+ break;
+ }
+ evp_err = EVP_DigestUpdate(mdctx, event.header.digest, 20);
+ if (evp_err == 0) {
+ log_err("EVP_DigestUpdate() failed\n");
+ break;
+ }
+ evp_err = EVP_DigestFinal(mdctx, bank->pcr[event.header.pcr], &mdlen);
+ if (evp_err == 0) {
+ log_err("EVP_DigestFinal() failed\n");
+ break;
+ }
if (event.header.len > MAX_EVENT_DATA_SIZE) {
log_err("Event data event too long.\n");
err = 1;
@@ -2357,10 +2403,17 @@ static int read_binary_bios_measurements(char *file, struct tpm_bank_info *bank)
len = fread(event.data, event.header.len, 1, fp);
if (len != 1) {
log_errno("Failed reading event data (short read)\n");
+ err = 1;
break;
}
}
+
+ if (evp_err == 0) /* EVP_ functions return 1 on success, 0 on failure */
+ err = 1;
fclose(fp);
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
+ EVP_MD_CTX_free(mdctx);
+#endif
if (imaevm_params.verbose <= LOG_INFO)
return err;
--
2.31.1
next prev parent reply other threads:[~2022-09-14 2:30 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-14 2:29 [PATCH ima-evm-utils v3 00/15] address deprecated warnings Mimi Zohar
2022-09-14 2:29 ` [PATCH ima-evm-utils v3 01/15] travis: update dist=focal Mimi Zohar
2022-09-14 2:29 ` [PATCH ima-evm-utils v3 02/15] Update configure.ac to address a couple of obsolete warnings Mimi Zohar
2022-09-14 2:29 ` [PATCH ima-evm-utils v3 03/15] Deprecate IMA signature version 1 Mimi Zohar
2022-09-14 2:29 ` Mimi Zohar [this message]
2022-09-14 2:29 ` [PATCH ima-evm-utils v3 05/15] Replace the low level HMAC calls when calculating the EVM HMAC Mimi Zohar
2022-09-14 2:29 ` [PATCH ima-evm-utils v3 06/15] Add missing EVP_MD_CTX_free() call in calc_evm_hash() Mimi Zohar
2022-09-14 14:51 ` Vitaly Chikunov
2022-09-15 11:58 ` Mimi Zohar
2022-09-15 15:36 ` Vitaly Chikunov
2022-09-16 13:07 ` Mimi Zohar
2022-09-14 2:29 ` [PATCH ima-evm-utils v3 07/15] Disable use of OpenSSL "engine" support Mimi Zohar
2022-09-14 16:38 ` Vitaly Chikunov
2022-09-14 2:29 ` [PATCH ima-evm-utils v3 08/15] Fix potential use after free in read_tpm_banks() Mimi Zohar
2022-09-14 2:29 ` [PATCH ima-evm-utils v3 09/15] Limit the file hash algorithm name length Mimi Zohar
2022-09-14 2:29 ` [PATCH ima-evm-utils v3 10/15] Missing template data size lower bounds checking Mimi Zohar
2022-09-14 2:29 ` [PATCH ima-evm-utils v3 11/15] Limit configuring OpenSSL engine support Mimi Zohar
2022-09-14 14:59 ` Vitaly Chikunov
2022-09-14 2:29 ` [PATCH ima-evm-utils v3 12/15] Base sm2/sm3 test on openssl version installed Mimi Zohar
2022-09-14 2:29 ` [PATCH ima-evm-utils v3 13/15] Compile a newer version of OpenSSL Mimi Zohar
2022-09-14 2:29 ` [PATCH ima-evm-utils v3 14/15] Build OpenSSL without engine support Mimi Zohar
2022-09-14 2:29 ` [PATCH ima-evm-utils v3 15/15] Fix d2i_x509_fp failure Mimi Zohar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220914022956.1359218-5-zohar@linux.ibm.com \
--to=zohar@linux.ibm.com \
--cc=linux-integrity@vger.kernel.org \
--cc=pvorel@suse.cz \
--cc=stefanb@linux.ibm.com \
--cc=vt@altlinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox