diff -ur ./lib/Makefile.am /home/sgrubb/working/BUILD/tpm-tools/lib/Makefile.am
--- ./lib/Makefile.am 2011-09-19 10:12:49.000000000 -0400
+++ /home/sgrubb/working/BUILD/tpm-tools/lib/Makefile.am 2011-09-19 10:32:47.000000000 -0400
@@ -52,7 +52,7 @@
noinst_LTLIBRARIES += libtpm_pkcs11.la
libtpm_pkcs11_la_SOURCES= tpm_pkcs11.c
-libtpm_pkcs11_la_LIBADD = libtpm_utils.la
+libtpm_pkcs11_la_LIBADD = libtpm_utils.la -ldl
endif
#
diff -ur ./lib/tpm_tspi.c /home/sgrubb/working/BUILD/tpm-tools/lib/tpm_tspi.c
--- ./lib/tpm_tspi.c 2011-09-19 10:12:49.000000000 -0400
+++ /home/sgrubb/working/BUILD/tpm-tools/lib/tpm_tspi.c 2011-09-19 10:26:38.000000000 -0400
@@ -702,14 +702,14 @@
unloadNVDataPublic(UINT64 *offset, BYTE *blob, UINT32 blob_len, TPM_NV_DATA_PUBLIC *v)
{
UINT64 off = *offset;
- TSS_RESULT result;
- result = Trspi_UnloadBlob_NV_DATA_PUBLIC(&off, blob, NULL);
+ TSS_RESULT result = TSS_SUCCESS;
+/* result = Trspi_UnloadBlob_NV_DATA_PUBLIC(&off, blob, NULL);
if (result == TSS_SUCCESS) {
if (off > blob_len)
return TSS_E_BAD_PARAMETER;
result = Trspi_UnloadBlob_NV_DATA_PUBLIC(offset, blob, v);
}
- tspiResult("Trspi_UnloadBlob_NV_DATA_PUBLIC", result);
+ tspiResult("Trspi_UnloadBlob_NV_DATA_PUBLIC", result); */
return result;
}
diff -ur ./src/tpm_mgmt/Makefile.am /home/sgrubb/working/BUILD/tpm-tools/src/tpm_mgmt/Makefile.am
--- ./src/tpm_mgmt/Makefile.am 2011-09-19 10:12:49.000000000 -0400
+++ /home/sgrubb/working/BUILD/tpm-tools/src/tpm_mgmt/Makefile.am 2011-09-19 10:23:59.000000000 -0400
@@ -21,6 +21,8 @@
# http://www.opensource.org/licenses/cpl1.0.php.
#
+noinst_HEADERS = tpm_nvcommon.h
+
noinst_PROGRAMS = tpm_startup \
tpm_reset