From 6a3db4c72485aba6187466005473e287f539e3ce Mon Sep 17 00:00:00 2001 From: axtloss Date: Sat, 17 Feb 2024 22:18:25 +0100 Subject: Clean up code --- verifysetup/cmd/setup.go | 13 +------------ verifysetup/core/crypt.go | 1 - verifysetup/core/storage.go | 1 - 3 files changed, 1 insertion(+), 14 deletions(-) (limited to 'verifysetup') diff --git a/verifysetup/cmd/setup.go b/verifysetup/cmd/setup.go index 940c4cd..c2ba790 100644 --- a/verifysetup/cmd/setup.go +++ b/verifysetup/cmd/setup.go @@ -62,7 +62,7 @@ func checksumBlock(blockStart int, blockEnd int, bundleSize int, diskBytes []byt } func SetupCommand(_ *cobra.Command, args []string) error { - if len(args) != 3 { + if len(args) != 3 && len(args) != 4 { return fmt.Errorf("Usage: verifysetup setup [partition] [procCount] [fsverify partition output] ") } var minisignDir string @@ -89,10 +89,6 @@ func SetupCommand(_ *cobra.Command, args []string) error { diskSize := diskInfo.Size() bundleSize := math.Floor(float64(diskSize / int64(procCount))) blockCount := math.Ceil(float64(bundleSize / 2000)) - lastBlockSize := int(diskSize) - int(bundleSize)*procCount - fmt.Println(diskSize) - fmt.Println(int(bundleSize)) - fmt.Println(lastBlockSize) diskBytes := make([]byte, diskSize) _, err = disk.Read(diskBytes) if err != nil { @@ -139,8 +135,6 @@ func SetupCommand(_ *cobra.Command, args []string) error { if err != nil { return err } - fmt.Println(string(signature)) - sig := minisign.Signature{} err = sig.UnmarshalText(signature) if err != nil { @@ -159,18 +153,13 @@ func SetupCommand(_ *cobra.Command, args []string) error { return err } defer db.Close() - fmt.Println("Reading from disk") dbInfo, err := fsverifydb.Stat() if err != nil { return err } dbSize := dbInfo.Size() - verifyPart := make([]byte, 200+dbSize) header, err := core.CreateHeader(unsignedHash, signedHash, int(diskSize), int(dbSize)) - - fmt.Printf("%x\n", header) - database := make([]byte, dbSize) _, err = fsverifydb.Read(database) if err != nil { diff --git a/verifysetup/core/crypt.go b/verifysetup/core/crypt.go index 4b448c5..4658641 100644 --- a/verifysetup/core/crypt.go +++ b/verifysetup/core/crypt.go @@ -37,6 +37,5 @@ func SignDatabase(database string, minisignKeys string) ([]byte, error) { return nil, err } signature := minisign.SignWithComments(privateKey, data, "fsverify", "fsverify") - fmt.Printf("SIGNATURE: %x\n", signature) return signature, err } diff --git a/verifysetup/core/storage.go b/verifysetup/core/storage.go index e7ded32..64b06a1 100644 --- a/verifysetup/core/storage.go +++ b/verifysetup/core/storage.go @@ -77,7 +77,6 @@ func CreateHeader(unsignedHash string, signedHash string, diskSize int, tableSiz binary.BigEndian.PutUint32(disk, uint32(diskSize)) copy(header[190:], disk) - fmt.Println(tableSize) db := make([]byte, 4) binary.BigEndian.PutUint32(db, uint32(tableSize)) copy(header[195:], db) -- cgit v1.2.3