Skip to content

Commit

Permalink
Fail enroll-keys if any key file does not exist
Browse files Browse the repository at this point in the history
Fixes #20
  • Loading branch information
Hugo Osvaldo Barrera committed Apr 3, 2022
1 parent 3c0ddb5 commit 9f70508
Showing 1 changed file with 25 additions and 6 deletions.
31 changes: 25 additions & 6 deletions cmd/sbctl/enroll-keys.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,30 @@ var (
func KeySync(guid util.EFIGUID, keydir string, oems []string) error {
var sigdb *signature.SignatureDatabase

PKKey, _ := os.ReadFile(filepath.Join(keydir, "PK", "PK.key"))
PKPem, _ := os.ReadFile(filepath.Join(keydir, "PK", "PK.pem"))
KEKKey, _ := os.ReadFile(filepath.Join(keydir, "KEK", "KEK.key"))
KEKPem, _ := os.ReadFile(filepath.Join(keydir, "KEK", "KEK.pem"))
dbPem, _ := os.ReadFile(filepath.Join(keydir, "db", "db.pem"))
PKKey, err := os.ReadFile(filepath.Join(keydir, "PK", "PK.key"))
if err != nil {
return err
}

PKPem, err := os.ReadFile(filepath.Join(keydir, "PK", "PK.pem"))
if err != nil {
return err
}

KEKKey, err := os.ReadFile(filepath.Join(keydir, "KEK", "KEK.key"))
if err != nil {
return err
}

KEKPem, err := os.ReadFile(filepath.Join(keydir, "KEK", "KEK.pem"))
if err != nil {
return err
}

dbPem, err := os.ReadFile(filepath.Join(keydir, "db", "db.pem"))
if err != nil {
return err
}

sigdb = signature.NewSignatureDatabase()
sigdb.Append(signature.CERT_X509_GUID, guid, dbPem)
Expand Down Expand Up @@ -98,7 +117,7 @@ func RunEnrollKeys(cmd *cobra.Command, args []string) error {
return err
}
}
if !(enrollKeysCmdOptions.Force || enrollKeysCmdOptions.TPMEventlogChecksums || enrollKeysCmdOptions.MicrosoftKeys) {
if (!enrollKeysCmdOptions.Force && !enrollKeysCmdOptions.TPMEventlogChecksums && !enrollKeysCmdOptions.MicrosoftKeys) {
if err := sbctl.CheckEventlogOprom(systemEventlog); err != nil {
return err
}
Expand Down

0 comments on commit 9f70508

Please sign in to comment.