[SeaBIOS] [PATCH 1/3] tpm: Drop code using the TPM for sha1

[Stefan Berger]

From: Stefan Berger <stefanb at linux.vnet.ibm.com>

Drop the code that is using the TPM for sha1 calculations.

Signed-off-by: Stefan Berger <stefanb at linux.vnet.ibm.com>
---
 src/hw/tpm_drivers.c |  1 -
 src/hw/tpm_drivers.h |  3 --
 src/tcgbios.c        | 81 ++--------------------------------------------------
 3 files changed, 2 insertions(+), 83 deletions(-)

diff --git a/src/hw/tpm_drivers.c b/src/hw/tpm_drivers.c
index b5cde00..0bf5997 100644
--- a/src/hw/tpm_drivers.c
+++ b/src/hw/tpm_drivers.c
@@ -286,6 +286,5 @@ struct tpm_driver tpm_drivers[TPM_NUM_DRIVERS] = {
             .readresp      = tis_readresp,
             .waitdatavalid = tis_waitdatavalid,
             .waitrespready = tis_waitrespready,
-            .sha1threshold = 100 * 1024,
         },
 };
diff --git a/src/hw/tpm_drivers.h b/src/hw/tpm_drivers.h
index 48c6615..6357d02 100644
--- a/src/hw/tpm_drivers.h
+++ b/src/hw/tpm_drivers.h
@@ -23,9 +23,6 @@ struct tpm_driver {
     u32 (*readresp)(u8 *buffer, u32 *len);
     u32 (*waitdatavalid)(void);
     u32 (*waitrespready)(enum tpmDurationType to_t);
-    /* the TPM will be used for buffers of sizes below the sha1threshold
-       for calculating the hash */
-    u32 sha1threshold;
 };
 
 extern struct tpm_driver tpm_drivers[];
diff --git a/src/tcgbios.c b/src/tcgbios.c
index 9ae075a..cd5e2cf 100644
--- a/src/tcgbios.c
+++ b/src/tcgbios.c
@@ -619,83 +619,6 @@ get_lasa_last_ptr(u16 *entry_count, u8 **log_area_start_address_next)
     return log_area_start_address_last;
 }
 
-
-static u32
-tpm_sha1_calc(const u8 *data, u32 length, u8 *hash)
-{
-    u32 rc;
-    u32 returnCode;
-    struct tpm_res_sha1start start;
-    struct tpm_res_sha1complete complete;
-    u32 blocks = length / 64;
-    u32 rest = length & 0x3f;
-    u32 numbytes, numbytes_no;
-    u32 offset = 0;
-
-    rc = build_and_send_cmd(0, TPM_ORD_SHA1Start,
-                            NULL, 0,
-                            (u8 *)&start, sizeof(start),
-                            &returnCode, TPM_DURATION_TYPE_SHORT);
-
-    if (rc || returnCode)
-        goto err_exit;
-
-    while (blocks > 0) {
-
-        numbytes = be32_to_cpu(start.max_num_bytes);
-        if (numbytes > blocks * 64)
-             numbytes = blocks * 64;
-
-        numbytes_no = cpu_to_be32(numbytes);
-
-        rc = build_and_send_cmd_od(0, TPM_ORD_SHA1Update,
-                                   (u8 *)&numbytes_no, sizeof(numbytes_no),
-                                   NULL, 0, &returnCode,
-                                   &data[offset], numbytes,
-                                   TPM_DURATION_TYPE_SHORT);
-
-        if (rc || returnCode)
-            goto err_exit;
-
-        offset += numbytes;
-        blocks -= (numbytes / 64);
-    }
-
-    numbytes_no = cpu_to_be32(rest);
-
-    rc = build_and_send_cmd_od(0, TPM_ORD_SHA1Complete,
-                              (u8 *)&numbytes_no, sizeof(numbytes_no),
-                              (u8 *)&complete, sizeof(complete),
-                              &returnCode,
-                              &data[offset], rest, TPM_DURATION_TYPE_SHORT);
-
-    if (rc || returnCode)
-        goto err_exit;
-
-    memcpy(hash, complete.hash, sizeof(complete.hash));
-
-    return 0;
-
-err_exit:
-    dprintf(DEBUG_tcg, "TCGBIOS: TPM SHA1 malfunctioning.\n");
-
-    tpm_set_failure();
-    if (rc)
-        return rc;
-    return TCG_TCG_COMMAND_ERROR;
-}
-
-
-static u32
-sha1_calc(const u8 *data, u32 length, u8 *hash)
-{
-    if (length < tpm_drivers[tpm_state.tpm_driver_to_use].sha1threshold)
-        return tpm_sha1_calc(data, length, hash);
-
-    return sha1(data, length, hash);
-}
-
-
 /*
  * Extend the ACPI log with the given entry by copying the
  * entry data into the log.
@@ -887,7 +810,7 @@ hash_all(const struct hai *hai, u8 *hash)
         hai->algorithmid != TPM_ALG_SHA)
         return TCG_INVALID_INPUT_PARA;
 
-    return sha1_calc((const u8 *)hai->hashdataptr, hai->hashdatalen, hash);
+    return sha1((const u8 *)hai->hashdataptr, hai->hashdatalen, hash);
 }
 
 static u32
@@ -902,7 +825,7 @@ hash_log_event(const void *hashdata, u32 hashdata_length,
         return TCG_INVALID_INPUT_PARA;
 
     if (hashdata) {
-        rc = sha1_calc(hashdata, hashdata_length, pcpes->digest);
+        rc = sha1(hashdata, hashdata_length, pcpes->digest);
         if (rc)
             return rc;
     }
-- 
2.4.3