From a5f23a2e430c479d5c4daeadcd29196ee3a81d8b Mon Sep 17 00:00:00 2001
From: Paul Adelsbach <paul.adelsbach@wolfssl.com>
Date: Wed, 28 Jan 2026 11:39:36 -0800
Subject: [PATCH] Add commit hash to version.h

---
 configure.ac         | 8 ++++++++
 src/ssl.c            | 5 +++++
 wolfssl/ssl.h        | 1 +
 wolfssl/version.h    | 2 +-
 wolfssl/version.h.in | 2 +-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0e987002833..b5aef6ccd96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11255,6 +11255,14 @@ AM_CCASFLAGS="$AM_CCASFLAGS $EXTRA_CCASFLAGS"
 AM_LDFLAGS="$AM_LDFLAGS $EXTRA_LDFLAGS"
 
 CREATE_HEX_VERSION
+GIT_HASH=${GIT_HASH-}
+if test "x$GIT_HASH" = "x"; then
+    GIT_HASH=`git rev-parse --short HEAD 2>/dev/null`
+fi
+if test "x$GIT_HASH" = "x"; then
+    GIT_HASH=unknown
+fi
+AC_SUBST([GIT_HASH])
 AC_SUBST([AM_CPPFLAGS])
 AC_SUBST([AM_CFLAGS])
 AC_SUBST([AM_LDFLAGS])
diff --git a/src/ssl.c b/src/ssl.c
index ff0a4eb0e5f..03e83356101 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -15184,6 +15184,11 @@ const char* wolfSSL_lib_version(void)
     return LIBWOLFSSL_VERSION_STRING;
 }
 
+const char* wolfSSL_lib_git_hash(void)
+{
+    return LIBWOLFSSL_GIT_HASH;
+}
+
 #ifdef OPENSSL_EXTRA
 #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
 const char* wolfSSL_OpenSSL_version(int a)
diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h
index cf38c9e9d25..04398d5723e 100644
--- a/wolfssl/ssl.h
+++ b/wolfssl/ssl.h
@@ -3352,6 +3352,7 @@ WOLFSSL_API void   wolfSSL_set_security_level(WOLFSSL * ssl, int level);
 
 /* which library version do we have */
 WOLFSSL_API const char* wolfSSL_lib_version(void);
+WOLFSSL_API const char* wolfSSL_lib_git_hash(void);
 #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
 WOLFSSL_API const char* wolfSSL_OpenSSL_version(int a);
 #else
diff --git a/wolfssl/version.h b/wolfssl/version.h
index ac6b7f933a5..eecaff98aae 100644
--- a/wolfssl/version.h
+++ b/wolfssl/version.h
@@ -30,6 +30,7 @@ extern "C" {
 
 #define LIBWOLFSSL_VERSION_STRING "5.8.4"
 #define LIBWOLFSSL_VERSION_HEX 0x05008004
+#define LIBWOLFSSL_GIT_HASH "59f4fa568"
 
 #ifdef __cplusplus
 }
@@ -37,4 +38,3 @@ extern "C" {
 
 
 #endif /* WOLFSSL_VERSION_H */
-
diff --git a/wolfssl/version.h.in b/wolfssl/version.h.in
index 6d2161d310e..4b42bcf9362 100644
--- a/wolfssl/version.h.in
+++ b/wolfssl/version.h.in
@@ -30,6 +30,7 @@ extern "C" {
 
 #define LIBWOLFSSL_VERSION_STRING "@VERSION@"
 #define LIBWOLFSSL_VERSION_HEX @HEX_VERSION@
+#define LIBWOLFSSL_GIT_HASH "@GIT_HASH@"
 
 #ifdef __cplusplus
 }
@@ -37,4 +38,3 @@ extern "C" {
 
 
 #endif /* WOLFSSL_VERSION_H */
-