Skip to content

Commit

Permalink
Merge pull request #195 from dgarske/rel_v2.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
elms authored Nov 9, 2021
2 parents 83129e5 + 0f9e8b5 commit 5af1360
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 9 deletions.
19 changes: 19 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,24 @@
# Release Notes

## wolfTPM Release 2.3 (11/08/2021)

**Summary**

Fixes for minor build issues, refactor of GPIO configure to combine and new PCR Read example.

**Detail**

* Refactor GPIO support (single gpio_config) (PR #194)
* Fix for Linux HAL IO try again timeout logic (PR #194)
* Fix for big endian in TIS layer (PR #191)
* Fix for RSAES padding (RSA_Encrypt) (PR #187)
* Fix in tests to allow command code error for CreateLoaded (not supported on hardware) (PR #184)
* Fix for compiler warning for file read in make_credential.c (PR #182)
* Fixes for Windows builds (PR #181)
* Fixes for RSA RNG in edge case builds (fixes wolfBoot build error) (PR #180)
* Added PCR Read example (PR #185)


## wolfTPM Release 2.2 (07/13/2021)

**Summary**
Expand Down
10 changes: 5 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# All right reserved.

AC_COPYRIGHT([Copyright (C) 2014-2021 wolfSSL Inc.])
AC_INIT([wolftpm],[2.2.0],[https://github.com/wolfssl/wolfTPM/issues],[wolftpm],[http://www.wolfssl.com])
AC_INIT([wolftpm],[2.3.0],[https://github.com/wolfssl/wolfTPM/issues],[wolftpm],[http://www.wolfssl.com])

AC_PREREQ([2.63])
AC_CONFIG_AUX_DIR([build-aux])
Expand All @@ -23,7 +23,7 @@ AC_ARG_PROGRAM
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([src/config.h])

WOLFTPM_LIBRARY_VERSION=12:0:0
WOLFTPM_LIBRARY_VERSION=12:1:0
# | | |
# +------+ | +---+
# | | |
Expand Down Expand Up @@ -366,7 +366,7 @@ AC_ARG_ENABLE([autodetect],
if test "x$ENABLED_AUTODETECT" = "xtest"
then
# If a module hasn't been selected then enable auto-detection
if test "x$ENABLED_INFINEON" = "xno" && test "x$ENABLED_MCHP" = "xno" && test "x$ENABLED_ST" = "xno" && test "x$ENABLED_NUVOTON" = "xno"
if test "x$ENABLED_INFINEON" = "xno" && test "x$ENABLED_MCHP" = "xno" && test "x$ENABLED_ST33" = "xno" && test "x$ENABLED_NUVOTON" = "xno"
then
ENABLED_AUTODETECT=yes
fi
Expand Down Expand Up @@ -400,7 +400,7 @@ AM_CONDITIONAL([BUILD_WRAPPER], [test "x$ENABLED_WRAPPER" = "xyes"])
AM_CONDITIONAL([HAVE_LIBWOLFSSL], [test "x$ENABLED_WOLFCRYPT" = "xyes"])
AM_CONDITIONAL([BUILD_I2C], [test "x$ENABLED_I2C" = "xyes"])
AM_CONDITIONAL([BUILD_ADVIO], [test "x$ENABLED_ADVIO" = "xyes"])
AM_CONDITIONAL([BUILD_ST], [test "x$ENABLED_ST" = "xyes"])
AM_CONDITIONAL([BUILD_ST], [test "x$ENABLED_ST33" = "xyes"])
AM_CONDITIONAL([BUILD_MICROCHIP], [test "x$ENABLED_MICROCHIP" = "xyes"])
AM_CONDITIONAL([BUILD_INFINEON], [test "x$ENABLED_INFINEON" = "xyes"])
AM_CONDITIONAL([BUILD_DEVTPM], [test "x$ENABLED_DEVTPM" = "xyes"])
Expand Down Expand Up @@ -529,7 +529,7 @@ echo " * WINAPI: $ENABLED_WINAPI"
echo " * TIS/SPI Check Wait State: $ENABLED_CHECKWAITSTATE"

echo " * Infineon SLB9670 $ENABLED_INFINEON"
echo " * STM ST33: $ENABLED_ST"
echo " * STM ST33: $ENABLED_ST33"
echo " * Microchip ATTPM20: $ENABLED_MICROCHIP"
echo " * Nuvoton NPCT75x: $ENABLED_NUVOTON"

Expand Down
1 change: 0 additions & 1 deletion examples/native/native_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,6 @@ int TPM2_Native_TestArgs(void* userCtx, int argc, char *argv[])
}
else if (rc == TPM_RC_COMMAND_CODE) {
printf("TPM2_CreatLoaded: Command is not supported on this hardware\n");
rc = TPM_RC_SUCCESS; /* clear error code */
}
else {
printf("TPM2_CreateLoaded failed %d: %s\n", rc,
Expand Down
1 change: 0 additions & 1 deletion examples/wrap/wrap_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,6 @@ int TPM2_Wrapper_TestArgs(void* userCtx, int argc, char *argv[])
}
else if (rc == TPM_RC_COMMAND_CODE) {
printf("CreateLoadedKey: Feature is not suppored on this hardware\n");
rc = TPM_RC_SUCCESS; /* clear error code */
}
else {
goto exit;
Expand Down
4 changes: 2 additions & 2 deletions wolftpm/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
extern "C" {
#endif

#define LIBWOLFTPM_VERSION_STRING "2.2.0"
#define LIBWOLFTPM_VERSION_HEX 0x02002000
#define LIBWOLFTPM_VERSION_STRING "2.3.0"
#define LIBWOLFTPM_VERSION_HEX 0x02003000

#ifdef __cplusplus
}
Expand Down

0 comments on commit 5af1360

Please sign in to comment.