Add command revert-tper to gosedctl

Signed-off-by: Christopher Meis <[email protected]>

Author: ChriMarMe

cmd/gosedctl/cmd.go

@@ -27,6 +27,11 @@ type loadPBAImageCmd struct {
 	Path     string `flag:"" required:"" short:"i" help:"Path to PBA image"`
 }
 
+type revertTPerCmd struct {
+	Device   string `flag:"" required:"" short:"d"  help:"Path to SED device (e.g. /dev/nvme0)"`
+	Password string `flag:"" required:"" short:"p"`
+}
+
 type revertNoeraseCmd struct {
 	Device   string `flag:"" required:"" short:"d"  help:"Path to SED device (e.g. /dev/nvme0)"`
 	Password string `flag:"" required:"" short:"p"`
@@ -37,6 +42,7 @@ var cli struct {
 	InitialSetup  initialSetupCmd  `cmd:"" help:"Take ownership of a given device"`
 	LoadPBA       loadPBAImageCmd  `cmd:"" help:"Load PBA image to shadow MBR"`
 	RevertNoerase revertNoeraseCmd `cmd:"" help:""`
+	RevertTper    revertTPerCmd    `cmd:"" help:""`
 }
 
 // Run executes when the initial-setup command is invoked
@@ -227,3 +233,37 @@ func (r *revertNoeraseCmd) Run(ctx *context) error {
 	}
 	return nil
 }
+
+func (r *revertTPerCmd) Run(ctx *context) error {
+	coreObj, err := core.NewCore(r.Device)
+	if err != nil {
+		return fmt.Errorf("NewCore(%s) failed: %v", r.Device, err)
+	}
+	comID, _, err := core.FindComID(coreObj.DriveIntf, coreObj.DiskInfo.Level0Discovery)
+	if err != nil {
+		return fmt.Errorf("FindComID() failed: %v", err)
+	}
+	cs, err := core.NewControlSession(coreObj.DriveIntf, coreObj.Level0Discovery, core.WithComID(comID))
+	if err != nil {
+		return fmt.Errorf("NewControllSession() failed: %v", err)
+	}
+	adminSession, err := cs.NewSession(uid.AdminSP)
+	if err != nil {
+		return fmt.Errorf("cs.NewSession() failed: %v", err)
+	}
+	serial, err := coreObj.SerialNumber()
+	if err != nil {
+		return fmt.Errorf("coreObj.SerialNumber() failed: %v", err)
+	}
+	salt := fmt.Sprintf("%-20s", serial)
+	pwhash := pbkdf2.Key([]byte(r.Password), []byte(salt[:20]), 75000, 32, sha1.New)
+
+	if err := table.ThisSP_Authenticate(adminSession, uid.AuthoritySID, pwhash); err != nil {
+		return fmt.Errorf("authenticating as AdminSP failed: %v", err)
+	}
+
+	if err := table.RevertTPer(adminSession); err != nil {
+		return fmt.Errorf("RevertTPer() failed: %v", err)
+	}
+	return nil
+}

pkg/core/table/admin.go

@@ -221,7 +221,7 @@ func Admin_SP_GetLifeCycleState(s *core.Session, spid uid.SPID) (LifeCycleState,
 	return LifeCycleState(v), nil
 }
 
-func RevertTPer(s *core.Session, psid bool) error {
+func RevertTPer(s *core.Session) error {
 	var invoking uid.InvokingID
 	copy(invoking[:], uid.AdminSP[:])
 	mc := method.NewMethodCall(invoking, uid.OpalRevert, s.MethodFlags)