This is an automated email from the ASF dual-hosted git repository.
vipulrahane pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-newt.git
The following commit(s) were added to refs/heads/master by this push:
new 2623dad run: Fix options parsing for newt run (#393)
2623dad is described below
commit 2623dad9f920469fc7702e2e9d8b0fb48fd572d5
Author: Vipul Rahane <vipulrah...@apache.org>
AuthorDate: Tue Apr 7 19:42:39 2020 -0700
run: Fix options parsing for newt run (#393)
- Fixing parsing of encryption filenames and options for the run command
---
newt/cli/run_cmds.go | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/newt/cli/run_cmds.go b/newt/cli/run_cmds.go
index 19cdfd4..e008643 100644
--- a/newt/cli/run_cmds.go
+++ b/newt/cli/run_cmds.go
@@ -105,9 +105,11 @@ func runRunCmd(cmd *cobra.Command, args []string) {
}
if useV1 {
- err = imgprod.ProduceAllV1(b, ver, keys, "",
-1, -1, -1)
+ err = imgprod.ProduceAllV1(b, ver, keys,
encKeyFilename, encKeyIndex,
+ hdrPad, imagePad)
} else {
- err = imgprod.ProduceAll(b, ver, keys, "", -1,
-1, -1)
+ err = imgprod.ProduceAll(b, ver, keys,
encKeyFilename, encKeyIndex,
+ hdrPad, imagePad)
}
if err != nil {
NewtUsage(nil, err)
@@ -150,10 +152,22 @@ func AddRunCommands(cmd *cobra.Command) {
runCmd.PersistentFlags().BoolVarP(&newtutil.NewtForce,
"force", "f", false,
"Ignore flash overflow errors during image creation")
+ runCmd.PersistentFlags().BoolVar(&image.UseRsaPss,
+ "rsa-pss", false,
+ "Use RSA-PSS instead of PKCS#1 v1.5 for RSA sig. "+
+ "Meaningful for version 1 image format.")
runCmd.PersistentFlags().BoolVarP(&useV1,
"1", "1", false, "Use old image header format")
runCmd.PersistentFlags().BoolVarP(&useV2,
"2", "2", false, "Use new image header format (default)")
+ runCmd.PersistentFlags().StringVarP(&encKeyFilename,
+ "encrypt", "e", "", "Encrypt image using this key")
+ runCmd.PersistentFlags().IntVarP(&encKeyIndex,
+ "hw-stored-key", "H", -1, "Hardware stored key index")
+ runCmd.PersistentFlags().IntVarP(&hdrPad,
+ "pad-header", "p", 0, "Pad header to this length")
+ runCmd.PersistentFlags().IntVarP(&imagePad,
+ "pad-image", "i", 0, "Pad image to this length")
cmd.AddCommand(runCmd)
AddTabCompleteFn(runCmd, func() []string {
