Skip to content

Some smaller build or warning fixes #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jan-kiszka wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Some smaller build or warning fixes #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcccc82
Do not build ExtMath_Debug_CompatibilityCheck if LIBRARY_COMPATIBILIT…
jan-kiszka Aug 18, 2025
9eafd9b
Avoid compiler warnings when -Wold-style-definition is used
jan-kiszka Aug 18, 2025
27028e9
Use correct header in TpmEcc_Util.c
jan-kiszka Aug 18, 2025
ea7b96b
Fix BN_WORD_INITIALIZED
jan-kiszka Aug 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions TPMCmd/Platform/src/VendorInfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ static uint32_t StringToUint32(char s[4])

// return the 4 character Manufacturer Capability code. This
// should come from the platform library since that is provided by the manufacturer
LIB_EXPORT uint32_t _plat__GetManufacturerCapabilityCode()
LIB_EXPORT uint32_t _plat__GetManufacturerCapabilityCode(void)
{
return StringToUint32(MANUFACTURER);
}
Expand All @@ -56,14 +56,14 @@ LIB_EXPORT uint32_t _plat__GetVendorCapabilityCode(int index)

// return the most-significant 32-bits of the TPM Firmware Version reported by
// getCapability.
LIB_EXPORT uint32_t _plat__GetTpmFirmwareVersionHigh()
LIB_EXPORT uint32_t _plat__GetTpmFirmwareVersionHigh(void)
{
return FIRMWARE_V1;
}

// return the least-significant 32-bits of the TPM Firmware Version reported by
// getCapability.
LIB_EXPORT uint32_t _plat__GetTpmFirmwareVersionLow()
LIB_EXPORT uint32_t _plat__GetTpmFirmwareVersionLow(void)
{
return FIRMWARE_V2;
}
Expand Down
2 changes: 2 additions & 0 deletions TPMCmd/tpm/cryptolibs/TpmBigNum/TpmBigNumThunks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@ LIB_EXPORT int ExtMath_LibInit(void)
return BnSupportLibInit();
}

#if LIBRARY_COMPATIBILITY_CHECK
//** MathLibraryCompatibililtyCheck()
// This function is only used during development to make sure that the library
// that is being referenced is using the same size of data structures as the TPM.
LIB_EXPORT BOOL ExtMath_Debug_CompatibilityCheck(void)
{
return BnMathLibraryCompatibilityCheck();
}
#endif

// ***************************************************************************
// Integer/Number Functions (non-ECC)
Expand Down
2 changes: 1 addition & 1 deletion TPMCmd/tpm/cryptolibs/TpmBigNum/include/BnValues.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ extern const bignum_t BnConstZero;
// This is used to create a word-size bigNum and initialize it with
// an input parameter to a function.
#define BN_WORD_INITIALIZED(name, initial) \
BN_STRUCT(RADIX_BITS) name##_; \
BN_STRUCT(name, RADIX_BITS) name##_; \
bigNum name = BnInitializeWord( \
(bigNum) & name##_, BN_STRUCT_ALLOCATION(RADIX_BITS), initial)

Expand Down
8 changes: 4 additions & 4 deletions TPMCmd/tpm/include/platform_interface/tpm_to_platform_interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ LIB_EXPORT void _plat__GetPlatformManufactureData(uint8_t* pPlatformPersistentDa

// return the 4 character Manufacturer Capability code. This
// should come from the platform library since that is provided by the manufacturer
LIB_EXPORT uint32_t _plat__GetManufacturerCapabilityCode();
LIB_EXPORT uint32_t _plat__GetManufacturerCapabilityCode(void);

// return the 4 character VendorStrings for Capabilities.
// Index is ONE-BASED, and may be in the range [1,4] inclusive.
Expand All @@ -335,11 +335,11 @@ LIB_EXPORT uint32_t _plat__GetVendorCapabilityCode(int index);

// return the most-significant 32-bits of the TPM Firmware Version reported by
// getCapability.
LIB_EXPORT uint32_t _plat__GetTpmFirmwareVersionHigh();
LIB_EXPORT uint32_t _plat__GetTpmFirmwareVersionHigh(void);

// return the least-significant 32-bits of the TPM Firmware Version reported by
// getCapability.
LIB_EXPORT uint32_t _plat__GetTpmFirmwareVersionLow();
LIB_EXPORT uint32_t _plat__GetTpmFirmwareVersionLow(void);

// return the TPM Firmware's current SVN.
LIB_EXPORT uint16_t _plat__GetTpmFirmwareSvn(void);
Expand Down Expand Up @@ -377,7 +377,7 @@ LIB_EXPORT int _plat__GetTpmFirmwareSecret(
#endif // FW_LIMITED_SUPPORT

// return the TPM Type returned by TPM_PT_VENDOR_TPM_TYPE
LIB_EXPORT uint32_t _plat__GetTpmType();
LIB_EXPORT uint32_t _plat__GetTpmType(void);

// platform PCR initialization functions
#include <platform_interface/prototypes/platform_pcr_fp.h>
Expand Down
4 changes: 2 additions & 2 deletions TPMCmd/tpm/src/crypt/ecc/TpmEcc_Util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// This file contains utility functions to help using the external Math library
// for Ecc functions.
#include "Tpm.h"
#include "TpmMath_Util_fp.h"
#include "TpmEcc_Util_fp.h"

#if ALG_ECC

Expand Down Expand Up @@ -59,4 +59,4 @@ LIB_EXPORT BOOL TpmEcc_PointTo2B(
ecP, p->x.t.buffer, &p->x.t.size, p->y.t.buffer, &p->y.t.size);
}

#endif // ALG_ECC
#endif // ALG_ECC