Skip to content

Force import #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Force import #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
889325e
feat(rotate): enable partial rotation and providing different sources
RiSKeD Aug 7, 2023
31c1228
feat(dbx): enroll/rotate/reset dbx keys
RiSKeD Aug 9, 2023
e9034d2
feat: import force flag
RiSKeD Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion cmd/sbctl/enroll-keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ type EnrollKeysCmdOptions struct {
var (
systemEventlog = "/sys/kernel/security/tpm0/binary_bios_measurements"
enrollKeysCmdOptions = EnrollKeysCmdOptions{
Partial: stringset.StringSet{Allowed: []string{"PK", "KEK", "db"}},
Partial: stringset.StringSet{Allowed: []string{"PK", "KEK", "db", "dbx"}},
Export: stringset.StringSet{Allowed: []string{"esl", "auth"}},
}
enrollKeysCmd = &cobra.Command{
Expand Down Expand Up @@ -88,12 +88,22 @@ func KeySync(guid util.EFIGUID, keydir string, oems []string) error {
return err
}

dbxPem, err := fs.ReadFile(filepath.Join(keydir, "dbx", "dbx.pem"))
if err != nil {
return err
}

// Create the signature databases
sigdb := signature.NewSignatureDatabase()
if err = sigdb.Append(signature.CERT_X509_GUID, guid, dbPem); err != nil {
return err
}

sigdbx := signature.NewSignatureDatabase()
if err = sigdbx.Append(signature.CERT_X509_GUID, guid, dbxPem); err != nil {
return err
}

sigkek := signature.NewSignatureDatabase()
if err = sigkek.Append(signature.CERT_X509_GUID, guid, KEKPem); err != nil {
return err
Expand Down Expand Up @@ -178,6 +188,12 @@ func KeySync(guid util.EFIGUID, keydir string, oems []string) error {
if err != nil {
return err
}

sigdbx, err := sbctl.SignDatabase(sigdbx, KEKKey, KEKPem, "dbx")
if err != nil {
return err
}

sigkek, err := sbctl.SignDatabase(sigkek, PKKey, PKPem, "KEK")
if err != nil {
return err
Expand All @@ -189,6 +205,9 @@ func KeySync(guid util.EFIGUID, keydir string, oems []string) error {
if err := fs.WriteFile("db.auth", sigdb, 0o644); err != nil {
return err
}
if err := fs.WriteFile("dbx.auth", sigdbx, 0o644); err != nil {
return err
}
if err := fs.WriteFile("KEK.auth", sigkek, 0o644); err != nil {
return err
}
Expand All @@ -200,6 +219,9 @@ func KeySync(guid util.EFIGUID, keydir string, oems []string) error {
if err := fs.WriteFile("db.esl", sigdb.Bytes(), 0o644); err != nil {
return err
}
if err := fs.WriteFile("dbx.esl", sigdbx.Bytes(), 0o644); err != nil {
return err
}
if err := fs.WriteFile("KEK.esl", sigkek.Bytes(), 0o644); err != nil {
return err
}
Expand All @@ -216,6 +238,10 @@ func KeySync(guid util.EFIGUID, keydir string, oems []string) error {
if err := sbctl.Enroll(sigdb, KEKKey, KEKPem, value); err != nil {
return err
}
case "dbx":
if err := sbctl.Enroll(sigdbx, KEKKey, KEKPem, value); err != nil {
return err
}
case "KEK":
if err := sbctl.Enroll(sigkek, PKKey, PKPem, value); err != nil {
return err
Expand All @@ -234,6 +260,9 @@ func KeySync(guid util.EFIGUID, keydir string, oems []string) error {
if err := sbctl.Enroll(sigdb, KEKKey, KEKPem, "db"); err != nil {
return err
}
if err := sbctl.Enroll(sigdbx, KEKKey, KEKPem, "dbx"); err != nil {
return err
}
if err := sbctl.Enroll(sigkek, PKKey, PKPem, "KEK"); err != nil {
return err
}
Expand Down
26 changes: 19 additions & 7 deletions cmd/sbctl/import-keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ type ImportKeysCmdOptions struct {
Force bool
DbCert string
DbKey string
DbxCert string
DbxKey string
KEKCert string
KEKKey string
PKCert string
Expand Down Expand Up @@ -52,6 +54,8 @@ func ImportKeysFromDirectory(dir string) error {
"KEK/KEK.pem",
"db/db.key",
"db/db.pem",
"dbx/dbx.key",
"dbx/dbx.pem",
}
dir, err := filepath.Abs(dir)
if err != nil {
Expand All @@ -76,12 +80,13 @@ func ImportKeysFromDirectory(dir string) error {

func RunImportKeys(cmd *cobra.Command, args []string) error {
var err error
var keypairs = []struct {
keypairs := []struct {
Type string
Key string
Cert string
}{
{"db", importKeysCmdOptions.DbKey, importKeysCmdOptions.DbCert},
{"dbx", importKeysCmdOptions.DbxKey, importKeysCmdOptions.DbxCert},
{"KEK", importKeysCmdOptions.KEKKey, importKeysCmdOptions.KEKCert},
{"PK", importKeysCmdOptions.PKKey, importKeysCmdOptions.PKCert},
}
Expand All @@ -102,15 +107,20 @@ func RunImportKeys(cmd *cobra.Command, args []string) error {
return fmt.Errorf("keyfile %s does not exist", s)
}
}
if _, err := util.ReadCertFromFile(key.Cert); err != nil {
return fmt.Errorf("invalid certificate file")
}
if _, err := util.ReadKeyFromFile(key.Key); err != nil {
return fmt.Errorf("invalid private key file")

if enrollKeysCmdOptions.Force {
if _, err := util.ReadCertFromFile(key.Cert); err != nil {
return fmt.Errorf("invalid certificate file")
}
if _, err := util.ReadKeyFromFile(key.Key); err != nil {
return fmt.Errorf("invalid private key file")
}
}

for src, dst := range map[string]string{
key.Cert: path.Join(sbctl.KeysPath, key.Type, key.Type+".pem"),
key.Key: path.Join(sbctl.KeysPath, key.Type, key.Type+".key")} {
key.Key: path.Join(sbctl.KeysPath, key.Type, key.Type+".key"),
} {
srcFile, err := filepath.Abs(src)
if err != nil {
return err
Expand All @@ -127,6 +137,8 @@ func importKeysCmdFlags(cmd *cobra.Command) {
f := cmd.Flags()
f.StringVarP(&importKeysCmdOptions.DbCert, "db-cert", "", "", "Database (db) certificate")
f.StringVarP(&importKeysCmdOptions.DbKey, "db-key", "", "", "Database (db) key")
f.StringVarP(&importKeysCmdOptions.DbxCert, "dbx-cert", "", "", "Forbidden Database (dbx) certificate")
f.StringVarP(&importKeysCmdOptions.DbxKey, "dbx-key", "", "", "Forbidden Database (dbx) key")
f.StringVarP(&importKeysCmdOptions.KEKCert, "kek-cert", "", "", "Key Exchange Key (KEK) certificate")
f.StringVarP(&importKeysCmdOptions.KEKKey, "kek-key", "", "", "Key Exchange Key (KEK) key")
f.StringVarP(&importKeysCmdOptions.PKCert, "pk-cert", "", "", "Platform Key (PK) certificate")
Expand Down
21 changes: 19 additions & 2 deletions cmd/sbctl/reset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type resetCmdOptions struct {

var (
resetCmdOpts = resetCmdOptions{
Partial: stringset.StringSet{Allowed: []string{"PK", "KEK", "db"}},
Partial: stringset.StringSet{Allowed: []string{"PK", "KEK", "db", "dbx"}},
}
resetCmd = &cobra.Command{
Use: "reset",
Expand All @@ -43,6 +43,10 @@ func resetKeys() error {
if err := resetDB(); err != nil {
return err
}
case "dbx":
if err := resetDBX(); err != nil {
return err
}
case "KEK":
if err := resetKEK(); err != nil {
return err
Expand Down Expand Up @@ -71,6 +75,19 @@ func resetDB() error {
return nil
}

func resetDBX() error {
KEKKey := filepath.Join(sbctl.KeysPath, "KEK", "KEK.key")
KEKPem := filepath.Join(sbctl.KeysPath, "KEK", "KEK.pem")

if err := resetDatabase(KEKKey, KEKPem, "dbx"); err != nil {
return err
}

logging.Ok("Removed Fobidden Signature Database!")
logging.Println("Use `sbctl enroll-keys` to enroll the Forbidden Signature Database again.")
return nil
}

func resetKEK() error {
PKKey := filepath.Join(sbctl.KeysPath, "PK", "PK.key")
PKPem := filepath.Join(sbctl.KeysPath, "PK", "PK.pem")
Expand Down Expand Up @@ -132,7 +149,7 @@ func RunReset(cmd *cobra.Command, args []string) error {

func resetKeysCmdFlags(cmd *cobra.Command) {
f := cmd.Flags()
f.VarPF(&resetCmdOpts.Partial, "partial", "p", "enroll a partial set of keys")
f.VarPF(&resetCmdOpts.Partial, "partial", "p", "reset a partial set of keys")
}

func init() {
Expand Down
Loading