QEMU CSP Config: PCRs -> Measurements

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

View File

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

View File

@ -77,7 +77,7 @@ func TestNewValidators(t *testing.T) {
}
if tc.provider == cloudprovider.QEMU {
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)

View File

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