diff options
| author | Werner Koch <wk@gnupg.org> | 2014-12-03 11:28:10 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-12-03 11:28:10 +0100 |
| commit | 17b4662984b4669d8dcbbd6705ccfbe6c263319c (patch) | |
| tree | 9a05c91ba2c9cd32ca141f2af6f57f1d769f4dff | |
| parent | agent: Replace some sprintf. (diff) | |
| download | gnupg2-17b4662984b4669d8dcbbd6705ccfbe6c263319c.tar.xz gnupg2-17b4662984b4669d8dcbbd6705ccfbe6c263319c.zip | |
gpg: Remove option aliases --[no-]throw-keyid and --notation-data.
* g10/gpg.c (opts): Remove them.
* g10/options.h (opt): s/throw_keyid/throw_keyids/ and change users.
--
See mails starting
http://lists.gnupg.org/pipermail/gnupg-devel/2014-November/029128.html
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | g10/encrypt.c | 4 | ||||
| -rw-r--r-- | g10/gpg.c | 7 | ||||
| -rw-r--r-- | g10/options.h | 2 |
4 files changed, 8 insertions, 8 deletions
@@ -23,6 +23,9 @@ Noteworthy changes in version 2.1.1 (unreleased) * More translations (but most of them are not complete). + * gpg: Removed the option aliases --throw-keyid and --notation-data; + use --throw-keyids and --set-notation instead. + Noteworthy changes in version 2.1.0 (2014-11-06) ------------------------------------------------ diff --git a/g10/encrypt.c b/g10/encrypt.c index 518b54422..b6925445f 100644 --- a/g10/encrypt.c +++ b/g10/encrypt.c @@ -867,9 +867,9 @@ write_pubkey_enc_from_list (PK_LIST pk_list, DEK *dek, iobuf_t out) enc = xmalloc_clear ( sizeof *enc ); enc->pubkey_algo = pk->pubkey_algo; keyid_from_pk( pk, enc->keyid ); - enc->throw_keyid = (opt.throw_keyid || (pk_list->flags&1)); + enc->throw_keyid = (opt.throw_keyids || (pk_list->flags&1)); - if (opt.throw_keyid && (PGP6 || PGP7 || PGP8)) + if (opt.throw_keyids && (PGP6 || PGP7 || PGP8)) { log_info(_("you may not use %s while in %s mode\n"), "--throw-keyids",compliance_option_string()); @@ -587,15 +587,12 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_s (oCertDigestAlgo, "cert-digest-algo", "@"), ARGPARSE_s_s (oCompressAlgo,"compress-algo", "@"), ARGPARSE_s_s (oCompressAlgo, "compression-algo", "@"), /* Alias */ - ARGPARSE_s_n (oThrowKeyids, "throw-keyid", "@"), ARGPARSE_s_n (oThrowKeyids, "throw-keyids", "@"), - ARGPARSE_s_n (oNoThrowKeyids, "no-throw-keyid", "@"), ARGPARSE_s_n (oNoThrowKeyids, "no-throw-keyids", "@"), ARGPARSE_s_n (oShowPhotos, "show-photos", "@"), ARGPARSE_s_n (oNoShowPhotos, "no-show-photos", "@"), ARGPARSE_s_s (oPhotoViewer, "photo-viewer", "@"), ARGPARSE_s_s (oSetNotation, "set-notation", "@"), - ARGPARSE_s_s (oSetNotation, "notation-data", "@"), /* Alias */ ARGPARSE_s_s (oSigNotation, "sig-notation", "@"), ARGPARSE_s_s (oCertNotation, "cert-notation", "@"), @@ -2611,8 +2608,8 @@ main (int argc, char **argv) free_strlist(opt.comments); opt.comments=NULL; break; - case oThrowKeyids: opt.throw_keyid = 1; break; - case oNoThrowKeyids: opt.throw_keyid = 0; break; + case oThrowKeyids: opt.throw_keyids = 1; break; + case oNoThrowKeyids: opt.throw_keyids = 0; break; case oShowPhotos: deprecated_warning(configname,configlineno,"--show-photos", "--list-options ","show-photos"); diff --git a/g10/options.h b/g10/options.h index 7ec81af36..9aadb4219 100644 --- a/g10/options.h +++ b/g10/options.h @@ -130,7 +130,7 @@ struct int shm_coprocess; const char *set_filename; strlist_t comments; - int throw_keyid; + int throw_keyids; const char *photo_viewer; int s2k_mode; int s2k_digest_algo; |