WolfSSL
/
wolfTPM
mirror of https://github.com/wolfSSL/wolfTPM.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes for MMIO HAL refactor.

pull/271/head
David Garske 2023-06-28 16:00:56 -07:00
parent 21638b065a
commit ab9bf2981b
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hal/tpm_io_mmio.c
View File

@ -39,7 +39,7 @@
#endif #endif
#ifndef WOLFTPM_ADV_IO #ifndef WOLFTPM_ADV_IO
#error "WOLFTPM_MMIO_BUILTIN_CB requires WOLFTPM_ADV_IO" #error "WOLFTPM_MMIO requires WOLFTPM_ADV_IO"
#endif #endif
#ifdef __GNUC__ #ifdef __GNUC__

6
src/tpm2.c
View File

@ -28,6 +28,8 @@
#include <wolftpm/tpm2_winapi.h> #include <wolftpm/tpm2_winapi.h>
#include <wolftpm/tpm2_param_enc.h> #include <wolftpm/tpm2_param_enc.h>
#include <hal/tpm_io.h>
/******************************************************************************/ /******************************************************************************/
/* --- Local Variables -- */ /* --- Local Variables -- */
/******************************************************************************/ /******************************************************************************/
@ -623,14 +625,14 @@ TPM_RC TPM2_Init_ex(TPM2_CTX* ctx, TPM2HalIoCb ioCb, void* userCtx,
#endif #endif
#if defined(WOLFTPM_LINUX_DEV) || defined(WOLFTPM_SWTPM) || \ #if defined(WOLFTPM_LINUX_DEV) || defined(WOLFTPM_SWTPM) || \
defined(WOLFTPM_WINAPI) || defined(WOLFTPM_MMIO) defined(WOLFTPM_WINAPI)
if (ioCb != NULL || userCtx != NULL) { if (ioCb != NULL || userCtx != NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
#else #else
#ifdef WOLFTPM_MMIO #ifdef WOLFTPM_MMIO
if (ioCb == NULL) if (ioCb == NULL)
ioCb = TPM2_Mmio_Cb; ioCb = TPM2_IoCb_Mmio;
#endif #endif
/* Setup HAL IO Callback */ /* Setup HAL IO Callback */
rc = TPM2_SetHalIoCb(ctx, ioCb, userCtx); rc = TPM2_SetHalIoCb(ctx, ioCb, userCtx);

5
wolftpm/tpm2_tis.h
View File

@ -54,11 +54,6 @@ WOLFTPM_LOCAL int TPM2_TIS_StartupWait(TPM2_CTX* ctx, int timeout);
WOLFTPM_LOCAL int TPM2_TIS_Write(TPM2_CTX* ctx, word32 addr, const byte* value, word32 len); WOLFTPM_LOCAL int TPM2_TIS_Write(TPM2_CTX* ctx, word32 addr, const byte* value, word32 len);
WOLFTPM_LOCAL int TPM2_TIS_Read(TPM2_CTX* ctx, word32 addr, byte* result, word32 len); WOLFTPM_LOCAL int TPM2_TIS_Read(TPM2_CTX* ctx, word32 addr, byte* result, word32 len);
#ifdef WOLFTPM_MMIO_BUILTIN_CB
WOLFTPM_LOCAL int TPM2_Mmio_Cb(TPM2_CTX *ctx, int isRead, word32 addr, byte* buf, word16 size,
void* userCtx);
#endif /* WOLFTPM_MMIO_BUILTIN_CB */
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif #endif