From 86fbaf69a9141ae7ecdc803717844e5ddafc49fa Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Wed, 21 May 2025 10:03:33 -0700
Subject: [PATCH] wolfTPM v3.9.1 release (post release fixes)   - Fixed
 commercial release bundle (missing `tpm2_asn.h`).   - Fixed wolfTPM DLL
 revision (was not updated in v3.9.0).   - Added `make distcheck` to GitHub
 CI.

---
 .github/workflows/make-test-swtpm.yml | 10 ++++++++--
 CMakeLists.txt                        |  2 +-
 ChangeLog.md                          |  8 ++++++++
 Makefile.am                           |  3 +++
 configure.ac                          |  4 ++--
 wolftpm/include.am                    |  1 +
 wolftpm/version.h                     |  4 ++--
 7 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/make-test-swtpm.yml b/.github/workflows/make-test-swtpm.yml
index e58201c..a1c1962 100644
--- a/.github/workflows/make-test-swtpm.yml
+++ b/.github/workflows/make-test-swtpm.yml
@@ -31,6 +31,7 @@ jobs:
       run: |
         make
         sudo make install
+        sudo ldconfig
 
 # setup ibmswtpm2
     - uses: actions/checkout@master
@@ -55,9 +56,13 @@ jobs:
         make check
         WOLFSSL_PATH=./wolfssl ./examples/run_examples.sh
     - name: make install
-      run: sudo make install
+      run: |
+        sudo make install
+        sudo ldconfig
     - name: make dist
       run: make dist
+    - name: make distcheck
+      run: make distcheck
 
 # build and test CSharp wrapper
     - name: Install mono
@@ -174,7 +179,7 @@ jobs:
         make check
         WOLFSSL_PATH=./wolfssl WOLFCRYPT_RSA=0 ./examples/run_examples.sh
 
-# test with default configure (no AES CFB, no PKCS7, no crpyto cb, no cert gen)
+# test with default configure (no AES CFB, no PKCS7, no crypto cb, no cert gen)
     - name: wolfssl default configure
       working-directory: ./wolfssl
       run: |
@@ -234,4 +239,5 @@ jobs:
         path: |
           run.out
           test-suite.log
+          wolftpm-*/_build/sub/test-suite.log
         retention-days: 5
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dadd480..9b60fc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-project(wolfTPM VERSION 3.9.0 LANGUAGES C)
+project(wolfTPM VERSION 3.9.1 LANGUAGES C)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(WOLFTPM_DEFINITIONS)
diff --git a/ChangeLog.md b/ChangeLog.md
index 10e4ba7..0bfa05c 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,13 @@
 # Release Notes
 
+## wolfTPM Release 3.9.1 (May 21, 2025)
+
+* Post release fixes (PR #415)
+  - Fixed commercial release bundle (missing `tpm2_asn.h`).
+  - Fixed wolfTPM DLL revision (was not updated in v3.9.0).
+  - Added `make distcheck` to GitHub CI.
+
+
 ## wolfTPM Release 3.9.0 (May 14, 2025)
 
 **Summary**
diff --git a/Makefile.am b/Makefile.am
index d5a1ded..39a45e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,9 @@ dist_doc_DATA =
 @INC_AMINCLUDE@
 DISTCLEANFILES+= aminclude.am
 
+# make sure we pass the correct flags to distcheck
+AM_DISTCHECK_CONFIGURE_FLAGS = --enable-swtpm
+
 exampledir = $(docdir)/example
 dist_example_DATA=
 
diff --git a/configure.ac b/configure.ac
index 5c53e7b..f1b36fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 # All right reserved.
 
 AC_COPYRIGHT([Copyright (C) 2014-2025 wolfSSL Inc.])
-AC_INIT([wolftpm],[3.9.0],[https://github.com/wolfssl/wolfTPM/issues],[wolftpm],[http://www.wolfssl.com])
+AC_INIT([wolftpm],[3.9.1],[https://github.com/wolfssl/wolfTPM/issues],[wolftpm],[http://www.wolfssl.com])
 
 AC_PREREQ([2.63])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -28,7 +28,7 @@ AC_ARG_PROGRAM
 
 AC_CONFIG_HEADERS([src/config.h])
 
-WOLFTPM_LIBRARY_VERSION=16:5:0
+WOLFTPM_LIBRARY_VERSION=16:6:0
 #                        | | |
 #                 +------+ | +---+
 #                 |        |     |
diff --git a/wolftpm/include.am b/wolftpm/include.am
index 75baa15..630436c 100644
--- a/wolftpm/include.am
+++ b/wolftpm/include.am
@@ -13,6 +13,7 @@ nobase_include_HEADERS+= \
                          wolftpm/tpm2_winapi.h \
                          wolftpm/tpm2_param_enc.h \
                          wolftpm/tpm2_socket.h \
+                         wolftpm/tpm2_asn.h \
                          wolftpm/version.h \
                          wolftpm/visibility.h \
                          wolftpm/options.h
diff --git a/wolftpm/version.h b/wolftpm/version.h
index dca69fd..f104cd1 100644
--- a/wolftpm/version.h
+++ b/wolftpm/version.h
@@ -34,8 +34,8 @@
 extern "C" {
 #endif
 
-#define LIBWOLFTPM_VERSION_STRING "3.9.0"
-#define LIBWOLFTPM_VERSION_HEX 0x03009000
+#define LIBWOLFTPM_VERSION_STRING "3.9.1"
+#define LIBWOLFTPM_VERSION_HEX 0x03009001
 
 #ifdef __cplusplus
 }