From patchwork Tue Jun 15 14:41:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 1492275 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=slof-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=WQarahBY; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G49xX11KQz9sW6 for ; Wed, 16 Jun 2021 00:41:36 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4G49xX4x4fz3btF for ; Wed, 16 Jun 2021 00:41:36 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=WQarahBY; dkim-atps=neutral X-Original-To: slof@lists.ozlabs.org Delivered-To: slof@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=stefanb@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=WQarahBY; dkim-atps=neutral Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4G49xN3TWNz2yXS for ; Wed, 16 Jun 2021 00:41:27 +1000 (AEST) Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 15FEWs3E078443; Tue, 15 Jun 2021 10:41:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=WHC7QCQTr+0Ma210WtcQOpfTopZig2Y+XKjybXUs02E=; b=WQarahBYrLbIP85xz0hxxt/uE86lrkLfoJWkJV9ShOcMsBkICYb17e/v597c3Sw+9lZZ ioBncJed7SDQ+ZKlzfcezhX5jwN/g55u3mPRQvJvyGv+g/yVFGmhU3WmIRB6Ao5PO4T8 QoL+sEN+VapFIm/c0IT4jvjpuDa2qx8bopXouwOTaOw/6eSZ0iOXIKvYwz2T7EZ3LsiX ri5rjcVRMcG54XbMzVvCMsD3JQnSlkfO1C92P73na3kt1OBvgNrYrdq5aexL+bFT5sSP tb/FhZgX5MSexnf8U3Mg878RVqW2UFxF74MG/4ajUjBxdQkxez9eUfNiqT5bU42+pGd9 Gg== Received: from ppma03dal.us.ibm.com (b.bd.3ea9.ip4.static.sl-reverse.com [169.62.189.11]) by mx0a-001b2d01.pphosted.com with ESMTP id 396vwctt0d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Jun 2021 10:41:23 -0400 Received: from pps.filterd (ppma03dal.us.ibm.com [127.0.0.1]) by ppma03dal.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 15FENcMD010208; Tue, 15 Jun 2021 14:41:22 GMT Received: from b03cxnp07027.gho.boulder.ibm.com (b03cxnp07027.gho.boulder.ibm.com [9.17.130.14]) by ppma03dal.us.ibm.com with ESMTP id 394mj9pq6p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Jun 2021 14:41:22 +0000 Received: from b03ledav005.gho.boulder.ibm.com (b03ledav005.gho.boulder.ibm.com [9.17.130.236]) by b03cxnp07027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 15FEfKke26476928 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Jun 2021 14:41:20 GMT Received: from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AA0D2BE04F; Tue, 15 Jun 2021 14:41:20 +0000 (GMT) Received: from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 67D60BE056; Tue, 15 Jun 2021 14:41:20 +0000 (GMT) Received: from localhost.localdomain (unknown [9.47.158.152]) by b03ledav005.gho.boulder.ibm.com (Postfix) with ESMTP; Tue, 15 Jun 2021 14:41:20 +0000 (GMT) From: Stefan Berger To: slof@lists.ozlabs.org Date: Tue, 15 Jun 2021 10:41:12 -0400 Message-Id: <20210615144115.2113484-2-stefanb@linux.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615144115.2113484-1-stefanb@linux.ibm.com> References: <20210615144115.2113484-1-stefanb@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: zsLR7a5EGU_ra-u_KPKsEbR25HcypGCZ X-Proofpoint-ORIG-GUID: zsLR7a5EGU_ra-u_KPKsEbR25HcypGCZ X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.761 definitions=2021-06-15_07:2021-06-14, 2021-06-15 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 priorityscore=1501 bulkscore=0 phishscore=0 impostorscore=0 lowpriorityscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 adultscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106150092 Subject: [SLOF] [PATCH 1/4] tcgbios: Change format of S_CRTM_VERSION string to ucs-2 X-BeenThere: slof@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Patches for https://github.com/aik/SLOF" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Berger Errors-To: slof-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "SLOF" Change the format of the S_CRTM_VERSION string to ucs-2 since this is what seems to be commonly used by other firmwares following insight from a TCG work group member. Signed-off-by: Stefan Berger --- lib/libtpm/tcgbios.c | 45 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/lib/libtpm/tcgbios.c b/lib/libtpm/tcgbios.c index d3deccb..6ba4873 100644 --- a/lib/libtpm/tcgbios.c +++ b/lib/libtpm/tcgbios.c @@ -1091,6 +1091,29 @@ uint32_t tpm_measure_gpt(void) (const uint8_t *)uefi_gpt_data, sz); } +/* convert a normal string of given length into a ucs-2 string */ +static char *string2ucs2(const char *str, size_t str_length, + size_t *ucs2_length) +{ + char *ucs2; + size_t i; + + if (str_length > 0) { + *ucs2_length = str_length * 2; + if (str[str_length - 1] != 0) + *ucs2_length += 2; + } else { + *ucs2_length = 2; + } + ucs2 = SLOF_alloc_mem(*ucs2_length); + if (ucs2) { + memset(ucs2, 0, *ucs2_length); + for (i = 0; i < str_length; i++) + ucs2[i * 2] = str[i]; + } + return ucs2; +} + uint32_t tpm_measure_scrtm(void) { uint32_t rc; @@ -1100,19 +1123,25 @@ uint32_t tpm_measure_scrtm(void) char *slof_text_start = (char *)&_slof_text; uint32_t slof_text_length = (long)&_slof_text_end - (long)&_slof_text; const char *scrtm = "S-CRTM Contents"; + char *ucs2_version; + size_t ucs2_length; version_end = strchr(version_start, '\r'); version_length = version_end - version_start; - dprintf("Measure S-CRTM Version: addr = %p, length = %d\n", - version_start, version_length); + ucs2_version = string2ucs2(version_start, version_length, &ucs2_length); + if (ucs2_version) { + dprintf("Measure S-CRTM Version: addr = %p, length = %d\n", + ucs2_version, ucs2_length); - rc = tpm_add_measurement_to_log(0, EV_S_CRTM_VERSION, - version_start, version_length, - (uint8_t *)version_start, - version_length); - if (rc) - return rc; + rc = tpm_add_measurement_to_log(0, EV_S_CRTM_VERSION, + ucs2_version, ucs2_length, + (uint8_t *)ucs2_version, + ucs2_length); + SLOF_free_mem(ucs2_version, ucs2_length); + if (rc) + return rc; + } dprintf("Measure S-CRTM Content (text): start = %p, length = %d\n", slof_text_start, slof_text_length); From patchwork Tue Jun 15 14:41:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 1492277 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=slof-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=bVJBFkc5; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G49xb3nkNz9sW6 for ; Wed, 16 Jun 2021 00:41:39 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4G49xc0tpFz3bsq for ; Wed, 16 Jun 2021 00:41:40 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=bVJBFkc5; dkim-atps=neutral X-Original-To: slof@lists.ozlabs.org Delivered-To: slof@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=stefanb@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=bVJBFkc5; dkim-atps=neutral Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4G49xN54YBz2yXW for ; Wed, 16 Jun 2021 00:41:27 +1000 (AEST) Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 15FEXtdH145784; Tue, 15 Jun 2021 10:41:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : mime-version; s=pp1; bh=fVi7kRbEn2xDBu3MroA2JftFnELqe7O2z8SrU2epnrQ=; b=bVJBFkc5ps3E9WfNDhjJHXaEOrRWXudw93dPXq1l6dE7m1Yc08c6seWVzr0hy2bn0Atr m3hBNJ7YPR9AP8V4YBroGFhN83f2K9AHOwJBRwjCVDO6ltAMATXv8lBDCATOQM32mW+J YZEir579v+G1flkvDHMl7Tw4Ln1Wozv0SBUhpsruwpNuI2e+yRTaU53+PFmHpjBbD9aR +CXdVy1KfznOxgqxvlBf5F8W9t58NAJ4Npr4x6waXgBayyxY6jYO9ZUPvrKugmocjsNe 30nyRHjPrnfo3ji6qPSH12RIRY4T/7LyFyPHYiCgWK/O7V4IUdxMYCUIu9tiulMk0h1H Aw== Received: from ppma04dal.us.ibm.com (7a.29.35a9.ip4.static.sl-reverse.com [169.53.41.122]) by mx0b-001b2d01.pphosted.com with ESMTP id 396u4tq1e0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Jun 2021 10:41:24 -0400 Received: from pps.filterd (ppma04dal.us.ibm.com [127.0.0.1]) by ppma04dal.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 15FEMD73023984; Tue, 15 Jun 2021 14:41:22 GMT Received: from b03cxnp07029.gho.boulder.ibm.com (b03cxnp07029.gho.boulder.ibm.com [9.17.130.16]) by ppma04dal.us.ibm.com with ESMTP id 3965ytm2g2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Jun 2021 14:41:22 +0000 Received: from b03ledav005.gho.boulder.ibm.com (b03ledav005.gho.boulder.ibm.com [9.17.130.236]) by b03cxnp07029.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 15FEfLGf32637414 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Jun 2021 14:41:21 GMT Received: from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 10C77BE04F; Tue, 15 Jun 2021 14:41:21 +0000 (GMT) Received: from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C0B33BE054; Tue, 15 Jun 2021 14:41:20 +0000 (GMT) Received: from localhost.localdomain (unknown [9.47.158.152]) by b03ledav005.gho.boulder.ibm.com (Postfix) with ESMTP; Tue, 15 Jun 2021 14:41:20 +0000 (GMT) From: Stefan Berger To: slof@lists.ozlabs.org Date: Tue, 15 Jun 2021 10:41:13 -0400 Message-Id: <20210615144115.2113484-3-stefanb@linux.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615144115.2113484-1-stefanb@linux.ibm.com> References: <20210615144115.2113484-1-stefanb@linux.ibm.com> X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: Q_BzlwHFcrQ9Ls4RMTNlf6rsFMlrQB33 X-Proofpoint-GUID: Q_BzlwHFcrQ9Ls4RMTNlf6rsFMlrQB33 X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.761 definitions=2021-06-15_07:2021-06-14, 2021-06-15 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 adultscore=0 bulkscore=0 spamscore=0 lowpriorityscore=0 phishscore=0 suspectscore=0 mlxlogscore=999 impostorscore=0 mlxscore=0 priorityscore=1501 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106150092 Subject: [SLOF] [PATCH 2/4] tcgbios: Add implementations for sha1, sha384, and sha512 X-BeenThere: slof@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Patches for https://github.com/aik/SLOF" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Berger Errors-To: slof-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "SLOF" Signed-off-by: Stefan Berger --- lib/libtpm/Makefile | 2 +- lib/libtpm/sha.c | 199 +++++++++++++++++++++++++++ lib/libtpm/{sha256.h => sha.h} | 9 +- lib/libtpm/sha256.c | 4 +- lib/libtpm/sha512.c | 243 +++++++++++++++++++++++++++++++++ lib/libtpm/tcgbios.c | 2 +- 6 files changed, 452 insertions(+), 7 deletions(-) create mode 100644 lib/libtpm/sha.c rename lib/libtpm/{sha256.h => sha.h} (70%) create mode 100644 lib/libtpm/sha512.c diff --git a/lib/libtpm/Makefile b/lib/libtpm/Makefile index bcfe88d..9d32dfc 100644 --- a/lib/libtpm/Makefile +++ b/lib/libtpm/Makefile @@ -23,7 +23,7 @@ TARGET = ../libtpm.a all: $(TARGET) -SRCS = tpm_drivers.c sha256.c tcgbios.c +SRCS = tpm_drivers.c sha.c sha256.c sha512.c tcgbios.c OBJS = $(SRCS:%.c=%.o) diff --git a/lib/libtpm/sha.c b/lib/libtpm/sha.c new file mode 100644 index 0000000..98ab300 --- /dev/null +++ b/lib/libtpm/sha.c @@ -0,0 +1,199 @@ +/***************************************************************************** + * Copyright (c) 2015-2021 IBM Corporation + * All rights reserved. + * This program and the accompanying materials + * are made available under the terms of the BSD License + * which accompanies this distribution, and is available at + * http://www.opensource.org/licenses/bsd-license.php + * + * Contributors: + * IBM Corporation - initial implementation + *****************************************************************************/ + +/* + * See: NIST standard for SHA-1 in FIPS PUB 180-4 + */ + +#include "byteorder.h" +#include "sha.h" +#include "string.h" + +typedef struct _sha1_ctx { + uint32_t h[5]; +} sha1_ctx; + +static uint32_t rol(uint32_t data, uint8_t n) +{ + return (data << n) | (data >> (32 - n)); +} + +static void sha1_block(uint32_t *w, sha1_ctx *ctx) +{ + uint32_t i; + uint32_t a,b,c,d,e,f; + uint32_t tmp; + uint32_t idx; + + /* + * FIPS 180-4 4.2.1: SHA1 Constants + */ + static const uint32_t sha_ko[4] = { + 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6 + }; + + /* + * FIPS 180-4 6.1.2: step 1 + * + * 0 <= i <= 15: + * W(t) = M(t) + * 16 <= i <= 79: + * W(t) = ROTL(W(t-3) XOR W(t-8) XOR W(t-14) XOR W(t-16), 1) + */ + + /* w(0)..w(15) are in big endian format */ + for (i = 0; i <= 15; i++) + w[i] = be32_to_cpu(w[i]); + + for (i = 16; i <= 79; i++) { + tmp = w[i-3] ^ w[i-8] ^ w[i-14] ^ w[i-16]; + w[i] = rol(tmp, 1); + } + + /* + * step 2: a = H0, b = H1, c = H2, d = H3, e = H4. + */ + a = ctx->h[0]; + b = ctx->h[1]; + c = ctx->h[2]; + d = ctx->h[3]; + e = ctx->h[4]; + + /* + * step 3: For i = 0 to 79: + * T = ROTL(a, 5) + f(i; b,c,d) + e + W(t) + K(t); + */ + for (i = 0; i <= 79; i++) { + /* + * FIPS 180-4: 4.1.1 : definition of f(i; b,c,d) + */ + if (i <= 19) { + /* + * 0 <= i <= 19: + * f(i; b,c,d) = (b AND c) OR ((NOT b) AND d) + */ + f = (b & c) | ((b ^ 0xffffffff) & d); + idx = 0; + } else if (i <= 39) { + /* + * 20 <= i <= 39: + * f(i; b,c,d) = b XOR c XOR d + */ + f = b ^ c ^ d; + idx = 1; + } else if (i <= 59) { + /* + * 40 <= i <= 59: + * f(i; b,c,d) = (b AND c) OR (b AND d) OR (c AND d) + */ + f = (b & c) | (b & d) | (c & d); + idx = 2; + } else { + /* + * 60 <= i <= 79: + * f(i; b,c,d) = b XOR c XOR d + */ + f = b ^ c ^ d; + idx = 3; + } + + /* + * step 3: + * t = ROTL(a, 5) + f(t;b,c,d) + e + K(t) + W(t); + * e = d; d = c; c = ROTL(b, 30); b = a; a = t; + */ + tmp = rol(a, 5) + + f + + e + + sha_ko[idx] + + w[i]; + e = d; + d = c; + c = rol(b, 30); + b = a; + a = tmp; + } + + /* + * step 4: + * H0 = a + H0, H1 = b + H1, H2 = c + H2, H3 = d + H3, H4 = e + H4 + */ + ctx->h[0] += a; + ctx->h[1] += b; + ctx->h[2] += c; + ctx->h[3] += d; + ctx->h[4] += e; +} + +static void sha1_do(sha1_ctx *ctx, const uint8_t *data32, uint32_t length) +{ + uint32_t offset = 0; + uint16_t num; + uint64_t bits = 0; + uint32_t w[80]; + uint64_t tmp; + + /* treat data in 64-byte chunks */ + for (offset = 0; length - offset >= 64; offset += 64) { + memcpy(w, data32 + offset, 64); + sha1_block((uint32_t *)w, ctx); + bits += (64 * 8); + } + + /* last block with less than 64 bytes */ + num = length - offset; + bits += (num << 3); + + memcpy(w, data32 + offset, num); + /* + * FIPS 180-4 5.1: Padding the Message + */ + ((uint8_t *)w)[num] = 0x80; + if (64 - (num + 1) > 0) + memset( &((uint8_t *)w)[num + 1], 0, 64 - (num + 1)); + + if (num >= 56) { + /* cannot append number of bits here */ + sha1_block((uint32_t *)w, ctx); + memset(w, 0, 60); + } + + /* write number of bits to end of block */ + tmp = cpu_to_be64(bits); + memcpy(&w[14], &tmp, 8); + + sha1_block(w, ctx); + + /* need to switch result's endianness */ + for (num = 0; num < 5; num++) + ctx->h[num] = cpu_to_be32(ctx->h[num]); +} + +void sha1(const uint8_t *data, uint32_t length, uint8_t *hash) +{ + sha1_ctx ctx = { + .h = { + /* + * FIPS 180-4: 6.1.1 + * -> 5.3.1: initial hash value + */ + 0x67452301, + 0xefcdab89, + 0x98badcfe, + 0x10325476, + 0xc3d2e1f0, + } + }; + + sha1_do(&ctx, data, length); + memcpy(hash, &ctx.h[0], 20); +} diff --git a/lib/libtpm/sha256.h b/lib/libtpm/sha.h similarity index 70% rename from lib/libtpm/sha256.h rename to lib/libtpm/sha.h index 04b774b..0bb031e 100644 --- a/lib/libtpm/sha256.h +++ b/lib/libtpm/sha.h @@ -10,11 +10,14 @@ * IBM Corporation - initial implementation *****************************************************************************/ -#ifndef __SHA256_H -#define __SHA256_H +#ifndef __SHA_H +#define __SHA_H #include "types.h" +void sha1(const uint8_t *data, uint32_t length, uint8_t *hash); void sha256(const uint8_t *data, uint32_t length, uint8_t *hash); +void sha384(const uint8_t *data, uint32_t length, uint8_t *hash); +void sha512(const uint8_t *data, uint32_t length, uint8_t *hash); -#endif /* __SHA256_H */ +#endif /* __SHA_H */ diff --git a/lib/libtpm/sha256.c b/lib/libtpm/sha256.c index fb67e19..c6b8767 100644 --- a/lib/libtpm/sha256.c +++ b/lib/libtpm/sha256.c @@ -15,7 +15,7 @@ */ #include "byteorder.h" -#include "sha256.h" +#include "sha.h" #include "string.h" typedef struct _sha256_ctx { @@ -90,7 +90,7 @@ static void sha256_block(uint32_t *w, sha256_ctx *ctx) * * 0 <= i <= 15: * W(t) = M(t) - * 16 <= i <= 79: + * 16 <= i <= 63: * W(t) = sigma1(W(t-2)) + W(t-7) + sigma0(W(t-15)) + W(t-16) */ diff --git a/lib/libtpm/sha512.c b/lib/libtpm/sha512.c new file mode 100644 index 0000000..a59f659 --- /dev/null +++ b/lib/libtpm/sha512.c @@ -0,0 +1,243 @@ +/***************************************************************************** + * Copyright (c) 2021 IBM Corporation + * All rights reserved. + * This program and the accompanying materials + * are made available under the terms of the BSD License + * which accompanies this distribution, and is available at + * http://www.opensource.org/licenses/bsd-license.php + * + * Contributors: + * IBM Corporation - initial implementation + *****************************************************************************/ + +/* + * See: NIST standard for SHA-512 and SHA-384 in FIPS PUB 180-4 & RFC 6234 + */ + +#include "byteorder.h" +#include "sha.h" +#include "string.h" + +typedef struct _sha512_ctx { + uint64_t h[8]; +} sha512_ctx; + +static inline uint64_t rotr(uint64_t x, uint8_t n) +{ + return (x >> n) | (x << (64 - n)); +} + +static inline uint64_t Ch(uint64_t x, uint64_t y, uint64_t z) +{ + return (x & y) ^ ((x ^ 0xffffffffffffffffULL) & z); +} + +static inline uint64_t Maj(uint64_t x, uint64_t y, uint64_t z) +{ + return (x & y) ^ (x & z) ^ (y & z); +} + +static inline uint64_t sum0(uint64_t x) +{ + return rotr(x, 28) ^ rotr(x, 34) ^ rotr(x, 39); +} + +static inline uint64_t sum1(uint64_t x) +{ + return rotr(x, 14) ^ rotr(x, 18) ^ rotr(x, 41); +} + +static inline uint64_t sigma0(uint64_t x) +{ + return rotr(x, 1) ^ rotr(x, 8) ^ (x >> 7); +} + +static inline uint64_t sigma1(uint64_t x) +{ + return rotr(x, 19) ^ rotr(x, 61) ^ (x >> 6); +} + +static void sha512_block(uint64_t *w, sha512_ctx *ctx) +{ + uint32_t t; + uint64_t a, b, c, d, e, f, g, h; + uint64_t T1, T2; + + /* + * FIPS 180-4 4.2.2: SHA512 Constants + */ + static const uint64_t sha_ko[80] = { + 0x428a2f98d728ae22, 0x7137449123ef65cd, 0xb5c0fbcfec4d3b2f, 0xe9b5dba58189dbbc, + 0x3956c25bf348b538, 0x59f111f1b605d019, 0x923f82a4af194f9b, 0xab1c5ed5da6d8118, + 0xd807aa98a3030242, 0x12835b0145706fbe, 0x243185be4ee4b28c, 0x550c7dc3d5ffb4e2, + 0x72be5d74f27b896f, 0x80deb1fe3b1696b1, 0x9bdc06a725c71235, 0xc19bf174cf692694, + 0xe49b69c19ef14ad2, 0xefbe4786384f25e3, 0x0fc19dc68b8cd5b5, 0x240ca1cc77ac9c65, + 0x2de92c6f592b0275, 0x4a7484aa6ea6e483, 0x5cb0a9dcbd41fbd4, 0x76f988da831153b5, + 0x983e5152ee66dfab, 0xa831c66d2db43210, 0xb00327c898fb213f, 0xbf597fc7beef0ee4, + 0xc6e00bf33da88fc2, 0xd5a79147930aa725, 0x06ca6351e003826f, 0x142929670a0e6e70, + 0x27b70a8546d22ffc, 0x2e1b21385c26c926, 0x4d2c6dfc5ac42aed, 0x53380d139d95b3df, + 0x650a73548baf63de, 0x766a0abb3c77b2a8, 0x81c2c92e47edaee6, 0x92722c851482353b, + 0xa2bfe8a14cf10364, 0xa81a664bbc423001, 0xc24b8b70d0f89791, 0xc76c51a30654be30, + 0xd192e819d6ef5218, 0xd69906245565a910, 0xf40e35855771202a, 0x106aa07032bbd1b8, + 0x19a4c116b8d2d0c8, 0x1e376c085141ab53, 0x2748774cdf8eeb99, 0x34b0bcb5e19b48a8, + 0x391c0cb3c5c95a63, 0x4ed8aa4ae3418acb, 0x5b9cca4f7763e373, 0x682e6ff3d6b2b8a3, + 0x748f82ee5defb2fc, 0x78a5636f43172f60, 0x84c87814a1f0ab72, 0x8cc702081a6439ec, + 0x90befffa23631e28, 0xa4506cebde82bde9, 0xbef9a3f7b2c67915, 0xc67178f2e372532b, + 0xca273eceea26619c, 0xd186b8c721c0c207, 0xeada7dd6cde0eb1e, 0xf57d4f7fee6ed178, + 0x06f067aa72176fba, 0x0a637dc5a2c898a6, 0x113f9804bef90dae, 0x1b710b35131c471b, + 0x28db77f523047d84, 0x32caab7b40c72493, 0x3c9ebe0a15c9bebc, 0x431d67c49c100d4c, + 0x4cc5d4becb3e42b6, 0x597f299cfc657e2a, 0x5fcb6fab3ad6faec, 0x6c44198c4a475817 + }; + + /* + * FIPS 180-4 6.4.2: step 1 + * + * 0 <= i <= 15: + * W(t) = M(t) + * 16 <= i <= 79: + * W(t) = sigma1(W(t-2)) + W(t-7) + sigma0(W(t-15)) + W(t-16) + */ + + /* w(0)..w(15) are in big endian format */ + for (t = 0; t <= 15; t++) + w[t] = be64_to_cpu(w[t]); + + for (t = 16; t <= 79; t++) + w[t] = sigma1(w[t-2]) + w[t-7] + sigma0(w[t-15]) + w[t-16]; + + /* + * step 2: a = H0, b = H1, c = H2, d = H3, e = H4, f = H5, g = H6, h = H7 + */ + a = ctx->h[0]; + b = ctx->h[1]; + c = ctx->h[2]; + d = ctx->h[3]; + e = ctx->h[4]; + f = ctx->h[5]; + g = ctx->h[6]; + h = ctx->h[7]; + + /* + * step 3: For i = 0 to 79: + * T1 = h + sum1(e) + Ch(e,f,g) + K(t) + W(t); + * T2 = sum0(a) + Maj(a,b,c) + * h = g; g = f; f = e; e = d + T1; d = c; c = b; b = a; a + T1 + T2 + */ + for (t = 0; t <= 79; t++) { + T1 = h + sum1(e) + Ch(e, f, g) + sha_ko[t] + w[t]; + T2 = sum0(a) + Maj(a, b, c); + h = g; + g = f; + f = e; + e = d + T1; + d = c; + c = b; + b = a; + a = T1 + T2; + } + + /* + * step 4: + * H0 = a + H0, H1 = b + H1, H2 = c + H2, H3 = d + H3, H4 = e + H4 + */ + ctx->h[0] += a; + ctx->h[1] += b; + ctx->h[2] += c; + ctx->h[3] += d; + ctx->h[4] += e; + ctx->h[5] += f; + ctx->h[6] += g; + ctx->h[7] += h; +} + +static void sha512_do(sha512_ctx *ctx, const uint8_t *data32, uint32_t length) +{ + uint32_t offset; + uint16_t num; + uint64_t bits = 0; + uint64_t w[80]; + uint64_t tmp; + + /* treat data in 128-byte/1024 bit chunks */ + for (offset = 0; length - offset >= 128; offset += 128) { + memcpy(w, data32 + offset, 128); + sha512_block(w, ctx); + bits += (128 * 8); + } + + /* last block with less than 128 bytes */ + num = length - offset; + bits += (num << 3); + + memcpy(w, data32 + offset, num); + /* + * FIPS 180-4 5.1: Padding the Message + */ + ((uint8_t *)w)[num] = 0x80; + if (128 - (num + 1) > 0) + memset( &((uint8_t *)w)[num + 1], 0, 128 - (num + 1)); + + if (num >= 112) { + /* cannot append number of bits here; + * need space for 128 bits (16 bytes) + */ + sha512_block((uint64_t *)w, ctx); + memset(w, 0, 128); + } + + /* write number of bits to end of the block; we write 64 bits */ + tmp = cpu_to_be64(bits); + memcpy(&w[15], &tmp, 8); + + sha512_block(w, ctx); + + /* need to switch result's endianness */ + for (num = 0; num < 8; num++) + ctx->h[num] = cpu_to_be64(ctx->h[num]); +} + +void sha384(const uint8_t *data, uint32_t length, uint8_t *hash) +{ + sha512_ctx ctx = { + .h = { + /* + * FIPS 180-4: 6.2.1 + * -> 5.3.4: initial hash value + */ + 0xcbbb9d5dc1059ed8, + 0x629a292a367cd507, + 0x9159015a3070dd17, + 0x152fecd8f70e5939, + 0x67332667ffc00b31, + 0x8eb44a8768581511, + 0xdb0c2e0d64f98fa7, + 0x47b5481dbefa4fa4 + } + }; + + sha512_do(&ctx, data, length); + memcpy(hash, ctx.h, 384/8); +} + +void sha512(const uint8_t *data, uint32_t length, uint8_t *hash) +{ + sha512_ctx ctx = { + .h = { + /* + * FIPS 180-4: 6.2.1 + * -> 5.3.5: initial hash value + */ + 0x6a09e667f3bcc908, + 0xbb67ae8584caa73b, + 0x3c6ef372fe94f82b, + 0xa54ff53a5f1d36f1, + 0x510e527fade682d1, + 0x9b05688c2b3e6c1f, + 0x1f83d9abfb41bd6b, + 0x5be0cd19137e2179 + } + }; + + sha512_do(&ctx, data, length); + memcpy(hash, ctx.h, sizeof(ctx.h)); +} diff --git a/lib/libtpm/tcgbios.c b/lib/libtpm/tcgbios.c index 6ba4873..91f2f46 100644 --- a/lib/libtpm/tcgbios.c +++ b/lib/libtpm/tcgbios.c @@ -29,7 +29,7 @@ #include "tcgbios.h" #include "tcgbios_int.h" #include "stdio.h" -#include "sha256.h" +#include "sha.h" #include "helpers.h" #include "version.h" #include "OF.h" From patchwork Tue Jun 15 14:41:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 1492278 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=slof-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=fE65gRp+; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G49xc5k45z9sW6 for ; Wed, 16 Jun 2021 00:41:40 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4G49xd2gRnz3bsK for ; Wed, 16 Jun 2021 00:41:41 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=fE65gRp+; dkim-atps=neutral X-Original-To: slof@lists.ozlabs.org Delivered-To: slof@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=stefanb@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=fE65gRp+; dkim-atps=neutral Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4G49xN63whz2yXJ for ; Wed, 16 Jun 2021 00:41:27 +1000 (AEST) Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 15FEXS6L149508; Tue, 15 Jun 2021 10:41:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=TsmogyX7bZHRbiEcRg+z7Atrr9z6S0B7HmxOOwRv4bg=; b=fE65gRp+Tj21ZAbIWqOzyQyue19Ak8Fkw395Q+cvXddl2aUFPL7yFFZxkOoRg7o4Azgq wzTDKAbT832U1DagSj5W2fRNKhI/xivEsUPeR3FG6vbvy6mDUwC45cOIWCk++jHR6MUT Fhrm+JVW26kujYxQ2G20i9GnytK5EA9818KEYZ+ePugUAWCoO+tKV0GrHSR20OFVBq2J bifUc1D1pE1dw6dxqGuABoP7w4HtWYpBhhX18l9DNDDVhVZ0X/hkGiGS8zPMITnF30em +oX6yK2nvy/hjPgGtsWr9vI4+cnZOveEU0q+Vn0A5shS+xTmcyQ1OYOHx9k49WRbBE6E pA== Received: from ppma01wdc.us.ibm.com (fd.55.37a9.ip4.static.sl-reverse.com [169.55.85.253]) by mx0b-001b2d01.pphosted.com with ESMTP id 396wvt0nwa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Jun 2021 10:41:23 -0400 Received: from pps.filterd (ppma01wdc.us.ibm.com [127.0.0.1]) by ppma01wdc.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 15FENR08024779; Tue, 15 Jun 2021 14:41:22 GMT Received: from b03cxnp07029.gho.boulder.ibm.com (b03cxnp07029.gho.boulder.ibm.com [9.17.130.16]) by ppma01wdc.us.ibm.com with ESMTP id 394mj98nkc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Jun 2021 14:41:22 +0000 Received: from b03ledav005.gho.boulder.ibm.com (b03ledav005.gho.boulder.ibm.com [9.17.130.236]) by b03cxnp07029.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 15FEfL2k19857772 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Jun 2021 14:41:21 GMT Received: from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 678D8BE053; Tue, 15 Jun 2021 14:41:21 +0000 (GMT) Received: from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 26A3ABE054; Tue, 15 Jun 2021 14:41:21 +0000 (GMT) Received: from localhost.localdomain (unknown [9.47.158.152]) by b03ledav005.gho.boulder.ibm.com (Postfix) with ESMTP; Tue, 15 Jun 2021 14:41:21 +0000 (GMT) From: Stefan Berger To: slof@lists.ozlabs.org Date: Tue, 15 Jun 2021 10:41:14 -0400 Message-Id: <20210615144115.2113484-4-stefanb@linux.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615144115.2113484-1-stefanb@linux.ibm.com> References: <20210615144115.2113484-1-stefanb@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: fVVLVBZAemdUkcqSv8Medf1jVymjvQ5x X-Proofpoint-ORIG-GUID: fVVLVBZAemdUkcqSv8Medf1jVymjvQ5x X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.761 definitions=2021-06-15_07:2021-06-14, 2021-06-15 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 malwarescore=0 spamscore=0 bulkscore=0 impostorscore=0 phishscore=0 mlxlogscore=896 adultscore=0 suspectscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106150092 Subject: [SLOF] [PATCH 3/4] tcgbios: Use The proper sha function for each PCR bank X-BeenThere: slof@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Patches for https://github.com/aik/SLOF" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Berger Errors-To: slof-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "SLOF" Instead of just using sha256 for all PCR banks (and truncating the value or zero-padding it) use the proper hash function for each one of the banks. For unimplemented hashes, fill the buffer with 0xff. Signed-off-by: Stefan Berger --- lib/libtpm/tcgbios.c | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/lib/libtpm/tcgbios.c b/lib/libtpm/tcgbios.c index 91f2f46..af96c52 100644 --- a/lib/libtpm/tcgbios.c +++ b/lib/libtpm/tcgbios.c @@ -127,28 +127,32 @@ static const struct hash_parameters { uint8_t hashalg_flag; uint8_t hash_buffersize; const char *name; + void (*hashfunc)(const uint8_t *data, uint32_t length, uint8_t *hash); } hash_parameters[] = { { .hashalg = TPM2_ALG_SHA1, .hashalg_flag = TPM2_ALG_SHA1_FLAG, .hash_buffersize = SHA1_BUFSIZE, .name = "SHA1", + .hashfunc = sha1, }, { .hashalg = TPM2_ALG_SHA256, .hashalg_flag = TPM2_ALG_SHA256_FLAG, .hash_buffersize = SHA256_BUFSIZE, .name = "SHA256", + .hashfunc = sha256, }, { .hashalg = TPM2_ALG_SHA384, .hashalg_flag = TPM2_ALG_SHA384_FLAG, .hash_buffersize = SHA384_BUFSIZE, .name = "SHA384", - + .hashfunc = sha384, }, { .hashalg = TPM2_ALG_SHA512, .hashalg_flag = TPM2_ALG_SHA512_FLAG, .hash_buffersize = SHA512_BUFSIZE, .name = "SHA512", + .hashfunc = sha512, }, { .hashalg = TPM2_ALG_SM3_256, .hashalg_flag = TPM2_ALG_SM3_256_FLAG, @@ -233,6 +237,25 @@ static const char * tpm20_hashalg_flag_to_name(uint8_t hashalg_flag) return NULL; } +static void tpm2_hash_data(uint16_t hashAlg, + const uint8_t *data, uint32_t data_len, + uint8_t *hash) +{ + unsigned i; + + for (i = 0; i < ARRAY_SIZE(hash_parameters); i++) { + if (hash_parameters[i].hashalg == hashAlg) { + if (hash_parameters[i].hashfunc) { + hash_parameters[i].hashfunc(data, data_len, + hash); + } else { + memset(hash, 0xff, + hash_parameters[i].hash_buffersize); + } + } + } +} + /* * Build the TPM2 TPML_DIGEST_VALUES data structure from the given hash. * Follow the PCR bank configuration of the TPM and write the same hash @@ -242,13 +265,15 @@ static const char * tpm20_hashalg_flag_to_name(uint8_t hashalg_flag) * hash when writing it in the area of the sha1 hash. * * le: the log entry to build the digest in - * sha1: the sha1 hash value to use + * hashdata: the data to hash + * hashdata_len: the length of the hashdata * bigEndian: whether to build in big endian format for the TPM or log * little endian for the log (TPM 2.0) * * Returns the digest size; -1 on fatal error */ -static int tpm20_build_digest(struct tpm_log_entry *le, const uint8_t *sha256, +static int tpm20_build_digest(struct tpm_log_entry *le, + const uint8_t *hashdata, uint32_t hashdata_len, bool bigEndian) { struct tpms_pcr_selection *sel; @@ -297,9 +322,8 @@ static int tpm20_build_digest(struct tpm_log_entry *le, const uint8_t *sha256, else v->hashAlg = cpu_to_le16(be16_to_cpu(sel->hashAlg)); - memset(v->hash, 0, hsize); - memcpy(v->hash, sha256, - hsize < SHA256_BUFSIZE ? hsize : SHA256_BUFSIZE); + tpm2_hash_data(be16_to_cpu(sel->hashAlg), hashdata, hashdata_len, + v->hash); dest += sizeof(*v) + hsize; sel = nsel; @@ -865,7 +889,6 @@ static uint32_t tpm_add_measurement_to_log(uint32_t pcrindex, const uint8_t *hashdata, uint32_t hashdatalen) { - uint8_t hash[SHA256_BUFSIZE]; struct tpm_log_entry le = { .hdr.pcrindex = cpu_to_log32(pcrindex), .hdr.eventtype = cpu_to_log32(eventtype), @@ -873,8 +896,7 @@ static uint32_t tpm_add_measurement_to_log(uint32_t pcrindex, int digest_len; int ret; - sha256(hashdata, hashdatalen, hash); - digest_len = tpm20_build_digest(&le, hash, true); + digest_len = tpm20_build_digest(&le, hashdata, hashdatalen, true); if (digest_len < 0) return TCGBIOS_GENERAL_ERROR; ret = tpm20_extend(&le, digest_len); @@ -882,7 +904,7 @@ static uint32_t tpm_add_measurement_to_log(uint32_t pcrindex, tpm_set_failure(); return TCGBIOS_COMMAND_ERROR; } - tpm20_build_digest(&le, hash, false); + tpm20_build_digest(&le, hashdata, hashdatalen, false); return tpm_log_event_long(&le.hdr, digest_len, info, infolen); } From patchwork Tue Jun 15 14:41:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 1492274 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=slof-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=a4ql1er3; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G49xT6tGBz9sT6 for ; Wed, 16 Jun 2021 00:41:33 +1000 (AEST) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4G49xV31KGz3bs2 for ; Wed, 16 Jun 2021 00:41:34 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=a4ql1er3; dkim-atps=neutral X-Original-To: slof@lists.ozlabs.org Delivered-To: slof@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=stefanb@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=a4ql1er3; dkim-atps=neutral Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4G49xM6W8mz2yXJ for ; Wed, 16 Jun 2021 00:41:27 +1000 (AEST) Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 15FEX6Lk034710; Tue, 15 Jun 2021 10:41:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=3DUXaIIQZILUZZTeG0LZcTCKe02CyjfKNZF8F1upKKM=; b=a4ql1er3Eu0qgpHCKzJk3CZCwxb3tTwIRW5U/JMB0TcC5O2UV4/m20h5vE5UBmzOIFPG 9lkQBbsLpnCpwwWfShCkLAfiBwibiL/3z3XNreepwsLJB0NbTeA9yopmyMi5zU/npI5n 1Sdw0cL5OGwvopTX+zN0jLpt2egUH+yM6aoE892Zwg+01iz98tLpf/XjfsMeNnPUNKY3 /sNPh1nRsOTy2XYPLbHRtZ364JICB7ZtGc+fjPDZTJ2vugFxo6aqQZjlsnd9HpRzQsnQ hyTlBvIJosL4cJRm51O7QoNUrDY3v4QpHGakcaBjch1Xpcd4OcJ0FCOllFKc7z/jfzz/ 2g== Received: from ppma02dal.us.ibm.com (a.bd.3ea9.ip4.static.sl-reverse.com [169.62.189.10]) by mx0a-001b2d01.pphosted.com with ESMTP id 396wvq0qss-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Jun 2021 10:41:24 -0400 Received: from pps.filterd (ppma02dal.us.ibm.com [127.0.0.1]) by ppma02dal.us.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 15FEM4Um002626; Tue, 15 Jun 2021 14:41:23 GMT Received: from b03cxnp07029.gho.boulder.ibm.com (b03cxnp07029.gho.boulder.ibm.com [9.17.130.16]) by ppma02dal.us.ibm.com with ESMTP id 394mj9pnr5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Jun 2021 14:41:23 +0000 Received: from b03ledav005.gho.boulder.ibm.com (b03ledav005.gho.boulder.ibm.com [9.17.130.236]) by b03cxnp07029.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 15FEfLA815270210 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Jun 2021 14:41:21 GMT Received: from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BF062BE053; Tue, 15 Jun 2021 14:41:21 +0000 (GMT) Received: from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7D90FBE054; Tue, 15 Jun 2021 14:41:21 +0000 (GMT) Received: from localhost.localdomain (unknown [9.47.158.152]) by b03ledav005.gho.boulder.ibm.com (Postfix) with ESMTP; Tue, 15 Jun 2021 14:41:21 +0000 (GMT) From: Stefan Berger To: slof@lists.ozlabs.org Date: Tue, 15 Jun 2021 10:41:15 -0400 Message-Id: <20210615144115.2113484-5-stefanb@linux.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210615144115.2113484-1-stefanb@linux.ibm.com> References: <20210615144115.2113484-1-stefanb@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: lIUSXVmhSx-htDhN42xdNT4duX55APog X-Proofpoint-GUID: lIUSXVmhSx-htDhN42xdNT4duX55APog X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.761 definitions=2021-06-15_07:2021-06-14, 2021-06-15 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 priorityscore=1501 impostorscore=0 suspectscore=0 bulkscore=0 phishscore=0 spamscore=0 malwarescore=0 mlxscore=0 adultscore=0 lowpriorityscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106150092 Subject: [SLOF] [PATCH 4/4] Add testprograms X-BeenThere: slof@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Patches for https://github.com/aik/SLOF" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Berger Errors-To: slof-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "SLOF" --- lib/libtpm/sha.c | 42 ++++++++++++++++++++++++++++++ lib/libtpm/sha512.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/lib/libtpm/sha.c b/lib/libtpm/sha.c index 98ab300..d8330f4 100644 --- a/lib/libtpm/sha.c +++ b/lib/libtpm/sha.c @@ -197,3 +197,45 @@ void sha1(const uint8_t *data, uint32_t length, uint8_t *hash) sha1_do(&ctx, data, length); memcpy(hash, &ctx.h[0], 20); } + +#ifdef MAIN + +#include +// gcc -DMAIN sha.c -o sha-test -I ../../include -I ../../slof -I ../../lib/libc/include +int main(void) +{ + unsigned i, j; + uint8_t hash[20]; + char buffer[70]; + + sha1("abc", 3, hash); + for (i = 0; i < sizeof(hash); i++) { + printf("%02x", hash[i]); + } + printf("\n"); + + sha1("", 0, hash); + for (i = 0; i < sizeof(hash); i++) { + printf("%02x", hash[i]); + } + printf("\n"); + + sha1("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 448/8, hash); + for (i = 0; i < sizeof(hash); i++) { + printf("%02x", hash[i]); + } + printf("\n"); + + for (i = 54; i < sizeof(buffer); i++) { + memset(buffer, 0, sizeof(buffer)); + for (j = 0; j <= i; j++) + buffer[j] = 'a'; + printf("input %d: %s\n", i, buffer); + sha1(buffer, i, hash); + for (j = 0; j < sizeof(hash); j++) { + printf("%02x", hash[j]); + } + printf("\n"); + } +} +#endif diff --git a/lib/libtpm/sha512.c b/lib/libtpm/sha512.c index a59f659..addeacf 100644 --- a/lib/libtpm/sha512.c +++ b/lib/libtpm/sha512.c @@ -241,3 +241,65 @@ void sha512(const uint8_t *data, uint32_t length, uint8_t *hash) sha512_do(&ctx, data, length); memcpy(hash, ctx.h, sizeof(ctx.h)); } + + +#ifdef MAIN + +#include +// gcc -DMAIN sha512.c -o sha512-test -I ../../include -I ../../slof -I ../../lib/libc/include +int main(void) +{ + unsigned i, j; + uint8_t hash[64]; + char buffer[128]; + + sha512("abc", 3, hash); + for (i = 0; i < sizeof(hash); i++) { + printf("%02x", hash[i]); + } + printf("\n"); + + sha384("abc", 3, hash); + for (i = 0; i < 384/8; i++) { + printf("%02x", hash[i]); + } + printf("\n"); + + sha512("", 0, hash); + for (i = 0; i < sizeof(hash); i++) { + printf("%02x", hash[i]); + } + printf("\n"); + + sha384("", 0, hash); + for (i = 0; i < 384/8; i++) { + printf("%02x", hash[i]); + } + printf("\n"); + + sha512("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 448/8, hash); + for (i = 0; i < sizeof(hash); i++) { + printf("%02x", hash[i]); + } + printf("\n"); + + sha384("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 448/8, hash); + for (i = 0; i < 384/8; i++) { + printf("%02x", hash[i]); + } + printf("\n"); + + + for (i = 110; i < sizeof(buffer); i++) { + memset(buffer, 0, sizeof(buffer)); + for (j = 0; j <= i; j++) + buffer[j] = 'a'; + printf("input %d: %s\n", i, buffer); + sha512(buffer, i, hash); + for (j = 0; j < sizeof(hash); j++) { + printf("%02x", hash[j]); + } + printf("\n"); + } +} +#endif