Makefile.am

@@ -63,6 +63,16 @@ bin_PROGRAMS = \
     tools/tpm2_getpubek \
     tools/tpm2_getrandom \
     tools/tpm2_hmac \
+    tools/tpm2_listpersistent \
+    tools/tpm2_load \
+    tools/tpm2_loadexternal \
+    tools/tpm2_makecredential \
+    tools/tpm2_nvdefine \
+    tools/tpm2_nvlist \
+    tools/tpm2_nvread \
+    tools/tpm2_nvreadlock \
+    tools/tpm2_nvrelease \
+    tools/tpm2_nvwrite \
     tools/tpm2_send_command \
     tools/tpm2_sign \
     tools/tpm2_startup \
@@ -71,16 +81,6 @@ bin_PROGRAMS = \
     tools/tpm2_verifysignature
 
 # NEED TO PORT
-#    tools/tpm2_listpersistent \
-#    tools/tpm2_load \
-#    tools/tpm2_loadexternal \
-#    tools/tpm2_makecredential \
-#    tools/tpm2_nvdefine \
-#    tools/tpm2_nvlist \
-#    tools/tpm2_nvread \
-#    tools/tpm2_nvreadlock \
-#    tools/tpm2_nvrelease \
-#    tools/tpm2_nvwrite \
 #    tools/tpm2_pcrevent \
 #    tools/tpm2_pcrextend \
 #    tools/tpm2_pcrlist \

lib/tpm2_options.c

@@ -97,7 +97,7 @@ tpm2_options *tpm2_options_new(const char *short_opts, size_t len,
     }
 
     opts->short_opts = strdup(short_opts);
-    if (!opts) {
+    if (!opts->short_opts) {
         LOG_ERR("oom");
         free(opts);
         return NULL;

tools/tpm2_listpersistent.c

@@ -34,9 +34,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <limits.h>
 #include <ctype.h>
-#include <getopt.h>
 
 #include <sapi/tpm20.h>
 
@@ -77,17 +75,9 @@ int readPublic(TSS2_SYS_CONTEXT *sapi_context,
     return 0;
 }
 
-int
-execute_tool (int              argc,
-              char             *argv[],
-              char             *envp[],
-              common_opts_t    *opts,
-              TSS2_SYS_CONTEXT *sapi_context)
-{
-    (void) opts;
-    (void) envp;
-    (void) argc;
-    (void) argv;
+int tpm2_tool_onrun(TSS2_SYS_CONTEXT *sapi_context, tpm2_option_flags flags) {
+
+    UNUSED(flags);
 
     TPMI_YES_NO moreData;
     TPMS_CAPABILITY_DATA capabilityData;