Proxmox-Port/libtpms
1
0
Fork 0
mirror of https://github.com/stefanberger/libtpms synced 2026-08-12 18:28:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tpm2: Move #defines for hash and sym alignment out of TpmProfile.h

Browse Source 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
This commit is contained in:
Stefan Berger 2019-11-26 13:24:32 -05:00 committed by Stefan Berger
parent 2296a4dd2a
commit 69d0950e34
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tpm2/NVMarshal.c
View File

@ -41,6 +41,7 @@
#include "assert.h"
#define _CRYPT_HASH_C_
#define SESSION_PROCESS_C
#define NV_C
#define OBJECT_C
@ -3579,7 +3580,7 @@ static const struct _entry {
{ COMPILE_CONSTANT(ECC_SM2_P256, LE) },
{ COMPILE_CONSTANT(MAX_ECC_KEY_BITS, LE) },
{ COMPILE_CONSTANT(HASH_ALIGNMENT, EQ) },
{ COMPILE_CONSTANT(SYMMETRIC_ALIGNMENT, EQ) },
{ COMPILE_CONSTANT(SYM_ALIGNMENT, EQ) },
{ COMPILE_CONSTANT(IMPLEMENTATION_PCR, EQ) },
{ COMPILE_CONSTANT(PLATFORM_PCR, EQ) },
{ COMPILE_CONSTANT(DRTM_PCR, EQ) },

6
src/tpm2/TpmProfile.h
View File

@ -192,12 +192,6 @@
#ifndef RADIX_BITS
#define RADIX_BITS 32
#endif
#ifndef HASH_ALIGNMENT
#define HASH_ALIGNMENT 4
#endif
#ifndef SYMMETRIC_ALIGNMENT
#define SYMMETRIC_ALIGNMENT 4
#endif
#ifndef HASH_LIB
#define HASH_LIB Ossl
#endif

5
src/tpm2/crypto/openssl/TpmToOsslHash.h
View File

@ -3,7 +3,7 @@
/* Used to splice the OpenSSL() hash code into the TPM code */
/* Written by Ken Goldman */
/* IBM Thomas J. Watson Research Center */
/* $Id: TpmToOsslHash.h 1519 2019-11-15 20:43:51Z kgoldman $ */
/* $Id: TpmToOsslHash.h 1529 2019-11-21 23:29:01Z kgoldman $ */
/* */
/* Licenses and Notices */
/* */
@ -98,6 +98,9 @@ typedef const BYTE *PCBYTE;
library). */
/* The macro that calls the method also defines how the parameters get swizzled between the default
form (in CryptHash.c)and the library form. */
#define HASH_ALIGNMENT 4 /* libtpms: keep old value */
/* Initialize the hash context */
#define HASH_START_METHOD_DEF void (HASH_START_METHOD)(PANY_HASH_STATE state)
#define HASH_START(hashState) \

2
src/tpm2/crypto/openssl/TpmToOsslSym.h
View File

@ -96,6 +96,8 @@ typedef void(*TpmCryptSetSymKeyCall_t)(
void *keySchedule
);
#define SYM_ALIGNMENT 4 /* libtpms: keep old value */
/* B.2.2.3.3. Links to the OpenSSL AES code */
/* Macros to set up the encryption/decryption key schedules */