tools: mkeficapsule: Fix dump signature long option

Only short option has been present. Also rename dump_sig
to dump-sig to match with other parameter names.

Fixes: 16abff246b40 ("tools: mkeficapsule: add firmware image signing")
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@mt.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

diff --git a/doc/mkeficapsule.1 b/doc/mkeficapsule.1
index a726149ba2ce09da3102939f00f1f6186f83c7b8..d6653ec42472cdb29b70074324e46560d8d9a4a6 100644 (file)
--- a/doc/mkeficapsule.1
+++ b/doc/mkeficapsule.1
@@ -121,8 +121,8 @@ Specify a monotonic count which is set to be monotonically incremented
 at every firmware update.
 
 .TP
-.B "-d\fR,\fB --dump_sig"
-Dump signature data into *.p7 file
+.B "-d\fR,\fB --dump-sig"
+Dump signature data into <capsule-file-name>.p7 file
 
 .SH "GUIDGEN OPTIONS"
 

diff --git a/tools/binman/btool/mkeficapsule.py b/tools/binman/btool/mkeficapsule.py
index f7e5a8868495f4d25cdb4989b063559bdfe810fe..f2ac654db81ee08c013689cd7bd326708a152e72 100644 (file)
--- a/tools/binman/btool/mkeficapsule.py
+++ b/tools/binman/btool/mkeficapsule.py
@@ -16,7 +16,7 @@ Options:
        -p, --private-key <privkey file>  private key file
        -c, --certificate <cert file>     signer's certificate file
        -m, --monotonic-count <count>     monotonic count
-       -d, --dump_sig              dump signature (*.p7)
+       -d, --dump-sig              dump signature to <output file>.p7
        -A, --fw-accept  firmware accept capsule, requires GUID, no image blob
        -R, --fw-revert  firmware revert capsule, takes no GUID, no image blob
        -o, --capoemflag Capsule OEM Flag, an integer between 0x0000 and 0xffff

diff --git a/tools/mkeficapsule.c b/tools/mkeficapsule.c
index a0ee76295a1a7fb5032f245745b14885fbb6f3b6..ec640c57e8a5d02fb1e40eca1ddb0212302c3322 100644 (file)
--- a/tools/mkeficapsule.c
+++ b/tools/mkeficapsule.c
@@ -56,6 +56,7 @@ static struct option options[] = {
        {"fw-revert", no_argument, NULL, 'R'},
        {"capoemflag", required_argument, NULL, 'o'},
        {"dump-capsule", no_argument, NULL, 'D'},
+       {"dump-sig", no_argument, NULL, 'd'},
        {"help", no_argument, NULL, 'h'},
        {NULL, 0, NULL, 0},
 };
@@ -83,7 +84,7 @@ static void print_usage_mkeficapsule(void)
                "\t-p, --private-key <privkey file>  private key file\n"
                "\t-c, --certificate <cert file>     signer's certificate file\n"
                "\t-m, --monotonic-count <count>     monotonic count\n"
-               "\t-d, --dump_sig              dump signature (*.p7)\n"
+               "\t-d, --dump-sig              dump signature to <output file>.p7\n"
                "\t-A, --fw-accept  firmware accept capsule, requires GUID, no image blob\n"
                "\t-R, --fw-revert  firmware revert capsule, takes no GUID, no image blob\n"
                "\t-o, --capoemflag Capsule OEM Flag, an integer between 0x0000 and 0xffff\n"