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

rev162: make union tpmCryptKeySchedule_t a typedef union

Browse Source 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
This commit is contained in:
Stefan Berger 2020-06-26 16:44:05 -04:00 committed by Stefan Berger
parent f49621ff3a
commit 09bf3ed589
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tpm2/crypto/CryptSym.h
View File

@ -3,7 +3,7 @@
/* Implementation of the symmetric block cipher modes */
/* Written by Ken Goldman */
/* IBM Thomas J. Watson Research Center */
/* $Id: CryptSym.h 1519 2019-11-15 20:43:51Z kgoldman $ */
/* $Id: CryptSym.h 1618 2020-05-19 15:28:41Z kgoldman $ */
/* */
/* Licenses and Notices */
/* */
@ -63,7 +63,7 @@
#ifndef CRYPTSYM_H
#define CRYPTSYM_H
union tpmCryptKeySchedule_t {
typedef union tpmCryptKeySchedule_t {
#if ALG_AES
tpmKeyScheduleAES AES;
#endif
@ -81,7 +81,7 @@ union tpmCryptKeySchedule_t {
#else
uint32_t alignment;
#endif
} /* tpmCryptKeySchedule */; // libtpms changed; causes duplicate symbols on OS X
} tpmCryptKeySchedule_t;
/* Each block cipher within a library is expected to conform to the same calling conventions with
three parameters (keySchedule, in, and out) in the same order. That means that all algorithms
would use the same order of the same parameters. The code is written assuming the (keySchedule,

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

@ -3,7 +3,7 @@
/* Splice the OpenSSL() library into the TPM code. */
/* Written by Ken Goldman */
/* IBM Thomas J. Watson Research Center */
/* $Id: TpmToOsslSym.h 1600 2020-03-30 22:08:01Z kgoldman $ */
/* $Id: TpmToOsslSym.h 1619 2020-05-19 16:51:47Z kgoldman $ */
/* */
/* Licenses and Notices */
/* */
@ -190,7 +190,7 @@ typedef void(*TpmCryptSetSymKeyCall_t)(
/* Forward reference */
typedef union tpmCryptKeySchedule_t tpmCryptKeySchedule_t;
// kgold typedef union tpmCryptKeySchedule_t tpmCryptKeySchedule_t;
/* This definition would change if there were something to report */
#define SymLibSimulationEnd()