Revert "main: remove clearsign option"
This reverts commit 83e0e3ad58
.
The logic behind removing clearsign was somehow flawed by momentary
indisposition.
This commit is contained in:
parent
c6cbd0e519
commit
903273db43
|
@ -54,7 +54,8 @@ void print_help (char*pname)
|
|||
out ("Action options:");
|
||||
out (" -r, --recipient encrypt for given user");
|
||||
out (" -u, --user use specified secret key");
|
||||
out (" -b, --detach-sign specify detached signature file");
|
||||
out (" -C, --clearsign work with cleartext signatures");
|
||||
out (" -b, --detach-sign specify file with detached signature");
|
||||
outeol;
|
||||
out ("Key management:");
|
||||
out (" -g, --gen-key generate specified keypair, `help' lists algorithms");
|
||||
|
@ -111,6 +112,7 @@ int main (int argc, char**argv)
|
|||
opt_armor = false,
|
||||
opt_yes = false,
|
||||
opt_fingerprint = false,
|
||||
opt_clearsign = false,
|
||||
opt_import_no_action = false;
|
||||
|
||||
std::string recipient, user,
|
||||
|
@ -166,6 +168,7 @@ int main (int argc, char**argv)
|
|||
{"decrypt", 0, 0, 'd' },
|
||||
|
||||
//action options
|
||||
{"clearsign", 0, 0, 'C' },
|
||||
{"detach-sign", 1, 0, 'b' },
|
||||
|
||||
{0, 0, 0, 0 }
|
||||
|
@ -174,7 +177,7 @@ int main (int argc, char**argv)
|
|||
option_index = -1;
|
||||
c = getopt_long
|
||||
(argc, argv,
|
||||
"hVTayr:u:R:o:kipx:m:KIPX:M:g:N:F:fnsvedb:",
|
||||
"hVTayr:u:R:o:kipx:m:KIPX:M:g:N:F:fnsvedCb:",
|
||||
long_opts, &option_index);
|
||||
if (c == -1) break;
|
||||
|
||||
|
@ -255,6 +258,7 @@ int main (int argc, char**argv)
|
|||
read_action_comb ('e', 's', 'E')
|
||||
read_action_comb ('d', 'v', 'D')
|
||||
|
||||
read_flag ('C', opt_clearsign)
|
||||
read_single_opt ('b', detach_sign,
|
||||
"specify only one detach-sign file")
|
||||
|
||||
|
|
Loading…
Reference in a new issue