mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-23 15:07:03 +01:00
gpg: Use --keyid-format=none by default.
* g10/gpg.c (main): Init keyid_format to KF_NONE. * g10/keyid.c (format_keyid): Ditto. (keystrlen): Ditto. -- GnuPG-bug-id: 2379 Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
1d1cb86694
commit
7257ea2d45
@ -2249,7 +2249,7 @@ main (int argc, char **argv)
|
|||||||
opt.mangle_dos_filenames = 0;
|
opt.mangle_dos_filenames = 0;
|
||||||
opt.min_cert_level = 2;
|
opt.min_cert_level = 2;
|
||||||
set_screen_dimensions ();
|
set_screen_dimensions ();
|
||||||
opt.keyid_format = KF_SHORT;
|
opt.keyid_format = KF_NONE;
|
||||||
opt.def_sig_expire = "0";
|
opt.def_sig_expire = "0";
|
||||||
opt.def_cert_expire = "0";
|
opt.def_cert_expire = "0";
|
||||||
set_homedir (default_homedir ());
|
set_homedir (default_homedir ());
|
||||||
|
@ -333,7 +333,7 @@ format_keyid (u32 *keyid, int format, char *buffer, int len)
|
|||||||
if (format == KF_DEFAULT)
|
if (format == KF_DEFAULT)
|
||||||
format = opt.keyid_format;
|
format = opt.keyid_format;
|
||||||
if (format == KF_DEFAULT)
|
if (format == KF_DEFAULT)
|
||||||
format = KF_SHORT;
|
format = KF_NONE;
|
||||||
|
|
||||||
switch (format)
|
switch (format)
|
||||||
{
|
{
|
||||||
@ -380,7 +380,7 @@ keystrlen(void)
|
|||||||
{
|
{
|
||||||
int format = opt.keyid_format;
|
int format = opt.keyid_format;
|
||||||
if (format == KF_DEFAULT)
|
if (format == KF_DEFAULT)
|
||||||
format = KF_SHORT;
|
format = KF_NONE;
|
||||||
|
|
||||||
switch(format)
|
switch(format)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user