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

Merge pull request #49 from dgarske/rel_v1.4 

Prep for wolfTPM v1.4 release
pull/51/head v1.4
Eric Blankenhorn 2018-11-16 15:05:10 -06:00 committed by GitHub
parent a0127c1002 bcbbf8ed39
commit d8c4f490db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 98 additions and 1797 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1883
README.md
View File

File diff suppressed because it is too large Load Diff

4
configure.ac
View File

@ -3,7 +3,7 @@
# All right reserved.
AC_COPYRIGHT([Copyright (C) 2014-2018 wolfSSL Inc.])
AC_INIT([wolftpm],[1.3.0],[https://github.com/wolfssl/wolfTPM/issues],[wolftpm],[http://www.wolfssl.com])
AC_INIT([wolftpm],[1.4.0],[https://github.com/wolfssl/wolfTPM/issues],[wolftpm],[http://www.wolfssl.com])
AC_PREREQ([2.63])
AC_CONFIG_AUX_DIR([build-aux])
@ -23,7 +23,7 @@ AC_ARG_PROGRAM
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([src/config.h])
WOLFTPM_LIBRARY_VERSION=3:0:0
WOLFTPM_LIBRARY_VERSION=4:0:0
# | | |
# +------+ | +---+
# | | |

2
src/tpm2_tis.c
View File

@ -107,6 +107,7 @@ int TPM2_TIS_Read(TPM2_CTX* ctx, word32 addr, byte* result,
txBuf[3] = (addr) & 0xFF;
txBuf[4] = 0x00;
XMEMSET(&txBuf[TPM_TIS_HEADER_SZ], 0, len);
XMEMSET(rxBuf, 0, sizeof(rxBuf));
rc = ctx->ioCb(ctx, txBuf, rxBuf, len + TPM_TIS_HEADER_SZ, ctx->userCtx);
@ -137,6 +138,7 @@ int TPM2_TIS_Write(TPM2_CTX* ctx, word32 addr, const byte* value,
txBuf[3] = (addr) & 0xFF;
txBuf[4] = 0x00;
XMEMCPY(&txBuf[TPM_TIS_HEADER_SZ], value, len);
XMEMSET(rxBuf, 0, sizeof(rxBuf));
rc = ctx->ioCb(ctx, txBuf, rxBuf, len + TPM_TIS_HEADER_SZ, ctx->userCtx);
#endif

2
src/tpm2_wrap.c
View File

@ -341,7 +341,7 @@ int wolfTPM2_ComputeName(const TPM2B_PUBLIC* pub, TPM2B_NAME* out)
TPM2_Packet packet;
TPM2B_DATA data;
wc_HashAlg hash;
int hashType;
enum wc_HashType hashType;
int hashSz;
#endif

4
wolftpm/version.h
View File

@ -34,8 +34,8 @@
extern "C" {
#endif
#define LIBWOLFTPM_VERSION_STRING "1.3.0"
#define LIBWOLFTPM_VERSION_HEX 0x01003000
#define LIBWOLFTPM_VERSION_STRING "1.4.0"
#define LIBWOLFTPM_VERSION_HEX 0x01004000
#ifdef __cplusplus
}