From b21133ba80f21ce93d5a4afe48027172d9fc1999 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Fri, 19 Jul 2019 17:17:15 +0900 Subject: [PATCH] gpg: The option --passphrase= can be empty. * g10/gpg.c (opts): Use ARGPARSE_o_s for oPassphrase to allow empty string. -- Cherri-picked from master commit of: fcd766719a6e8f18f4be4c0f91e12aa157ca5506 GnuPG-bug-id: 4633 Signed-off-by: NIIBE Yutaka --- g10/gpg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/g10/gpg.c b/g10/gpg.c index 2c784d491..10f6567cd 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -701,7 +701,7 @@ static ARGPARSE_OPTS opts[] = { "delete-secret-and-public-keys", "@"), ARGPARSE_c (aRebuildKeydbCaches, "rebuild-keydb-caches", "@"), - ARGPARSE_s_s (oPassphrase, "passphrase", "@"), + ARGPARSE_o_s (oPassphrase, "passphrase", "@"), ARGPARSE_s_i (oPassphraseFD, "passphrase-fd", "@"), ARGPARSE_s_s (oPassphraseFile, "passphrase-file", "@"), ARGPARSE_s_i (oPassphraseRepeat,"passphrase-repeat", "@"), @@ -3095,7 +3095,7 @@ main (int argc, char **argv) case oBZ2CompressLevel: opt.bz2_compress_level = pargs.r.ret_int; break; case oBZ2DecompressLowmem: opt.bz2_decompress_lowmem=1; break; case oPassphrase: - set_passphrase_from_string(pargs.r.ret_str); + set_passphrase_from_string (pargs.r_type ? pargs.r.ret_str : ""); break; case oPassphraseFD: pwfd = translate_sys2libc_fd_int (pargs.r.ret_int, 0);