Changeset 109006 in vbox

Timestamp:

Apr 16, 2025 3:00:58 PM (4 days ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168531

Message:

libs/libtpms-0.10.0: Make it build, jiraref:VBP-1631

Location:

trunk/src/libs/libtpms-0.10.0

Files:

• Makefile.kmk (modified) (6 diffs)
• src/tpm2/crypto/openssl/TpmToOsslHash.h (modified) (1 diff)
• src/tpm_nvfile.c (modified) (2 diffs)

trunk/src/libs/libtpms-0.10.0/Makefile.kmk

@@ -134 +134 @@
         src/tpm2/AuditCommands.c \
         src/tpm2/Bits.c \
+        src/tpm2/BnEccConstants.c \
         src/tpm2/BnConvert.c \
         src/tpm2/BnMath.c \
@@ -159 +160 @@
         src/tpm2/EphemeralCommands.c \
         src/tpm2/ExecCommand.c \
+        src/tpm2/ExtraData.c \
         src/tpm2/Global.c \
         src/tpm2/Handle.c \
@@ -184 +186 @@
         src/tpm2/PlatformACT.c \
         src/tpm2/PlatformData.c \
+        src/tpm2/PlatformPCR.c \
         src/tpm2/Policy_spt.c \
         src/tpm2/Power.c \
@@ -205 +208 @@
         src/tpm2/Time.c \
         src/tpm2/TpmAsn1.c \
+        src/tpm2/TpmBigNumThunks.c \
+        src/tpm2/TpmEcc_Signature_ECDAA.c \
+        src/tpm2/TpmEcc_Signature_ECDSA.c \
+        src/tpm2/TpmEcc_Signature_Schnorr.c \
+        src/tpm2/TpmEcc_Signature_SM2.c \
+        src/tpm2/TpmEcc_Signature_Util.c \
+        src/tpm2/TpmEcc_Util.c \
+        src/tpm2/TpmMath_Debug.c \
+        src/tpm2/TpmMath_Util.c \
         src/tpm2/TpmSizeChecks.c \
         src/tpm2/TPMCmdp.c \
@@ -210 +222 @@
         src/tpm2/Unique.c \
         src/tpm2/Unmarshal.c \
+        src/tpm2/VendorInfo.c \
         src/tpm2/Vendor_TCG_Test.c \
         src/tpm2/X509_ECC.c \
         src/tpm2/X509_RSA.c \
         src/tpm2/X509_spt.c \
+        src/tpm2/BackwardsCompatibilityBitArray.c \
         src/tpm2/BackwardsCompatibilityObject.c \
         src/tpm2/LibtpmsCallbacks.c \
         src/tpm2/NVMarshal.c \
+        src/tpm2/RuntimeAlgorithm.c \
+        src/tpm2/RuntimeAttributes.c \
+        src/tpm2/RuntimeCommands.c \
+        src/tpm2/RuntimeProfile.c \
         src/tpm2/StateMarshal.c \
         src/tpm2/Volatile.c \
@@ -222 +240 @@
         src/tpm2/crypto/openssl/CryptCmac.c \
         src/tpm2/crypto/openssl/CryptDes.c \
+        src/tpm2/crypto/openssl/CryptEccCrypt.c \
         src/tpm2/crypto/openssl/CryptEccKeyExchange.c \
         src/tpm2/crypto/openssl/CryptEccMain.c \

trunk/src/libs/libtpms-0.10.0/src/tpm2/crypto/openssl/TpmToOsslHash.h

@@ -96 +96 @@
 
 #include <openssl/ossl_typ.h>
+
+#if defined(VBOX)
+/*
+ * Our openssl symbol mangling clashes with teh defines below prefixing them with VBox_
+ * which of course breaks everything else... Lets just hope libtpms doesn't call SHA512(), etc.
+ */
+# undef SHA1
+# undef SHA256
+# undef SHA384
+# undef SHA512
+# undef HMAC
+#endif
 
 //***************************************************************

trunk/src/libs/libtpms-0.10.0/src/tpm_nvfile.c

@@ -114 +114 @@
 #endif
 
+#ifndef VBOX
     printf(" TPM_NVRAM_Init:\n");
 #ifdef TPM_NV_DISK
@@ -141 +142 @@
     }
     return rc;
+#else
+    return TPM_FAIL;
+#endif
 }