Skip to content

tpm2: configure vendor/manufacturer values #369

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
ben-dav-lytle wants to merge 3 commits into
base: master
Choose a base branch
from
Open

tpm2: configure vendor/manufacturer values #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12da931
tpm2: configure vendor/manufacturer values
ben-dav-lytle Apr 19, 2023
caae296
Merge branch 'master' into generic_manufacturer
ben-dav-lytle Apr 19, 2023
51f1f7f
tpm2: use current default values
ben-dav-lytle Apr 24, 2023
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
82 changes: 82 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,88 @@ AC_CONFIG_FILES(Makefile \
PKG_INSTALLDIR()
AC_OUTPUT

AC_ARG_WITH([manufacturer],
AS_HELP_STRING([--with-manufacturer=MANUFACTURER],[The manufacturer name]),
[use_manufacturer="$withval"],
[use_manufacturer=""]
)

if ! test "x$use_manufacturer" = "x"; then
CFLAGS="$CFLAGS -DCONFIG_MANUFACTURER=$use_manufacturer"
fi

AC_ARG_WITH([tpm-vendor-id],
AS_HELP_STRING([--with-tpm-vendor-id=VENDOR_ID],[The TPM vendor id in hex, with leading '0x']),
[use_vendor_id="$withval"],
[use_vendor_id=""]
)

if ! test "x$use_vendor_id" = "x"; then
CFLAGS="$CFLAGS -DMANUFACTURER_ID=$use_vendor_id"
fi

AC_ARG_WITH([vendor-string-1],
AS_HELP_STRING([--with-vendor-string-1=VENDOR_STRING_1],[The first 4-byte vendor string]),
[use_vendor_string_1="$withval"],
[use_vendor_string_1=""]
)

if ! test "x$use_vendor_string_1" = "x"; then
CFLAGS="$CFLAGS -DCONFIG_VENDOR_STRING_1=$use_vendor_string_1"
fi

AC_ARG_WITH([vendor-string-2],
AS_HELP_STRING([--with-vendor-string-2=VENDOR_STRING_2],[The second 4-byte vendor string]),
[use_vendor_string_2="$withval"],
[use_vendor_string_2=""]
)

if ! test "x$use_vendor_string_2" = "x"; then
CFLAGS="$CFLAGS -DCONFIG_VENDOR_STRING_2=$use_vendor_string_2"
fi

AC_ARG_WITH([vendor-string-3],
AS_HELP_STRING([--with-vendor-string-3=VENDOR_STRING_3],[The third 4-byte vendor string]),
[use_vendor_string_3="$withval"],
[use_vendor_string_3=""]
)

if ! test "x$use_vendor_string_3" = "x"; then
CFLAGS="$CFLAGS -DCONFIG_VENDOR_STRING_3=$use_vendor_string_3"
fi

AC_ARG_WITH([vendor-string-4],
AS_HELP_STRING([--with-vendor-string-4=VENDOR_STRING_4],[The fourth 4-byte vendor string]),
[use_vendor_string_4="$withval"],
[use_vendor_string_4=""]
)

if ! test "x$use_vendor_string_4" = "x"; then
CFLAGS="$CFLAGS -DCONFIG_VENDOR_STRING_4=$use_vendor_string_4"
fi

AC_ARG_WITH([firmware-v1],
AS_HELP_STRING([--with-firmware-v1=FIRMWARE_V1],[The more significant 32-bits of a vendor-specific value indicating the
version of the firmware in hex, without leading '0x']),
[use_firmware_v1="$withval"],
[use_firmware_v1=""]
)

if ! test "x$use_firmware_v1" = "x"; then
CFLAGS="$CFLAGS -DFIRMWARE_V1=0x$use_firmware_v1"
fi

AC_ARG_WITH([firmware-v2],
AS_HELP_STRING([--with-firmware-v2=FIRMWARE_V2],[The least significant 32-bits of a vendor-specific value indicating the
version of the firmware in hex, without leading '0x']),
[use_firmware_v2="$withval"],
[use_firmware_v2=""]
)

if ! test "x$use_firmware_v2" = "x"; then
CFLAGS="$CFLAGS -DFIRMWARE_V2=0x$use_firmware_v2"
fi

if test -z "$enable_debug" ; then
enable_debug="no"
fi
Expand Down
82 changes: 50 additions & 32 deletions src/tpm2/VendorString.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,47 +62,65 @@
#ifndef VENDORSTRING_H
#define VENDORSTRING_H

/* Define up to 4-byte values for MANUFACTURER. This value defines the response for
TPM_PT_MANUFACTURER in TPM2_GetCapability(). The following line should be un-commented and a
vendor specific string should be provided here. */
#define MANUFACTURER "IBM"
#include "tpm_library_intern.h"

/* The following #if macro may be deleted after a proper MANUFACTURER is provided. */
#ifndef MANUFACTURER
#error MANUFACTURER is not provided. \
Please modify VendorString.h to provide a specific \
manufacturer name.
/* To customize the MANUFACTURER macro, use the configure option "--with-manufacturer=XXXX"
Define up to a 4-byte string for MANUFACTURER. This string defines the response for
TPM_PT_MANUFACTURER in TPM2_GetCapability().
Must be in the TPM Vendor ID Registry: https://trustedcomputinggroup.org/resource/vendor-id-registry/ */
#ifndef CONFIG_MANUFACTURER
#define MANUFACTURER "IBM"
#else
#define MANUFACTURER STRINGIFY(CONFIG_MANUFACTURER)
#endif
_Static_assert(sizeof(MANUFACTURER) - 1U <= 4U, "MANUFACTURER string can be up to 4-bytes");

/* Define up to 4, 4-byte, vendor-specific values. The values must each be 4 bytes long and the
last value used may contain trailing zeros. These values define the response for
TPM_PT_VENDOR_STRING_(1-4) in TPM2_GetCapability(). The following line should be un-commented
and a vendor specific string. The vendor strings 2-4 may also be defined as appropriate. */

#define VENDOR_STRING_1 "SW "
#define VENDOR_STRING_2 " TPM"
//#define VENDOR_STRING_3
//#define VENDOR_STRING_4
/* To customize the MANUFACTURER_ID macro, use the configure option "--with-manufacturer-id=XXXX"
Define up to a 4-byte hex value for MANUFACTURER_ID. This value defines the response for
manufacturer in TPMAttributes for TPM2_GetInfo().
Must be in the TPM Vendor ID Registry: https://trustedcomputinggroup.org/resource/vendor-id-registry/ */
#ifndef MANUFACTURER_ID
#define MANUFACTURER_ID 0x1014
#endif
_Static_assert((sizeof(MANUFACTURER_ID) <= 4U), "MANUFACTURER_ID can be up to 4-bytes");

/* The following #if macro may be deleted after a proper VENDOR_STRING_1 is provided. */
#ifndef VENDOR_STRING_1
#error VENDOR_STRING_1 is not provided. \
Please modify VendorString.h to provide a vendor specific string.
/* To customize the VENDOR_STRING_[1-4] macros, use the configure options "--with-vendor-string-[1-4]=XXXX"
Define up to 4, 4-byte, vendor-specific strings. The strings must each be 4 bytes long.
These values define the response for TPM_PT_VENDOR_STRING_(1-4) in TPM2_GetCapability(). */
#ifndef CONFIG_VENDOR_STRING_1
#define VENDOR_STRING_1 "SW "
#define VENDOR_STRING_2 " TPM"
#else
#define VENDOR_STRING_1 STRINGIFY(CONFIG_VENDOR_STRING_1)
#endif
_Static_assert(sizeof(VENDOR_STRING_1) - 1U == 4U, "VENDOR_STRING_1 must be 4-bytes");

/* the more significant 32-bits of a vendor-specific value indicating the version of the firmware
The following line should be un-commented and a vendor specific firmware V1 should be provided
here. The FIRMWARE_V2 may also be defined as appropriate. */
#define FIRMWARE_V1 (0x20191023)
#ifdef CONFIG_VENDOR_STRING_2
Copy link
Owner

@stefanberger stefanberger Apr 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would have to have a default of " TPM".

#define VENDOR_STRING_2 STRINGIFY(CONFIG_VENDOR_STRING_2)
#endif
_Static_assert(sizeof(VENDOR_STRING_2) - 1U == 4U, "VENDOR_STRING_2 must be 4-bytes");

// the less significant 32-bits of a vendor-specific value indicating the version of the firmware
#define FIRMWARE_V2 (0x00163636)
#ifdef CONFIG_VENDOR_STRING_3
#define VENDOR_STRING_3 STRINGIFY(CONFIG_VENDOR_STRING_3)
_Static_assert(sizeof(VENDOR_STRING_3) - 1U == 4U, "VENDOR_STRING_3 must be 4-bytes");
#endif
#ifdef CONFIG_VENDOR_STRING_4
#define VENDOR_STRING_4 STRINGIFY(CONFIG_VENDOR_STRING_4)
_Static_assert(sizeof(VENDOR_STRING_4) - 1U == 4U, "VENDOR_STRING_4 must be 4-bytes");
#endif

// The following #if macro may be deleted after a proper FIRMWARE_V1 is provided.
/* To customize the FIRMWARE_V[1-2] macros, use the configure options "--with-firmware-v[1-2]=XXXX"
Define the more significant 32-bits of a vendor-specific value indicating the
version of the firmware in FIRMWARE_V1. The less significant 32-bits of a vendor-specific
value indicating the version of the firmware can use the FIRMWARE_V2 macro. */
#ifndef FIRMWARE_V1
#error FIRMWARE_V1 is not provided. \
Please modify VendorString.h to provide a vendor specific firmware \
version
#define FIRMWARE_V1 (0x20191023)
#endif
_Static_assert(sizeof(FIRMWARE_V1) == 4U, "FIRMWARE_V1 must be 4-bytes");

#ifndef FIRMWARE_V2
#define FIRMWARE_V2 (0x00163636)
#endif
_Static_assert(sizeof(FIRMWARE_V2) == 4U, "FIRMWARE_V2 must be 4-bytes");

#endif
4 changes: 2 additions & 2 deletions src/tpm_tpm2_interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ static char *TPM2_GetInfo(enum TPMLIB_InfoFlags flags)
"}";
const char *tpmattrs_temp =
"\"TPMAttributes\":{"
"\"manufacturer\":\"id:00001014\","
"\"manufacturer\":\"id:%08X\","
"\"version\":\"id:%08X\","
"\"model\":\"swtpm\""
"}";
Expand Down Expand Up @@ -398,7 +398,7 @@ static char *TPM2_GetInfo(enum TPMLIB_InfoFlags flags)
if ((flags & TPMLIB_INFO_TPMATTRIBUTES)) {
fmt = buffer;
buffer = NULL;
if (asprintf(&tpmattrs, tpmattrs_temp, FIRMWARE_V1) < 0)
if (asprintf(&tpmattrs, tpmattrs_temp, MANUFACTURER_ID, FIRMWARE_V1) < 0)
goto error;
if (asprintf(&buffer, fmt, printed ? "," : "",
tpmattrs, "%s%s%s") < 0)
Expand Down