From 9a6415235d8978517e400996067d31ec5a8beaf0 Mon Sep 17 00:00:00 2001
From: kxtzownsu <kxtzownsu@gmail.com>
Date: Sat, 7 Dec 2024 13:59:51 -0500
Subject: [PATCH] add tpmver detection

---
 include/sysinfo.h | 16 ++++++++++++++++
 include/ui.h      |  2 +-
 src/KVS/main.c    |  2 +-
 src/KVS/ui.c      |  2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/include/sysinfo.h b/include/sysinfo.h
index 0718a79..cc4bc8f 100644
--- a/include/sysinfo.h
+++ b/include/sysinfo.h
@@ -3,6 +3,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
+#include <stdlib.h>
 
 #include "tpm.h"
 
@@ -39,4 +40,19 @@ const char* getFirmwareVersion(){
 // uint32_t getKernelVersion(){
 // }
 
+// this is kinda shitty, but until the TPM2 API is done, this is how we have to do it
+const char* getTpmVersion(){
+    char cmd[] = "tpmc tpmver";
+    static char output[5];
+
+    FILE* fp = popen(cmd, "r");
+    fgets(output, sizeof(output), fp);
+	fclose(fp);
+
+    trim_newline(output);
+
+    return output;
+}
+
+
 #endif
\ No newline at end of file
diff --git a/include/ui.h b/include/ui.h
index bfe8efb..8a7ac03 100644
--- a/include/ui.h
+++ b/include/ui.h
@@ -2,6 +2,6 @@
 #define UI_H
 
 void ui_flash(char* flashtype);
-void ui_header(const char* fwver, char* kernver, char* tpmver, char* fwmp, char* gscver, char* gsctype);
+void ui_header(const char* fwver, char* kernver, const char* tpmver, char* fwmp, char* gscver, char* gsctype);
 
 #endif
\ No newline at end of file
diff --git a/src/KVS/main.c b/src/KVS/main.c
index fa32ced..ef91842 100644
--- a/src/KVS/main.c
+++ b/src/KVS/main.c
@@ -14,7 +14,7 @@ int main(int argc, char **argv) {
 	// example values for testing
 	const char* fwver = getFirmwareVersion();
 	char* kernver = "0x00010001";
-	char* tpmver = "2.0";
+	const char* tpmver = getTpmVersion();
 	char* fwmp = "0x1";
 	char* gscver = "0.5.229";
 	char* gsctype = "Cr50";
diff --git a/src/KVS/ui.c b/src/KVS/ui.c
index a628218..780896e 100644
--- a/src/KVS/ui.c
+++ b/src/KVS/ui.c
@@ -75,7 +75,7 @@ void ui_flash(char* flashtype) {
 	}
 }
 
-void ui_header(const char* fwver, char* kernver, char* tpmver, char* fwmp, char* gscver, char* gsctype){
+void ui_header(const char* fwver, char* kernver, const char* tpmver, char* fwmp, char* gscver, char* gsctype){
 	printf("KVS: Kernel Version Switcher (codename Maglev, bid: 2.0.0))\n");
 	printf("FW Version: %s\n", fwver);
 	printf("Kernel Version: %s\n", kernver);