aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--g10/gpg.c2
-rw-r--r--g10/keyid.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/g10/gpg.c b/g10/gpg.c
index 5b4fba611..df6c24699 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2249,7 +2249,7 @@ main (int argc, char **argv)
opt.mangle_dos_filenames = 0;
opt.min_cert_level = 2;
set_screen_dimensions ();
- opt.keyid_format = KF_SHORT;
+ opt.keyid_format = KF_NONE;
opt.def_sig_expire = "0";
opt.def_cert_expire = "0";
set_homedir (default_homedir ());
diff --git a/g10/keyid.c b/g10/keyid.c
index 4cdc41d2a..e67f67f65 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -333,7 +333,7 @@ format_keyid (u32 *keyid, int format, char *buffer, int len)
if (format == KF_DEFAULT)
format = opt.keyid_format;
if (format == KF_DEFAULT)
- format = KF_SHORT;
+ format = KF_NONE;
switch (format)
{
@@ -380,7 +380,7 @@ keystrlen(void)
{
int format = opt.keyid_format;
if (format == KF_DEFAULT)
- format = KF_SHORT;
+ format = KF_NONE;
switch(format)
{