mirrors/talos
1
0
Fork 0
mirror of https://github.com/siderolabs/talos.git synced 2025-10-26 14:01:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: skip over tpm2 1.2 devices

Browse Source 
For rng seed and pcr extend, let's ignore if the device is not TPM2.0
based. Seal/Unseal operations would still error out since it's
explicitly user enabled feature.

Signed-off-by: Noel Georgi <git@frezbo.dev>
This commit is contained in:
Noel Georgi 2023-07-18 12:58:45 +05:30
parent 6716e7bc0b
commit 14966e718a
No known key found for this signature in database
GPG Key ID: 21A9F444075C9E36
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/pkg/rng/tpm.go
View File

@ -8,6 +8,7 @@ import (
"fmt" "fmt"
"log" "log"
"os" "os"
"strings"
"time" "time"
"github.com/google/go-tpm/tpm2" "github.com/google/go-tpm/tpm2"
@ -20,7 +21,8 @@ import (
func TPMSeed() error { func TPMSeed() error {
t, err := transport.OpenTPM() t, err := transport.OpenTPM()
if err != nil { if err != nil {
if os.IsNotExist(err) { // if the TPM is not available or not a TPM 2.0, we can skip the PCR extension
if os.IsNotExist(err) || strings.Contains(err.Error(), "device is not a TPM 2.0") {
log.Printf("TPM device is not available") log.Printf("TPM device is not available")
return nil return nil

4
internal/pkg/secureboot/tpm2/pcr.go
View File

@ -12,6 +12,7 @@ import (
"fmt" "fmt"
"log" "log"
"os" "os"
"strings"
"github.com/google/go-tpm/tpm2" "github.com/google/go-tpm/tpm2"
"github.com/google/go-tpm/tpm2/transport" "github.com/google/go-tpm/tpm2/transport"
@ -66,7 +67,8 @@ func ReadPCR(t transport.TPM, pcr int) ([]byte, error) {
func PCRExtent(pcr int, data []byte) error { func PCRExtent(pcr int, data []byte) error {
t, err := transport.OpenTPM() t, err := transport.OpenTPM()
if err != nil { if err != nil {
if os.IsNotExist(err) { // if the TPM is not available or not a TPM 2.0, we can skip the PCR extension
if os.IsNotExist(err) || strings.Contains(err.Error(), "device is not a TPM 2.0") {
log.Printf("TPM device is not available, skipping PCR extension") log.Printf("TPM device is not available, skipping PCR extension")
return nil return nil