fix: ipsw ota --key-val flag

blacktop · Aug 2, 2024 · d6acb0a · d6acb0a
1 parent 5d4f094
commit d6acb0a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmd/ipsw/cmd/ota/ota_extract.go b/cmd/ipsw/cmd/ota/ota_extract.go
@@ -45,7 +45,7 @@ func init() {
 	otaExtractCmd.Flags().BoolP("kernel", "k", false, "Extract kernelcache")
 	otaExtractCmd.Flags().StringP("pattern", "p", "", "Regex pattern to match files")
 	otaExtractCmd.Flags().StringP("range", "r", "", "Regex pattern control the payloadv2 file range to search")
-	otaExtractCmd.Flags().StringP("key-val", "b", "", "Base64 encoded symmetric encryption key")
+	otaExtractCmd.Flags().String("key-val", "", "Base64 encoded symmetric encryption key")
 	otaExtractCmd.Flags().BoolP("confirm", "y", false, "Confirm searching for pattern in payloadv2 files")
 	otaExtractCmd.Flags().BoolP("decomp", "x", false, "Decompress pbzx files")
 	otaExtractCmd.Flags().StringP("output", "o", "", "Output folder")
@@ -99,6 +99,7 @@ var otaExtractCmd = &cobra.Command{
 		}
 		/* KERNELCACHE */
 		if viper.GetBool("ota.extract.kernel") {
+			log.Info("Extracting kernelcache(s)")
 			re := regexp.MustCompile(`kernelcache.*$`)
 			for _, f := range o.Files() { // search in OTA asset files
 				if f.IsDir() {
@@ -131,6 +132,7 @@ var otaExtractCmd = &cobra.Command{
 					}
 				}
 			}
+			return nil
 		}
 		/* ALL FILES */
 		if len(args) == 1 && !viper.IsSet("ota.extract.pattern") {

diff --git a/cmd/ipsw/cmd/ota/ota_ls.go b/cmd/ipsw/cmd/ota/ota_ls.go
@@ -43,7 +43,7 @@ func init() {
 	otaLsCmd.Flags().BoolP("payload", "p", false, "List the payloadv2 files")
 	otaLsCmd.Flags().StringP("pattern", "r", "", "Regex pattern to match payloadv2 files")
 	otaLsCmd.Flags().BoolP("bom", "b", false, "List the post.bom files")
-	otaLsCmd.Flags().StringP("key-val", "b", "", "Base64 encoded symmetric encryption key")
+	otaLsCmd.Flags().String("key-val", "", "Base64 encoded symmetric encryption key")
 	otaLsCmd.Flags().BoolP("json", "j", false, "Output in JSON format")
 	otaLsCmd.MarkFlagsMutuallyExclusive("payload", "bom")
 	viper.BindPFlag("ota.ls.pattern", otaLsCmd.Flags().Lookup("pattern"))