start of tpm2 api

include/arg_checks.h

@@ -1,5 +1,11 @@
 // credit to Hannah / ZegLol for making this!
 
+#ifndef ARG_CHECKS_H
+#define ARG_CHECKS_H
+
+#include <stddef.h>
+
+
 int gargc;
 char **gargv;
 
@@ -29,4 +35,6 @@ char *fequals(const char *arg)
 	}
 
 	return "";
-}
+}
+
+#endif

include/hex_utils.h

@@ -1,5 +1,9 @@
+#ifndef HEX_UTILS_H
+#define HEX_UTILS_H
+
 #include <stdbool.h>
 #include <stdint.h>
+#include <stddef.h>
 
 uint32_t convert_to_uint32(const char *str) {
     char *endptr;
@@ -25,4 +29,6 @@ void print_hex(const uint8_t *data, uint32_t size) {
     for (uint32_t i = 0; i < size; i++) {
         printf("%02x ", data[i]);
     }
-}
+}
+
+#endif

include/sysinfo.h

@@ -1,3 +1,11 @@
+#ifndef SYSINFO_H
+#define SYSINFO_H
+
+#include <stdint.h>
+#include <stddef.h>
+
+#include "tpm.h"
+
 void trim_newline(char* str) {
     size_t len = strlen(str);
     if (len > 0 && str[len - 1] == '\n') {
@@ -16,7 +24,7 @@ const char* getFirmwareVersion(){
     if (fptr == NULL) {
         printf("Error reading Firmware Version \n");
         printf("Please report as a bug at https://github.com/kxtzownsu/KVS-private\n");
-        
+
         sleep(86400); // sleep for 1d if error
         return "Error!"; 
     }
@@ -26,4 +34,9 @@ const char* getFirmwareVersion(){
     trim_newline(firmwareVersion);
 
     return firmwareVersion;
-}
+}
+
+// uint32_t getKernelVersion(){
+// }
+
+#endif

include/tpm.h

@@ -1 +1,8 @@
-void tpm_write(char* index, char* bytes);
+#ifndef TPM_H
+#define TPM_H
+#include <stddef.h>
+
+int tpm_nvwrite(char* index, char* bytes, char* offset, char* authType, char* indexPassword);
+int tpm_nvread(char* index, char* size, char* offset, char* authType, char* indexPassword);
+
+#endif

include/ui.h

@@ -1,7 +1,7 @@
-#ifndef KVS2_UI_H
+#ifndef UI_H
-#define KVS2_UI_H
+#define UI_H
 
 void ui_flash(char* flashtype);
-void ui_header(char* fwver, char* kernver, char* tpmver, char* fwmp, char* gscver, char* gsctype);
+void ui_header(const char* fwver, char* kernver, char* tpmver, char* fwmp, char* gscver, char* gsctype);
 
 #endif

src/KVS/tpm.c

@@ -1,5 +1,26 @@
 #include <stdio.h>
 
-void tpm_write(char* index, char* bytes){
+
-    printf("wip, index: %s, bytes: %s", index, bytes);
+/* ARGS:
+index = that what TPM2 index to read from, e.g: "0x1008"
+size = how many bytes should we read
+offset = how far into the index should we start reading
+authType = either owner, index, or platform
+indexPassword = if index authType is chosen, enter your indexPassword, otherwise pass nothing
+*/
+int tpm_nvwrite(char* index, char* bytes, char* offset, char* authType, char* indexPassword){
+    printf ("wip, index: %s, bytes: '%s', offset: %s, authType: %s, indexPassword: %s", index, bytes, offset, authType, indexPassword);
+    return 0;
+}
+
+
+/* ARGS:
+index = that what TPM2 index to read from, e.g: "0x1008"
+size = how many bytes should we read
+offset = how far into the index should we start reading
+authType = either owner, index, or platform
+indexPassword = if index authType is chosen, enter your indexPassword, otherwise pass nothing
+*/
+int tpm_nvread(char* index, char* size, char* offset, char* authType, char* indexPassword){
+    printf ("wip, index: %s, size: '%s', offset: %s, authType: %s, indexPassword: %s", index, size, offset, authType, indexPassword);
 }

src/KVS/ui.c

@@ -66,16 +66,16 @@ void ui_flash(char* flashtype) {
 
 	if (flashtype == "tpm0"){
 		if (!strcmp(structtype, "v0")) {
-			tpm_write("0x1008", kvgout_v0);
+			tpm_nvwrite("0x1008", kvgout_v0, "0", "platform", "");
 		} else if (!strcmp(structtype, "v1")) {
-			tpm_write("0x1008", kvgout_v1);
+			tpm_nvwrite("0x1008", kvgout_v1, "0", "platform", "");
 		}
 	} else if (flashtype == "rmasmoke"){
 		printf("using rmasmoke\n");
 	}
 }
 
-void ui_header(char* fwver, char* kernver, char* tpmver, char* fwmp, char* gscver, char* gsctype){
+void ui_header(const char* fwver, char* kernver, 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);