Merge pull request #670 from smallstep/herman/fix-tpm-manufacturer-as…

…cii-lookup Fix TPM manufacturer lookup for names with a space (`0x20`) character
smallstep · Jan 9, 2025 · ecbfacf · ecbfacf
2 parents 466f9a5 + 4519939
commit ecbfacf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/tpm/info.go b/tpm/info.go
@@ -104,9 +104,9 @@ type Manufacturer struct {
 // String returns a textual representation of the TPM
 // manufacturer. An example looks like this:
 //
-//	ST Microelectronics (STM, 53544D20, 1398033696)
+//	ST Microelectronics (<STM >, 53544D20, 1398033696)
 func (m Manufacturer) String() string {
-	return fmt.Sprintf("%s (%s, %s, %d)", m.Name, m.ASCII, m.Hex, m.ID)
+	return fmt.Sprintf("%s (<%s>, %s, %d)", m.Name, m.ASCII, m.Hex, m.ID)
 }
 
 // GetManufacturerByID returns a Manufacturer based on its Manufacturer ID

diff --git a/tpm/info_test.go b/tpm/info_test.go
@@ -83,11 +83,11 @@ func Test_GetManufacturerByID(t *testing.T) {
 func TestManufacturer_String(t *testing.T) {
 	m := Manufacturer{
 		Name:  "ST Microelectronics",
-		ASCII: "STM",
+		ASCII: "STM ",
 		ID:    1398033696,
 		Hex:   "53544D20",
 	}
-	want := "ST Microelectronics (STM, 53544D20, 1398033696)"
+	want := "ST Microelectronics (<STM >, 53544D20, 1398033696)"
 	if got := m.String(); got != want {
 		t.Errorf("Manufacturer.String() = %v, want %v", got, want)
 	}

diff --git a/tpm/manufacturer/manufacturers.go b/tpm/manufacturer/manufacturers.go
@@ -38,7 +38,7 @@ func GetEncodings(id ID) (ascii, hexa string) {
 // GetNameByASCII returns the manufacturer name based on its
 // ASCII identifier.
 func GetNameByASCII(ascii string) string {
-	if name, ok := manufacturerByASCII[ascii]; ok {
+	if name, ok := manufacturerByASCII[strings.TrimSpace(ascii)]; ok {
 		return name
 	}
 	return "unknown"

diff --git a/tpm/manufacturer/manufacturers_test.go b/tpm/manufacturer/manufacturers_test.go
@@ -15,6 +15,7 @@ func Test_GetEncodings(t *testing.T) {
 	}{
 		{"infineon", 1229346816, "IFX"},
 		{"intel", 1229870147, "INTC"},
+		{"stm", 1398033696, "STM "},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -33,6 +34,7 @@ func Test_GetNameByASCII(t *testing.T) {
 	}{
 		{"infineon", "IFX", "Infineon"},
 		{"intel", "INTC", "Intel"},
+		{"stm", "STM ", "ST Microelectronics"},
 		{"unknown", "0000", "unknown"},
 	}
 	for _, tt := range tests {