aboutsummaryrefslogtreecommitdiffstats
path: root/g10/misc.c
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2004-02-10 22:42:34 +0000
committerDavid Shaw <[email protected]>2004-02-10 22:42:34 +0000
commit9842d84da07c6d352a083db67006028a6ced5126 (patch)
treeb731e3b0d94419edbc3dd1c09102a1a5dd0cb493 /g10/misc.c
parent* clearsig.test, sigs.test: Properly detect RSA being missing, and use the (diff)
downloadgnupg-9842d84da07c6d352a083db67006028a6ced5126.tar.gz
gnupg-9842d84da07c6d352a083db67006028a6ced5126.zip
* keygen.c (keygen_set_std_prefs): Build the default preferences list at
runtime as it properly handles algorithms disabled at build or run time. * getkey.c (merge_selfsigs_main): Properly handle expired user IDs when the expired self-sig is not the only self-sig. * misc.c (compress_algo_to_string): Return NULL on failure like all of the other xxxx_algo_to_string() functions. * mainproc.c (list_node): Minor spacing tweak to match --list-keys output. * keylist.c (list_keyblock_print), mainproc.c (list_node): Mark revoked subkeys as revoked. Requested by Matthew Wilcox. Revoked overrides expiration when both apply. * keyedit.c (show_prefs): Use compress algo constants. (show_basic_key_info): Make revoked and expired tags translatable. * g10.c (rm_group): Properly ungroup from a list of groups.
Diffstat (limited to 'g10/misc.c')
-rw-r--r--g10/misc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/g10/misc.c b/g10/misc.c
index e3713a062..2a8e29211 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -1,5 +1,6 @@
/* misc.c - miscellaneous functions
- * Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
+ * 2004 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@@ -524,7 +525,7 @@ deprecated_warning(const char *configname,unsigned int configlineno,
const char *
compress_algo_to_string(int algo)
{
- const char *s="?";
+ const char *s=NULL;
switch(algo)
{