Hi. I have modified my GnuPG, and I want to submit my modifications to the GnuPG project. Below is the patch.
Cheers
From 37b6320ce9286be2b64fae1f36cda03b843e7ad1 Mon Sep 17 00:00:00 2001 From: Daniel Cerqueira <[email protected]> Date: Fri, 8 Dec 2023 21:31:43 +0000 Subject: [PATCH GnuPG] add --(de/en)cipher alias flags add '--encipher' as an alias to '--encrypt', and '--decipher' as an alias to '--decrypt'. Some people, prefer to talk about ciphering when they talk about criptography. It is a valid point of view, that when we 'encrypt' stuff, we are actually 'ciphering' stuff, we are not putting stuff in a crypt, but we are leaving them at plain sight (but with the content passed through a cipher). This way, people know that 'encrypt' and 'encipher' are two different words for the same thing. And people are free to use their personal choice of wording (as flags). -- Signed-off-by: Daniel Cerqueira <[email protected]> --- doc/gpg.texi | 4 ++++ doc/gpgsm.texi | 4 ++++ doc/tools.texi | 4 ++++ g10/gpg.c | 2 ++ sm/gpgsm.c | 2 ++ tools/gpgtar.c | 2 ++ 6 files changed, 18 insertions(+) diff --git a/doc/gpg.texi b/doc/gpg.texi index 15b3243d0..384ed163a 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -199,6 +199,8 @@ Make a detached signature. @item --encrypt @itemx -e @opindex encrypt +@itemx --encipher +@opindex encipher Encrypt data to one or more public keys. This command may be combined with @option{--sign} (to sign and encrypt a message), @option{--symmetric} (to encrypt a message that can be decrypted using a @@ -229,6 +231,8 @@ Store only (make a simple literal data packet). @item --decrypt @itemx -d @opindex decrypt +@itemx --decipher +@opindex decipher Decrypt the file given on the command line (or STDIN if no file is specified) and write it to STDOUT (or the file specified with @option{--output}). If the decrypted file is signed, the signature is also diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi index e976767f6..e748162ff 100644 --- a/doc/gpgsm.texi +++ b/doc/gpgsm.texi @@ -108,11 +108,15 @@ abbreviate this command. @table @gnupgtabopt @item --encrypt @opindex encrypt +@itemx --encipher +@opindex encipher Perform an encryption. The keys the data is encrypted to must be set using the option @option{--recipient}. @item --decrypt @opindex decrypt +@itemx --decipher +@opindex decipher Perform a decryption; the type of input is automatically determined. It may either be in binary form or PEM encoded; automatic determination of base-64 encoding is not done. diff --git a/doc/tools.texi b/doc/tools.texi index eefa4f9d6..904248c7e 100644 --- a/doc/tools.texi +++ b/doc/tools.texi @@ -1913,6 +1913,8 @@ stdin. @item --encrypt @itemx -e @opindex encrypt +@itemx --encipher +@opindex encipher Encrypt given files and directories into an archive. This option may be combined with option @option{--symmetric} for an archive that may be decrypted via a secret key or a passphrase. @@ -1920,6 +1922,8 @@ be decrypted via a secret key or a passphrase. @item --decrypt @itemx -d @opindex decrypt +@itemx --decipher +@opindex decipher Extract all files from an encrypted archive. If no file name is given (or it is "-") the archive is taken from stdin. diff --git a/g10/gpg.c b/g10/gpg.c index 2ae3750a9..42842be20 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -465,10 +465,12 @@ static gpgrt_opt_t opts[] = { ARGPARSE_c (aClearsign, "clearsign", "@"), ARGPARSE_c (aDetachedSign, "detach-sign", N_("make a detached signature")), ARGPARSE_c (aEncr, "encrypt", N_("encrypt data")), + ARGPARSE_c (aEncr, "encipher", "@"), ARGPARSE_c (aEncrFiles, "encrypt-files", "@"), ARGPARSE_c (aSym, "symmetric", N_("encryption only with symmetric cipher")), ARGPARSE_c (aStore, "store", "@"), ARGPARSE_c (aDecrypt, "decrypt", N_("decrypt data (default)")), + ARGPARSE_c (aDecrypt, "decipher", "@"), ARGPARSE_c (aDecryptFiles, "decrypt-files", "@"), ARGPARSE_c (aVerify, "verify" , N_("verify a signature")), ARGPARSE_c (aVerifyFiles, "verify-files" , "@" ), diff --git a/sm/gpgsm.c b/sm/gpgsm.c index ce977413d..8ee767e86 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -227,8 +227,10 @@ static gpgrt_opt_t opts[] = { /*ARGPARSE_c (aClearsign, "clearsign", N_("make a clear text signature") ),*/ ARGPARSE_c (aDetachedSign, "detach-sign", N_("make a detached signature")), ARGPARSE_c (aEncr, "encrypt", N_("encrypt data")), + ARGPARSE_c (aEncr, "encipher", "@"), /*ARGPARSE_c (aSym, "symmetric", N_("encryption only with symmetric cipher")),*/ ARGPARSE_c (aDecrypt, "decrypt", N_("decrypt data (default)")), + ARGPARSE_c (aDecrypt, "decipher", "@"), ARGPARSE_c (aVerify, "verify", N_("verify a signature")), ARGPARSE_c (aListKeys, "list-keys", N_("list keys")), ARGPARSE_c (aListExternalKeys, "list-external-keys", diff --git a/tools/gpgtar.c b/tools/gpgtar.c index ea1e1e751..51607770a 100644 --- a/tools/gpgtar.c +++ b/tools/gpgtar.c @@ -103,7 +103,9 @@ static gpgrt_opt_t opts[] = { ARGPARSE_c (aCreate, "create", N_("create an archive")), ARGPARSE_c (aExtract, "extract", N_("extract an archive")), ARGPARSE_c (aEncrypt, "encrypt", N_("create an encrypted archive")), + ARGPARSE_c (aEncrypt, "encipher", "@"), ARGPARSE_c (aDecrypt, "decrypt", N_("extract an encrypted archive")), + ARGPARSE_c (aDecrypt, "decipher", "@"), ARGPARSE_c (aSign, "sign", N_("create a signed archive")), ARGPARSE_c (aList, "list-archive", N_("list an archive")), -- 2.43.0
signature.asc
Description: PGP signature
_______________________________________________ Gnupg-devel mailing list [email protected] https://lists.gnupg.org/mailman/listinfo/gnupg-devel
