mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
gpg: Change armor Version header to emit only the major version.
* g10/options.h (opt): Rename field no_version to emit_version.
* g10/gpg.c (main): Init opt.emit_vesion to 1. Change --emit-version
to bump up opt.emit_version.
* g10/armor.c (armor_filter): Implement different --emit-version
values.
--
GnuPG-bug-id: 1572
Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit e951782e93
)
Resolved conflicts:
NEWS
g10/armor.c
g10/gpg.c
This commit is contained in:
parent
571bcd4662
commit
fd5f452496
5 changed files with 49 additions and 22 deletions
|
@ -80,7 +80,11 @@ struct
|
|||
int def_cert_level;
|
||||
int min_cert_level;
|
||||
int ask_cert_level;
|
||||
int no_version;
|
||||
int emit_version; /* 0 = none,
|
||||
1 = major only,
|
||||
2 = major and minor,
|
||||
3 = full version,
|
||||
4 = full version plus OS string. */
|
||||
int marginals_needed;
|
||||
int completes_needed;
|
||||
int max_cert_depth;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue