diff options
| author | NIIBE Yutaka <[email protected]> | 2019-07-19 08:17:15 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2019-07-22 02:26:59 +0000 |
| commit | b21133ba80f21ce93d5a4afe48027172d9fc1999 (patch) | |
| tree | 1bd03ba9425dd9da9c1b810908fff6b72cf0a8a3 | |
| parent | dirmngr: Don't add system CAs for SKS HKPS pool. (diff) | |
| download | gnupg-b21133ba80f21ce93d5a4afe48027172d9fc1999.tar.gz gnupg-b21133ba80f21ce93d5a4afe48027172d9fc1999.zip | |
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 <[email protected]>
| -rw-r--r-- | g10/gpg.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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); |