Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-02-04 17:15:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

QEMU CSP Config: PCRs -> Measurements

Browse Source 
Signed-off-by: Malte Poll <mp@edgeless.systems>
This commit is contained in:
Malte Poll 2022-05-13 13:12:43 +02:00 committed by Malte Poll
parent c679526bae
commit 3b30291360
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/cloud/cloudcmd/validators.go
View File

@ -80,7 +80,7 @@ func (v *Validators) setPCRs(config *config.Config) error {
} }
v.pcrs = azurePCRs v.pcrs = azurePCRs
case cloudprovider.QEMU: case cloudprovider.QEMU:
qemuPCRs := *config.Provider.QEMU.PCRs qemuPCRs := *config.Provider.QEMU.Measurements
if err := v.checkPCRs(qemuPCRs); err != nil { if err := v.checkPCRs(qemuPCRs); err != nil {
return err return err
} }

2
cli/cloud/cloudcmd/validators_test.go
View File

@ -77,7 +77,7 @@ func TestNewValidators(t *testing.T) {
} }
if tc.provider == cloudprovider.QEMU { if tc.provider == cloudprovider.QEMU {
measurements := config.Measurements(tc.pcrs) measurements := config.Measurements(tc.pcrs)
conf.Provider.QEMU = &config.QEMUConfig{PCRs: &measurements} conf.Provider.QEMU = &config.QEMUConfig{Measurements: &measurements}
} }
validators, err := NewValidators(tc.provider, conf) validators, err := NewValidators(tc.provider, conf)

4
internal/config/config.go
View File

@ -198,7 +198,7 @@ func Default() *Config {
Measurements: &gcpPCRs, Measurements: &gcpPCRs,
}, },
QEMU: &QEMUConfig{ QEMU: &QEMUConfig{
PCRs: &qemuPCRs, Measurements: &qemuPCRs,
}, },
}, },
} }
@ -260,7 +260,7 @@ type GCPConfig struct {
} }
type QEMUConfig struct { type QEMUConfig struct {
PCRs *Measurements `yaml:"pcrs,omitempty"` Measurements *Measurements `yaml:"measurements,omitempty"`
} }
// intPtr returns a pointer to the copied value of in. // intPtr returns a pointer to the copied value of in.