Proxmox-Port/libtpms
1
0
Fork 0
mirror of https://github.com/stefanberger/libtpms synced 2026-08-09 16:31:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tpm2: rev155: Refactor hash templates; for now also keep old templates

Browse Source 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
This commit is contained in:
Stefan Berger 2019-06-12 10:05:34 -04:00 committed by Stefan Berger
parent 19574a4c42
commit 296cbb1699
3 changed files with 84 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/tpm2/crypto/CryptHash.h
View File

@ -223,19 +223,21 @@ typedef const struct
/* Macro to fill in the HASH_DEF for an algorithm. For SHA1, the instance would be:
HASH_DEF_TEMPLATE(Sha1, SHA1) This handles the difference in capitalization for the various
pieces. */
#define HASH_DEF_TEMPLATE(HASH) \
HASH_DEF HASH##_Def= { \
{(HASH_START_METHOD *)&tpmHashStart_##HASH, \
(HASH_DATA_METHOD *)&tpmHashData_##HASH, \
(HASH_END_METHOD *)&tpmHashEnd_##HASH, \
(HASH_STATE_COPY_METHOD *)&tpmHashStateCopy_##HASH, \
(HASH_STATE_EXPORT_METHOD *)&tpmHashStateExport_##HASH, \
(HASH_STATE_IMPORT_METHOD *)&tpmHashStateImport_##HASH, \
}, \
HASH##_BLOCK_SIZE, /*block size */ \
HASH##_DIGEST_SIZE, /*data size */ \
sizeof(tpmHashState##HASH##_t), \
TPM_ALG_##HASH}
#define HASH_DEF_TEMPLATE(HASH, Hash) \
HASH_DEF Hash##_Def= { \
{(HASH_START_METHOD *)&tpmHashStart_##HASH, \
(HASH_DATA_METHOD *)&tpmHashData_##HASH, \
(HASH_END_METHOD *)&tpmHashEnd_##HASH, \
(HASH_STATE_COPY_METHOD *)&tpmHashStateCopy_##HASH, \
(HASH_STATE_EXPORT_METHOD *)&tpmHashStateExport_##HASH, \
(HASH_STATE_IMPORT_METHOD *)&tpmHashStateImport_##HASH, \
}, \
HASH##_BLOCK_SIZE, /*block size */ \
HASH##_DIGEST_SIZE, /*data size */ \
sizeof(tpmHashState##HASH##_t), \
TPM_ALG_##HASH};
/* These definitions are for the types that can be in a hash state structure. These types are used
in the cryptographic utilities. This is a define rather than an enum so that the size of this
field can be explicit. */

112
src/tpm2/crypto/openssl/CryptHash.c
View File

@ -3,7 +3,7 @@
/* Implementation of cryptographic functions for hashing. */
/* Written by Ken Goldman */
/* IBM Thomas J. Watson Research Center */
/* $Id: CryptHash.c 1442 2019-03-19 17:25:28Z kgoldman $ */
/* $Id: CryptHash.c 1478 2019-06-10 21:15:14Z kgoldman $ */
/* */
/* Licenses and Notices */
/* */
@ -65,21 +65,44 @@
/* 10.2.13.2 Includes, Defines, and Types */
#define _CRYPT_HASH_C_
#include "Tpm.h"
#include "CryptHash_fp.h"
#include "CryptHash.h"
#define HASH_TABLE_SIZE (HASH_COUNT + 1)
extern const HASH_INFO g_hashData[HASH_COUNT + 1];
#if ALG_SHA1
HASH_DEF_TEMPLATE(SHA1, Sha1);
#endif
#if ALG_SHA256
HASH_DEF_TEMPLATE(SHA256, Sha256);
#endif
#if ALG_SHA384
HASH_DEF_TEMPLATE(SHA384, Sha384);
#endif
#if ALG_SHA512
HASH_DEF_TEMPLATE(SHA512, Sha512);
#endif
#if ALG_SM3_256
HASH_DEF_TEMPLATE(SM3_256, Sm3_256);
#endif
HASH_DEF NULL_Def = {{0}};
PHASH_DEF HashDefArray[] = {
#if ALG_SHA1
HASH_DEF_TEMPLATE(SHA1);
&Sha1_Def,
#endif
#if ALG_SHA256
HASH_DEF_TEMPLATE(SHA256);
&Sha256_Def,
#endif
#if ALG_SHA384
HASH_DEF_TEMPLATE(SHA384);
&Sha384_Def,
#endif
#if ALG_SHA512
HASH_DEF_TEMPLATE(SHA512);
&Sha512_Def,
#endif
HASH_DEF nullDef = {{0}};
#if ALG_SM3_256
&Sm3_256_Def,
#endif
&NULL_Def
};
/* 10.2.13.3 Obligatory Initialization Functions */
/* 10.2.13.3.1 CryptHashInit() */
/* This function is called by _TPM_Init() do perform the initialization operations for the
@ -100,7 +123,8 @@ CryptHashStartup(
void
)
{
return TRUE;
int i = sizeof(HashDefArray) / sizeof(PHASH_DEF) - 1;
return (i == HASH_COUNT);
}
/* 10.2.13.4 Hash Information Access Functions */
/* 10.2.13.4.1 Introduction */
@ -113,34 +137,15 @@ CryptGetHashDef(
TPM_ALG_ID hashAlg
)
{
PHASH_DEF retVal;
switch(hashAlg)
size_t i;
#define HASHES (sizeof(HashDefArray) / sizeof(PHASH_DEF))
for(i = 0; i < HASHES; i++)
{
#if ALG_SHA1
case ALG_SHA1_VALUE:
return &SHA1_Def;
break;
#endif
#if ALG_SHA256
case ALG_SHA256_VALUE:
retVal = &SHA256_Def;
break;
#endif
#if ALG_SHA384
case ALG_SHA384_VALUE:
retVal = &SHA384_Def;
break;
#endif
#if ALG_SHA512
case ALG_SHA512_VALUE:
retVal = &SHA512_Def;
break;
#endif
default:
retVal = &nullDef;
break;
PHASH_DEF p = HashDefArray[i];
if(p->hashAlg == hashAlg)
return p;
}
return retVal;
return &NULL_Def;
}
/* 10.2.13.4.3 CryptHashIsValidAlg() */
/* This function tests to see if an algorithm ID is a valid hash algorithm. If flag is true, then
@ -150,36 +155,14 @@ CryptGetHashDef(
/* FALSE(0) hashAlg is not valid for this TPM */
BOOL
CryptHashIsValidAlg(
TPM_ALG_ID hashAlg,
BOOL flag
TPM_ALG_ID hashAlg, // IN: the algorithm to check
BOOL flag // IN: TRUE if TPM_ALG_NULL is to be treated
// as a valid hash
)
{
switch(hashAlg)
{
#if ALG_SHA1
case ALG_SHA1_VALUE:
#endif
#if ALG_SHA256
case ALG_SHA256_VALUE:
#endif
#if ALG_SHA384
case ALG_SHA384_VALUE:
#endif
#if ALG_SHA512
case ALG_SHA512_VALUE:
#endif
#if ALG_SM3_256
case ALG_SM3_256_VALUE:
#endif
return TRUE;
break;
case ALG_NULL_VALUE:
return flag;
break;
default:
break;
}
return FALSE;
if(hashAlg == TPM_ALG_NULL)
return flag;
return CryptGetHashDef(hashAlg) != &NULL_Def;
}
/* 10.2.13.4.4 GetHashInfoPointer() */
/* This function returns a pointer to the hash info for the algorithm. If the algorithm is not
@ -216,9 +199,12 @@ CryptHashGetAlgByIndex(
UINT32 index // IN: the index
)
{
TPM_ALG_ID hashAlg;
if(index >= HASH_COUNT)
return TPM_ALG_NULL;
return g_hashData[index].alg;
hashAlg = TPM_ALG_NULL;
else
hashAlg = HashDefArray[index]->hashAlg;
return hashAlg;
}
/* 10.2.13.4.5 CryptHashGetDigestSize() */
/* Returns the size of the digest produced by the hash. If hashAlg is not a hash algorithm, the TPM

20
src/tpm2/crypto/openssl/CryptHashData.c
View File

@ -61,6 +61,26 @@
/* 10.2.15 CryptHashData.c */
#include "Tpm.h"
#define SHA1_DER_SIZE 15
#define SHA1_DER \
0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2B, 0x0E, \
0x03, 0x02, 0x1A, 0x05, 0x00, 0x04, 0x14
#define SHA256_DER_SIZE 19
#define SHA256_DER \
0x30, 0x31, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, \
0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, \
0x00, 0x04, 0x20
#define SHA384_DER_SIZE 19
#define SHA384_DER \
0x30, 0x41, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, \
0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02, 0x05, \
0x00, 0x04, 0x30
#define SHA512_DER_SIZE 19
#define SHA512_DER \
0x30, 0x51, 0x30, 0x0D, 0x06, 0x09, 0x60, 0x86, \
0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03, 0x05, \
0x00, 0x04, 0x40
const HASH_INFO g_hashData[HASH_COUNT + 1] = {
#if ALG_SHA1
{TPM_ALG_SHA1, SHA1_DIGEST_SIZE, SHA1_BLOCK_SIZE,