Merge pull request #90 from dgarske/release_v1.8

wolfTPM v1.8 release preparation

ChangeLog.md

@@ -1,5 +1,27 @@
 ## Release Notes
 
+### wolfTPM Release 1.8 (04/28/2020)
+
+**Summary**
+
+Added Xilinx Zynq UltraScale+ MPSoC, Linux TIS kernel driver, Nuvoton and Nations Tech TPM module support.
+
+**Detail**
+
+* Fixed obsolete workaround for ST33 and TIS header size. (PR #85)
+* Fixes for building with older wolfSSL versions not supporting `wc_HashFree`. (PR #87)
+* Fixes for building without wolfCrypt RSA (when `NO_RSA` is defined). (PR #89)
+* Fixes for ECC verify in crypto callback to try software if the curve is not supported (`TPM_RC_CURVE`) by the TPM hardware. (PR #89)
+* Fixes for building with `WOLFTPM2_USE_SW_ECDHE`. (PR #86)
+* Added support for using `/dev/tpmX`. (PR #91)
+* Added example for using an ECC primary storage key (root owner). (PR #84)
+* Added Xilinx Zynq MPSoC bare-metal SPI support. (PR #85)
+* Added support for Nuvoton TPM 2.0 NPCT650. (PR #91)
+* Added support for Nations Technologies Inc. TPM 2.0 module (Z32H330). (PR #88)
+* Cleanup of the session auth, so after being set it is also cleared. (PR #84)
+* Moved the chip specific settings to `tpm2_types.h`. (PR #85)
+
+
 ### wolfTPM Release 1.7 (12/27/2019)
 
 **Summary**

README.md

@@ -125,6 +125,7 @@ autogen.sh requires: automake and libtool: `sudo apt-get install automake libtoo
 --enable-mchp           Enable Microchip TPM Support (default: disabled) - WOLFTPM_MCHP
 WOLFTPM_TIS_LOCK        Enable Linux Named Semaphore for locking access to SPI device for concurrent access between processes.
 WOLFTPM_USE_SYMMETRIC   Enables symmetric AES/Hashing/HMAC support for TLS examples.
+WOLFTPM2_USE_SW_ECDHE   Disables use of TPM for ECC ephemeral key generation and shared secret.
 TLS_BENCH_MODE          Enables TLS benchmarking mode.
 NO_TPM_BENCH            Disables the TPM benchmarking example.
 --enable-smallstack     Enable options to reduce stack usage

configure.ac

@@ -3,7 +3,7 @@
 # All right reserved.
 
 AC_COPYRIGHT([Copyright (C) 2014-2020 wolfSSL Inc.])
-AC_INIT([wolftpm],[1.7.0],[https://github.com/wolfssl/wolfTPM/issues],[wolftpm],[http://www.wolfssl.com])
+AC_INIT([wolftpm],[1.8.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=7:0:0
+WOLFTPM_LIBRARY_VERSION=8:0:0
 #                        | | |
 #                 +------+ | +---+
 #                 |        |     |

examples/wrap/wrap_test.c

@@ -153,6 +153,7 @@ int TPM2_Wrapper_Test(void* userCtx)
 
     /* unload all transient handles */
     rc = wolfTPM2_UnloadHandles_AllTransient(&dev);
+    if (rc != 0) goto exit;
 
 
     /*------------------------------------------------------------------------*/
@@ -768,7 +769,6 @@ int TPM2_Wrapper_Test(void* userCtx)
     }
     else if (rc == TPM_RC_COMMAND_CODE) {
         printf("Encrypt/Decrypt: Is not a supported feature due to export controls\n");
-        rc = TPM_RC_SUCCESS; /* clear error code */
     }
     else {
         printf("Encrypt/Decrypt (gen key) test failed, result not as expected!\n");

src/tpm2_wrap.c

@@ -72,7 +72,6 @@ static int wolfTPM2_Init_NoDev(TPM2_CTX* ctx, TPM2HalIoCb ioCb, void* userCtx,
     #endif
         return rc;
     }
-    rc = TPM_RC_SUCCESS;
 #ifdef DEBUG_WOLFTPM
     printf("TPM2_Startup pass\n");
 #endif
@@ -91,7 +90,9 @@ static int wolfTPM2_Init_NoDev(TPM2_CTX* ctx, TPM2HalIoCb ioCb, void* userCtx,
 #ifdef DEBUG_WOLFTPM
     printf("TPM2_SelfTest pass\n");
 #endif
-#endif
+#else
+    rc = TPM_RC_SUCCESS;
+#endif /* WOLFTPM_MCHP || WOLFTPM_PERFORM_SELFTEST */
 
     return rc;
 }

wolftpm/version.h

@@ -34,8 +34,8 @@
 extern "C" {
 #endif
 
-#define LIBWOLFTPM_VERSION_STRING "1.7.0"
-#define LIBWOLFTPM_VERSION_HEX 0x01007000
+#define LIBWOLFTPM_VERSION_STRING "1.8.0"
+#define LIBWOLFTPM_VERSION_HEX 0x01008000
 
 #ifdef __cplusplus
 }