Minor fixes

[gnupg.git] / g10 / keyedit.c

diff --git a/g10/keyedit.c b/g10/keyedit.c
index d9506d7..0fab9c8 100644 (file)
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -1,6 +1,6 @@
 /* keyedit.c - keyedit stuff
 /* keyedit.c - keyedit stuff

- * Copyright (C) 1998, 1999, 2000, 2001, 2002,
- *               2003 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
+ *               2004 Free Software Foundation, Inc.

  *
  * This file is part of GnuPG.
  *
  *
  * This file is part of GnuPG.
  *


@@ -41,8 +41,9 @@
 #include "ttyio.h"
 #include "status.h"
 #include "i18n.h"
 #include "ttyio.h"
 #include "status.h"
 #include "i18n.h"

+#include "keyserver-internal.h"

 
 

-static void show_prefs( PKT_user_id *uid, int verbose );
+static void show_prefs( PKT_user_id *uid, PKT_signature *selfsig, int verbose);

 static void show_key_with_all_names( KBNODE keyblock, int only_marked,
            int with_revoker, int with_fpr, int with_subkeys, int with_prefs );
 static void show_key_and_fingerprint( KBNODE keyblock );
 static void show_key_with_all_names( KBNODE keyblock, int only_marked,
            int with_revoker, int with_fpr, int with_subkeys, int with_prefs );
 static void show_key_and_fingerprint( KBNODE keyblock );


@@ -55,7 +56,8 @@ static int menu_addrevoker( KBNODE pub_keyblock,
 static int menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock );
 static int menu_set_primary_uid( KBNODE pub_keyblock, KBNODE sec_keyblock );
 static int menu_set_preferences( KBNODE pub_keyblock, KBNODE sec_keyblock );
 static int menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock );
 static int menu_set_primary_uid( KBNODE pub_keyblock, KBNODE sec_keyblock );
 static int menu_set_preferences( KBNODE pub_keyblock, KBNODE sec_keyblock );

-static int menu_set_keyserver_url (KBNODE pub_keyblock, KBNODE sec_keyblock );
+static int menu_set_keyserver_url (const char *url,
+                                  KBNODE pub_keyblock, KBNODE sec_keyblock );

 static int menu_select_uid( KBNODE keyblock, int idx );
 static int menu_select_key( KBNODE keyblock, int idx );
 static int count_uids( KBNODE keyblock );
 static int menu_select_uid( KBNODE keyblock, int idx );
 static int menu_select_key( KBNODE keyblock, int idx );
 static int count_uids( KBNODE keyblock );


@@ -92,6 +94,100 @@ struct sign_attrib {
     char *trust_regexp;
 };
 
     char *trust_regexp;
 };
 

+
+#ifdef ENABLE_CARD_SUPPORT
+/* Given a node SEC_NODE with a secret key or subkey, locate the
+   corresponding public key from pub_keyblock. */
+static PKT_public_key *
+find_pk_from_sknode (KBNODE pub_keyblock, KBNODE sec_node)
+{
+  KBNODE node = pub_keyblock;
+  PKT_secret_key *sk;
+  PKT_public_key *pk;
+  
+  if (sec_node->pkt->pkttype == PKT_SECRET_KEY
+      && node->pkt->pkttype == PKT_PUBLIC_KEY)
+    return node->pkt->pkt.public_key;
+  if (sec_node->pkt->pkttype != PKT_SECRET_SUBKEY)
+    return NULL;
+  sk = sec_node->pkt->pkt.secret_key;
+  for (; node; node = node->next)
+    if (node->pkt->pkttype == PKT_PUBLIC_SUBKEY)
+      {
+        pk = node->pkt->pkt.public_key;
+        if (pk->keyid[0] == sk->keyid[0] && pk->keyid[1] == sk->keyid[1])
+          return pk;
+      }
+      
+  return NULL;
+}
+#endif /* ENABLE_CARD_SUPPORT */
+
+
+/* TODO: Fix duplicated code between here and the check-sigs/list-sigs
+   code in keylist.c. */
+static int
+print_and_check_one_sig_colon( KBNODE keyblock, KBNODE node,
+                              int *inv_sigs, int *no_key, int *oth_err,
+                              int *is_selfsig, int print_without_key )
+{
+  PKT_signature *sig = node->pkt->pkt.signature;
+  int rc, sigrc;
+
+  /* TODO: Make sure a cached sig record here still has the pk that
+     issued it.  See also keylist.c:list_keyblock_print */
+
+  switch((rc=check_key_signature(keyblock,node,is_selfsig)))
+    {
+    case 0:
+      node->flag &= ~(NODFLG_BADSIG|NODFLG_NOKEY|NODFLG_SIGERR);
+      sigrc = '!';
+      break;
+    case G10ERR_BAD_SIGN:
+      node->flag = NODFLG_BADSIG;
+      sigrc = '-';
+      if( inv_sigs )
+       ++*inv_sigs;
+      break;
+    case G10ERR_NO_PUBKEY:
+    case G10ERR_UNU_PUBKEY:
+      node->flag = NODFLG_NOKEY;
+      sigrc = '?';
+      if( no_key )
+       ++*no_key;
+      break;
+    default:
+      node->flag = NODFLG_SIGERR;
+      sigrc = '%';
+      if( oth_err )
+       ++*oth_err;
+      break;
+    }
+
+  if( sigrc != '?' || print_without_key )
+    {
+      printf("sig:%c::%d:%08lX%08lX:%lu:%lu:",
+            sigrc,sig->pubkey_algo,(ulong)sig->keyid[0],(ulong)sig->keyid[1],
+            (ulong)sig->timestamp,(ulong)sig->expiredate);
+
+      if(sig->trust_depth || sig->trust_value)
+       printf("%d %d",sig->trust_depth,sig->trust_value);
+
+      printf(":");
+
+      if(sig->trust_regexp)
+       print_string(stdout,sig->trust_regexp,strlen(sig->trust_regexp),':');
+
+      printf("::%02x%c\n",sig->sig_class,sig->flags.exportable?'x':'l');
+
+      if(opt.show_subpackets)
+       print_subpackets_colon(sig);
+    }
+
+  return (sigrc == '!');
+}
+
+

 /****************
  * Print information about a signature, check it and return true
  * if the signature is okay. NODE must be a signature packet.
 /****************
  * Print information about a signature, check it and return true
  * if the signature is okay. NODE must be a signature packet.


@@ -134,7 +230,7 @@ print_and_check_one_sig( KBNODE keyblock, KBNODE node,
        break;
     }
     if( sigrc != '?' || print_without_key ) {
        break;
     }
     if( sigrc != '?' || print_without_key ) {

-        tty_printf("%s%c%c %c%c%c%c%c%c ",
+        tty_printf("%s%c%c %c%c%c%c%c%c %s %s",

                   is_rev? "rev":"sig",sigrc,
                   (sig->sig_class-0x10>0 &&
                    sig->sig_class-0x10<4)?'0'+sig->sig_class-0x10:' ',
                   is_rev? "rev":"sig",sigrc,
                   (sig->sig_class-0x10>0 &&
                    sig->sig_class-0x10<4)?'0'+sig->sig_class-0x10:' ',


@@ -144,12 +240,8 @@ print_and_check_one_sig( KBNODE keyblock, KBNODE node,
                   sig->flags.notation?'N':' ',
                    sig->flags.expired?'X':' ',
                   (sig->trust_depth>9)?'T':
                   sig->flags.notation?'N':' ',
                    sig->flags.expired?'X':' ',
                   (sig->trust_depth>9)?'T':

-                  (sig->trust_depth>0)?'0'+sig->trust_depth:' ');
-       if(opt.list_options&LIST_SHOW_LONG_KEYID)
-         tty_printf("%08lX%08lX",(ulong)sig->keyid[0],(ulong)sig->keyid[1]);
-       else
-         tty_printf("%08lX",(ulong)sig->keyid[1]);
-       tty_printf(" %s", datestr_from_sig(sig));
+                  (sig->trust_depth>0)?'0'+sig->trust_depth:' ',
+                  keystr(sig->keyid),datestr_from_sig(sig));

        if(opt.list_options&LIST_SHOW_SIG_EXPIRE)
          tty_printf(" %s",expirestr_from_sig(sig));
        tty_printf("  ");
        if(opt.list_options&LIST_SHOW_SIG_EXPIRE)
          tty_printf(" %s",expirestr_from_sig(sig));
        tty_printf("  ");


@@ -161,21 +253,25 @@ print_and_check_one_sig( KBNODE keyblock, KBNODE node,
            tty_printf( is_rev? _("[revocation]")
                              : _("[self-signature]") );
        }
            tty_printf( is_rev? _("[revocation]")
                              : _("[self-signature]") );
        }

-       else {
+       else
+         {

            size_t n;
            char *p = get_user_id( sig->keyid, &n );
            size_t n;
            char *p = get_user_id( sig->keyid, &n );

-           tty_print_utf8_string2( p, n, 40 );
+           tty_print_utf8_string2(p, n, opt.screen_columns-keystrlen()-26-
+                              ((opt.list_options&LIST_SHOW_SIG_EXPIRE)?11:0));

            m_free(p);
            m_free(p);

-       }
+         }

        tty_printf("\n");
 
        tty_printf("\n");
 

-       if(sig->flags.policy_url && (opt.list_options&LIST_SHOW_POLICY))
+       if(sig->flags.policy_url && (opt.list_options&LIST_SHOW_POLICY_URLS))

          show_policy_url(sig,3,0);
 
          show_policy_url(sig,3,0);
 

-       if(sig->flags.notation && (opt.list_options&LIST_SHOW_NOTATION))
-         show_notation(sig,3,0);
+       if(sig->flags.notation && (opt.list_options&LIST_SHOW_NOTATIONS))
+         show_notation(sig,3,0,
+                       ((opt.list_options&LIST_SHOW_STD_NOTATIONS)?1:0)+
+                       ((opt.list_options&LIST_SHOW_USER_NOTATIONS)?2:0));

 
 

-       if(sig->flags.pref_ks && (opt.list_options&LIST_SHOW_KEYSERVER))
+       if(sig->flags.pref_ks && (opt.list_options&LIST_SHOW_KEYSERVER_URLS))

          show_keyserver_url(sig,3,0);
     }
 
          show_keyserver_url(sig,3,0);
     }
 


@@ -254,8 +350,6 @@ check_all_keysigs( KBNODE keyblock, int only_selected )
 }
 
 
 }
 
 

-
-

 static int
 sign_mk_attrib( PKT_signature *sig, void *opaque )
 {
 static int
 sign_mk_attrib( PKT_signature *sig, void *opaque )
 {


@@ -304,14 +398,13 @@ trustsig_prompt(byte *trust_value,byte *trust_depth,char **regexp)
   *trust_depth=0;
   *regexp=NULL;
 
   *trust_depth=0;
   *regexp=NULL;
 

-  tty_printf("\n");

   /* Same string as pkclist.c:do_edit_ownertrust */
   /* Same string as pkclist.c:do_edit_ownertrust */

-  tty_printf(_(
-              "Please decide how far you trust this user to correctly\n"
-              "verify other users' keys (by looking at passports,\n"
-              "checking fingerprints from different sources...)?\n\n"));
-  tty_printf (_("   (%d) I trust marginally\n"), 1);
-  tty_printf (_("   (%d) I trust fully\n"), 2);
+  tty_printf(_("Please decide how far you trust this user to correctly verify"
+              " other users' keys\n(by looking at passports, checking"
+              " fingerprints from different sources, etc.)\n"));
+  tty_printf("\n");
+  tty_printf (_("  %d = I trust marginally\n"), 1);
+  tty_printf (_("  %d = I trust fully\n"), 2);

   tty_printf("\n");
 
   while(*trust_value==0)
   tty_printf("\n");
 
   while(*trust_value==0)


@@ -342,8 +435,6 @@ trustsig_prompt(byte *trust_value,byte *trust_depth,char **regexp)
       cpr_kill_prompt();
       *trust_depth=atoi(p);
       m_free(p);
       cpr_kill_prompt();
       *trust_depth=atoi(p);
       m_free(p);

-      if(*trust_depth<1 || *trust_depth>255)
-       *trust_depth=0;

     }
 
   tty_printf("\n");
     }
 
   tty_printf("\n");


@@ -438,7 +529,6 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
     /* loop over all signators */
     for( sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next ) {
         u32 sk_keyid[2],pk_keyid[2];
     /* loop over all signators */
     for( sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next ) {
         u32 sk_keyid[2],pk_keyid[2];

-       size_t n;

        char *p,*trust_regexp=NULL;
        int force_v4=0,class=0,selfsig=0;
        u32 duration=0,timestamp=0;
        char *p,*trust_regexp=NULL;
        int force_v4=0,class=0,selfsig=0;
        u32 duration=0,timestamp=0;


@@ -493,7 +583,9 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
                      {
                        tty_printf(_("User ID \"%s\" is revoked."),user);
 
                      {
                        tty_printf(_("User ID \"%s\" is revoked."),user);
 

-                       if(opt.expert)
+                       if(selfsig)
+                         tty_printf("\n");
+                       else if(opt.expert)

                          {
                            tty_printf("\n");
                            /* No, so remove the mark and continue */
                          {
                            tty_printf("\n");
                            /* No, so remove the mark and continue */


@@ -501,11 +593,15 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
                                                      _("Are you sure you "
                                                        "still want to sign "
                                                        "it? (y/N) ")))
                                                      _("Are you sure you "
                                                        "still want to sign "
                                                        "it? (y/N) ")))

-                             uidnode->flag &= ~NODFLG_MARK_A;
+                             {
+                               uidnode->flag &= ~NODFLG_MARK_A;
+                               uidnode=NULL;
+                             }

                          }
                        else
                          {
                            uidnode->flag &= ~NODFLG_MARK_A;
                          }
                        else
                          {
                            uidnode->flag &= ~NODFLG_MARK_A;

+                           uidnode=NULL;

                            tty_printf(_("  Unable to sign.\n"));
                          }
                      }
                            tty_printf(_("  Unable to sign.\n"));
                          }
                      }


@@ -513,7 +609,9 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
                      {
                        tty_printf(_("User ID \"%s\" is expired."),user);
 
                      {
                        tty_printf(_("User ID \"%s\" is expired."),user);
 

-                       if(opt.expert)
+                       if(selfsig)
+                         tty_printf("\n");
+                       else if(opt.expert)

                          {
                            tty_printf("\n");
                            /* No, so remove the mark and continue */
                          {
                            tty_printf("\n");
                            /* No, so remove the mark and continue */


@@ -521,11 +619,15 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
                                                      _("Are you sure you "
                                                        "still want to sign "
                                                        "it? (y/N) ")))
                                                      _("Are you sure you "
                                                        "still want to sign "
                                                        "it? (y/N) ")))

-                             uidnode->flag &= ~NODFLG_MARK_A;
+                             {
+                               uidnode->flag &= ~NODFLG_MARK_A;
+                               uidnode=NULL;
+                             }

                          }
                        else
                          {
                            uidnode->flag &= ~NODFLG_MARK_A;
                          }
                        else
                          {
                            uidnode->flag &= ~NODFLG_MARK_A;

+                           uidnode=NULL;

                            tty_printf(_("  Unable to sign.\n"));
                          }
                      }
                            tty_printf(_("  Unable to sign.\n"));
                          }
                      }


@@ -542,11 +644,15 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
                                                      _("Are you sure you "
                                                        "still want to sign "
                                                        "it? (y/N) ")))
                                                      _("Are you sure you "
                                                        "still want to sign "
                                                        "it? (y/N) ")))

-                             uidnode->flag &= ~NODFLG_MARK_A;
+                             {
+                               uidnode->flag &= ~NODFLG_MARK_A;
+                               uidnode=NULL;
+                             }

                          }
                        else
                          {
                            uidnode->flag &= ~NODFLG_MARK_A;
                          }
                        else
                          {
                            uidnode->flag &= ~NODFLG_MARK_A;

+                           uidnode=NULL;

                            tty_printf(_("  Unable to sign.\n"));
                          }
                      }
                            tty_printf(_("  Unable to sign.\n"));
                          }
                      }


@@ -639,12 +745,11 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
                     * case we should allow to sign it again. */
                     if (!node->pkt->pkt.signature->flags.exportable && local)
                       tty_printf(_(
                     * case we should allow to sign it again. */
                     if (!node->pkt->pkt.signature->flags.exportable && local)
                       tty_printf(_(

-                         "\"%s\" was already locally signed by key %08lX\n"),
-                                user,(ulong)sk_keyid[1] );
+                             "\"%s\" was already locally signed by key %s\n"),
+                                user,keystr_from_sk(sk));

                     else
                     else

-                      tty_printf(_(
-                         "\"%s\" was already signed by key %08lX\n"),
-                                 user,(ulong)sk_keyid[1] );
+                      tty_printf(_("\"%s\" was already signed by key %s\n"),
+                                 user,keystr_from_sk(sk));

 
                    if(opt.expert
                       && cpr_get_answer_is_yes("sign_uid.dupe_okay",
 
                    if(opt.expert
                       && cpr_get_answer_is_yes("sign_uid.dupe_okay",


@@ -666,12 +771,14 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
                }
            }
        }
                }
            }
        }

+

        /* check whether any uids are left for signing */
        /* check whether any uids are left for signing */

-       if( !count_uids_with_flag(keyblock, NODFLG_MARK_A) ) {
-           tty_printf(_("Nothing to sign with key %08lX\n"),
-                                                 (ulong)sk_keyid[1] );
+       if( !count_uids_with_flag(keyblock, NODFLG_MARK_A) )
+         {
+           tty_printf(_("Nothing to sign with key %s\n"),keystr_from_sk(sk));

            continue;
            continue;

-       }
+         }
+

        /* Ask whether we really should sign these user id(s) */
        tty_printf("\n");
        show_key_with_all_names( keyblock, 1, 0, 1, 0, 0 );
        /* Ask whether we really should sign these user id(s) */
        tty_printf("\n");
        show_key_with_all_names( keyblock, 1, 0, 1, 0, 0 );


@@ -761,8 +868,8 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
          ;
        else
          {
          ;
        else
          {

-           if(opt.batch)
-             class=0x10+opt.def_cert_check_level;
+           if(opt.batch || !opt.ask_cert_level)
+             class=0x10+opt.def_cert_level;

            else
              {
                char *answer;
            else
              {
                char *answer;


@@ -773,21 +880,21 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
                             "answer, enter \"0\".\n"));
                tty_printf("\n");
                tty_printf(_("   (0) I will not answer.%s\n"),
                             "answer, enter \"0\".\n"));
                tty_printf("\n");
                tty_printf(_("   (0) I will not answer.%s\n"),

-                          opt.def_cert_check_level==0?" (default)":"");
+                          opt.def_cert_level==0?" (default)":"");

                tty_printf(_("   (1) I have not checked at all.%s\n"),
                tty_printf(_("   (1) I have not checked at all.%s\n"),

-                          opt.def_cert_check_level==1?" (default)":"");
+                          opt.def_cert_level==1?" (default)":"");

                tty_printf(_("   (2) I have done casual checking.%s\n"),
                tty_printf(_("   (2) I have done casual checking.%s\n"),

-                          opt.def_cert_check_level==2?" (default)":"");
+                          opt.def_cert_level==2?" (default)":"");

                tty_printf(_("   (3) I have done very careful checking.%s\n"),
                tty_printf(_("   (3) I have done very careful checking.%s\n"),

-                          opt.def_cert_check_level==3?" (default)":"");
+                          opt.def_cert_level==3?" (default)":"");

                tty_printf("\n");
 
                while(class==0)
                  {
                    answer = cpr_get("sign_uid.class",_("Your selection? "
                tty_printf("\n");
 
                while(class==0)
                  {
                    answer = cpr_get("sign_uid.class",_("Your selection? "

-                                       "(enter '?' for more information): "));
+                                       "(enter `?' for more information): "));

                    if(answer[0]=='\0')
                    if(answer[0]=='\0')

-                     class=0x10+opt.def_cert_check_level; /* Default */
+                     class=0x10+opt.def_cert_level; /* Default */

                    else if(ascii_strcasecmp(answer,"0")==0)
                      class=0x10; /* Generic */
                    else if(ascii_strcasecmp(answer,"1")==0)
                    else if(ascii_strcasecmp(answer,"0")==0)
                      class=0x10; /* Generic */
                    else if(ascii_strcasecmp(answer,"1")==0)


@@ -807,49 +914,63 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
              trustsig_prompt(&trust_value,&trust_depth,&trust_regexp);
          }
 
              trustsig_prompt(&trust_value,&trust_depth,&trust_regexp);
          }
 

-       tty_printf(_("Are you really sure that you want to sign this key\n"
-                    "with your key: \""));
-       p = get_user_id( sk_keyid, &n );
-       tty_print_utf8_string( p, n );
-       m_free(p); p = NULL;
-       tty_printf("\" (%08lX)\n",(ulong)sk_keyid[1]);
+       p=get_user_id_native(sk_keyid);
+       tty_printf(_("Are you sure that you want to sign this key with your\n"
+                    "key \"%s\" (%s)\n"),p,keystr_from_sk(sk));
+       m_free(p);

 
        if(selfsig)
          {
 
        if(selfsig)
          {

-           tty_printf(_("\nThis will be a self-signature.\n"));
+            tty_printf("\n");
+           tty_printf(_("This will be a self-signature.\n"));

 
            if( local )
 
            if( local )

-             tty_printf(
-                        _("\nWARNING: the signature will not be marked "
+              {
+                tty_printf("\n");
+                tty_printf(
+                        _("WARNING: the signature will not be marked "

                           "as non-exportable.\n"));
                           "as non-exportable.\n"));

+              }

 
            if( nonrevocable )
 
            if( nonrevocable )

-             tty_printf(
-                        _("\nWARNING: the signature will not be marked "
+              {
+                tty_printf("\n");
+                tty_printf(
+                        _("WARNING: the signature will not be marked "

                           "as non-revocable.\n"));
                           "as non-revocable.\n"));

+              }

          }
        else
          {
            if( local )
          }
        else
          {
            if( local )

-             tty_printf(
-                    _("\nThe signature will be marked as non-exportable.\n"));
+              {
+                tty_printf("\n");
+                tty_printf(
+                    _("The signature will be marked as non-exportable.\n"));
+              }

 
            if( nonrevocable )
 
            if( nonrevocable )

-             tty_printf(
-                     _("\nThe signature will be marked as non-revocable.\n"));
+              {
+                tty_printf("\n");
+                tty_printf(
+                     _("The signature will be marked as non-revocable.\n"));
+              }

 
            switch(class)
              {
              case 0x11:
 
            switch(class)
              {
              case 0x11:

-               tty_printf(_("\nI have not checked this key at all.\n"));
+                tty_printf("\n");
+               tty_printf(_("I have not checked this key at all.\n"));

                break;
 
              case 0x12:
                break;
 
              case 0x12:

-               tty_printf(_("\nI have checked this key casually.\n"));
+                tty_printf("\n");
+               tty_printf(_("I have checked this key casually.\n"));

                break;
 
              case 0x13:
                break;
 
              case 0x13:

-               tty_printf(_("\nI have checked this key very carefully.\n"));
+                tty_printf("\n");
+               tty_printf(_("I have checked this key very carefully.\n"));

                break;
              }
          }
                break;
              }
          }


@@ -858,7 +979,8 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
 
        if( opt.batch && opt.answer_yes )
          ;
 
        if( opt.batch && opt.answer_yes )
          ;

-       else if( !cpr_get_answer_is_yes("sign_uid.okay", _("Really sign? ")) )
+       else if( !cpr_get_answer_is_yes("sign_uid.okay",
+                                       _("Really sign? (y/N) ")) )

            continue;
 
        /* now we can sign the user ids */
            continue;
 
        /* now we can sign the user ids */


@@ -998,7 +1120,7 @@ change_passphrase( KBNODE keyblock )
        set_next_passphrase( NULL );
        for(;;) {
            s2k->mode = opt.s2k_mode;
        set_next_passphrase( NULL );
        for(;;) {
            s2k->mode = opt.s2k_mode;

-           s2k->hash_algo = opt.s2k_digest_algo;
+           s2k->hash_algo = S2K_DIGEST_ALGO;

            dek = passphrase_to_dek( NULL, 0, opt.s2k_cipher_algo,
                                      s2k, 2, errtext, NULL);
            if( !dek ) {
            dek = passphrase_to_dek( NULL, 0, opt.s2k_cipher_algo,
                                      s2k, 2, errtext, NULL);
            if( !dek ) {


@@ -1010,7 +1132,7 @@ change_passphrase( KBNODE keyblock )
                tty_printf(_( "You don't want a passphrase -"
                            " this is probably a *bad* idea!\n\n"));
                if( cpr_get_answer_is_yes("change_passwd.empty.okay",
                tty_printf(_( "You don't want a passphrase -"
                            " this is probably a *bad* idea!\n\n"));
                if( cpr_get_answer_is_yes("change_passwd.empty.okay",

-                              _("Do you really want to do this? ")))
+                              _("Do you really want to do this? (y/N) ")))

                  {
                    changed++;
                    break;
                  {
                    changed++;
                    break;


@@ -1092,81 +1214,124 @@ fix_keyblock( KBNODE keyblock )
     return fixed;
 }
 
     return fixed;
 }
 

+static int
+parse_sign_type(const char *str,int *localsig,int *nonrevokesig,int *trustsig)
+{
+  const char *p=str;
+
+  while(*p)
+    {
+      if(ascii_strncasecmp(p,"l",1)==0)
+       {
+         *localsig=1;
+         p++;
+       }
+      else if(ascii_strncasecmp(p,"nr",2)==0)
+       {
+         *nonrevokesig=1;
+         p+=2;
+       }
+      else if(ascii_strncasecmp(p,"t",1)==0)
+       {
+         *trustsig=1;
+         p++;
+       }
+      else
+       return 0;
+    }
+
+  return 1;
+}
+

 /****************
 /****************

- * Menu driven key editor.  If sign_mode is true semi-automatical signing
- * will be performed. commands are ignore in this case
+ * Menu driven key editor.  If seckey_check is true, then a secret key
+ * that matches username will be looked for.  If it is false, not all
+ * commands will be available.

  *
  * Note: to keep track of some selection we use node->mark MARKBIT_xxxx.
  */
 
  *
  * Note: to keep track of some selection we use node->mark MARKBIT_xxxx.
  */
 

+/* Need an SK for this command */
+#define KEYEDIT_NEED_SK 1
+/* Cannot be viewing the SK for this command */
+#define KEYEDIT_NOT_SK  2
+/* Must be viewing the SK for this command */
+#define KEYEDIT_ONLY_SK 4
+/* Match the tail of the string */
+#define KEYEDIT_TAIL_MATCH 8
+

 void
 void

-keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
-                                                   int sign_mode )
+keyedit_menu( const char *username, STRLIST locusr,
+             STRLIST commands, int quiet, int seckey_check )

 {
 {

-    enum cmdids { cmdNONE = 0,
-          cmdQUIT, cmdHELP, cmdFPR, cmdLIST, cmdSELUID, cmdCHECK, cmdSIGN,
-           cmdTSIGN, cmdLSIGN, cmdNRSIGN, cmdNRLSIGN, cmdREVSIG, cmdREVKEY,
-          cmdREVUID, cmdDELSIG, cmdPRIMARY, cmdDEBUG, cmdSAVE, cmdADDUID,
-          cmdADDPHOTO, cmdDELUID, cmdADDKEY, cmdDELKEY, cmdADDREVOKER,
-          cmdTOGGLE, cmdSELKEY, cmdPASSWD, cmdTRUST, cmdPREF, cmdEXPIRE,
-          cmdENABLEKEY, cmdDISABLEKEY, cmdSHOWPREF, cmdSETPREF, cmdUPDPREF,
-          cmdPREFKS, cmdINVCMD, cmdSHOWPHOTO, cmdUPDTRUST, cmdCHKTRUST,
-          cmdNOP };
-    static struct { const char *name;
-                   enum cmdids id;
-                   int need_sk;
-                   int not_with_sk;
-                   int signmode;
-                   const char *desc;
-                 } cmds[] = {
-       { N_("quit")    , cmdQUIT      , 0,0,1, N_("quit this menu") },
-       { N_("q")       , cmdQUIT      , 0,0,1, NULL   },
-       { N_("save")    , cmdSAVE      , 0,0,1, N_("save and quit") },
-       { N_("help")    , cmdHELP      , 0,0,1, N_("show this help") },
-       {    "?"        , cmdHELP      , 0,0,1, NULL   },
-       { N_("fpr")     , cmdFPR       , 0,0,1, N_("show fingerprint") },
-       { N_("list")    , cmdLIST      , 0,0,1, N_("list key and user IDs") },
-       { N_("l")       , cmdLIST      , 0,0,1, NULL   },
-       { N_("uid")     , cmdSELUID    , 0,0,1, N_("select user ID N") },
-       { N_("key")     , cmdSELKEY    , 0,0,0, N_("select secondary key N") },
-       { N_("check")   , cmdCHECK     , 0,0,1, N_("list signatures") },
-       { N_("c")       , cmdCHECK     , 0,0,1, NULL },
-       { N_("sign")    , cmdSIGN      , 0,1,1, N_("sign the key") },
-       { N_("s")       , cmdSIGN      , 0,1,1, NULL },
-       { N_("tsign")   , cmdTSIGN     , 0,1,1, N_("make a trust signature")},
-       { N_("lsign")   , cmdLSIGN     , 0,1,1, N_("sign the key locally") },
-       { N_("nrsign")  , cmdNRSIGN    , 0,1,1, N_("sign the key non-revocably") },
-       { N_("nrlsign") , cmdNRLSIGN   , 0,1,1, N_("sign the key locally and non-revocably") },
-       { N_("debug")   , cmdDEBUG     , 0,0,0, NULL },
-       { N_("adduid")  , cmdADDUID    , 1,1,0, N_("add a user ID") },
-       { N_("addphoto"), cmdADDPHOTO  , 1,1,0, N_("add a photo ID") },
-       { N_("deluid")  , cmdDELUID    , 0,1,0, N_("delete user ID") },
-       /* delphoto is really deluid in disguise */
-       { N_("delphoto"), cmdDELUID    , 0,1,0, NULL },
-       { N_("addkey")  , cmdADDKEY    , 1,1,0, N_("add a secondary key") },
-       { N_("delkey")  , cmdDELKEY    , 0,1,0, N_("delete a secondary key") },
-       { N_("addrevoker"),cmdADDREVOKER,1,1,0, N_("add a revocation key") },
-       { N_("delsig")  , cmdDELSIG    , 0,1,0, N_("delete signatures") },
-       { N_("expire")  , cmdEXPIRE    , 1,1,0, N_("change the expire date") },
-        { N_("primary") , cmdPRIMARY   , 1,1,0, N_("flag user ID as primary")},
-       { N_("toggle")  , cmdTOGGLE    , 1,0,0, N_("toggle between secret "
-                                                  "and public key listing") },
-       { N_("t"     )  , cmdTOGGLE    , 1,0,0, NULL },
-       { N_("pref")    , cmdPREF      , 0,1,0, N_("list preferences (expert)") },
-       { N_("showpref"), cmdSHOWPREF  , 0,1,0, N_("list preferences (verbose)") },
-       { N_("setpref") , cmdSETPREF   , 1,1,0, N_("set preference list") },
-       { N_("updpref") , cmdUPDPREF   , 1,1,0, N_("updated preferences") },
-       { N_("keyserver"),cmdPREFKS    , 1,1,0, N_("set preferred keyserver URL")},
-       { N_("passwd")  , cmdPASSWD    , 1,1,0, N_("change the passphrase") },
-       { N_("trust")   , cmdTRUST     , 0,1,0, N_("change the ownertrust") },
-       { N_("revsig")  , cmdREVSIG    , 0,1,0, N_("revoke signatures") },
-       { N_("revuid")  , cmdREVUID    , 1,1,0, N_("revoke a user ID") },
-       { N_("revkey")  , cmdREVKEY    , 1,1,0, N_("revoke a secondary key") },
-       { N_("disable") , cmdDISABLEKEY, 0,1,0, N_("disable a key") },
-       { N_("enable")  , cmdENABLEKEY , 0,1,0, N_("enable a key") },
-       { N_("showphoto"),cmdSHOWPHOTO , 0,0,0, N_("show photo ID") },
-
-    { NULL, cmdNONE } };
+  enum cmdids
+    { cmdNONE = 0,
+      cmdQUIT, cmdHELP, cmdFPR, cmdLIST, cmdSELUID, cmdCHECK, cmdSIGN,
+      cmdREVSIG, cmdREVKEY, cmdREVUID, cmdDELSIG, cmdPRIMARY, cmdDEBUG,
+      cmdSAVE, cmdADDUID, cmdADDPHOTO, cmdDELUID, cmdADDKEY, cmdDELKEY,
+      cmdADDREVOKER, cmdTOGGLE, cmdSELKEY, cmdPASSWD, cmdTRUST, cmdPREF,
+      cmdEXPIRE, cmdENABLEKEY, cmdDISABLEKEY, cmdSHOWPREF, cmdSETPREF,
+      cmdUPDPREF, cmdPREFKS, cmdINVCMD, cmdSHOWPHOTO, cmdUPDTRUST,
+      cmdCHKTRUST, cmdADDCARDKEY, cmdKEYTOCARD,
+      cmdNOP };
+  static struct
+  {
+    const char *name;
+    enum cmdids id;
+    int flags;
+    const char *desc;
+  } cmds[] =
+    { 
+      { "quit"    , cmdQUIT      , 0, N_("quit this menu") },
+      { "q"       , cmdQUIT      , 0, NULL   },
+      { "save"    , cmdSAVE      , 0, N_("save and quit") },
+      { "help"    , cmdHELP      , 0, N_("show this help") },
+      { "?"       , cmdHELP      , 0, NULL   },
+      { "fpr"     , cmdFPR       , 0, N_("show fingerprint") },
+      { "list"    , cmdLIST      , 0, N_("list key and user IDs") },
+      { "l"       , cmdLIST      , 0, NULL   },
+      { "uid"     , cmdSELUID    , 0, N_("select user ID N") },
+      { "key"     , cmdSELKEY    , 0, N_("select secondary key N") },
+      { "check"   , cmdCHECK     , 0, N_("list signatures") },
+      { "c"       , cmdCHECK     , 0, NULL },
+      { "sign"    , cmdSIGN      , KEYEDIT_NOT_SK|KEYEDIT_TAIL_MATCH, N_("sign the key") },
+      { "s"       , cmdSIGN      , KEYEDIT_NOT_SK, NULL },
+      /* "lsign" will never match since "sign" comes first and it is a
+        tail match.  It is here so it shows up in the help menu. */
+      { "lsign"   , cmdNOP       , 0, N_("sign the key locally") },
+      { "debug"   , cmdDEBUG     , 0, NULL },
+      { "adduid"  , cmdADDUID    , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a user ID") },
+      { "addphoto", cmdADDPHOTO  , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a photo ID") },
+      { "deluid"  , cmdDELUID    , KEYEDIT_NOT_SK, N_("delete user ID") },
+      /* delphoto is really deluid in disguise */
+      { "delphoto", cmdDELUID    , KEYEDIT_NOT_SK, NULL },
+      { "addkey"  , cmdADDKEY    , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a secondary key") },
+#ifdef ENABLE_CARD_SUPPORT
+      { "addcardkey", cmdADDCARDKEY , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a key to a smartcard") },
+      { "keytocard", cmdKEYTOCARD , KEYEDIT_NEED_SK|KEYEDIT_ONLY_SK, N_("move a key to a smartcard")},
+#endif /*ENABLE_CARD_SUPPORT*/
+      { "delkey"  , cmdDELKEY    , KEYEDIT_NOT_SK, N_("delete a secondary key") },
+      { "addrevoker",cmdADDREVOKER,KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("add a revocation key") },
+      { "delsig"  , cmdDELSIG    , KEYEDIT_NOT_SK, N_("delete signatures") },
+      { "expire"  , cmdEXPIRE    , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the expire date") },
+      { "primary" , cmdPRIMARY   , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("flag user ID as primary")},
+      { "toggle"  , cmdTOGGLE    , KEYEDIT_NEED_SK, N_("toggle between secret and public key listing") },
+      { "t"       , cmdTOGGLE    , KEYEDIT_NEED_SK, NULL },
+      { "pref"    , cmdPREF      , KEYEDIT_NOT_SK, N_("list preferences (expert)")},
+      { "showpref", cmdSHOWPREF  , KEYEDIT_NOT_SK, N_("list preferences (verbose)") },
+      { "setpref" , cmdSETPREF   , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preference list") },
+      { "updpref" , cmdUPDPREF   , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("updated preferences") },
+      { "keyserver",cmdPREFKS    , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("set preferred keyserver URL")},
+      { "passwd"  , cmdPASSWD    , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("change the passphrase") },
+      { "trust"   , cmdTRUST     , KEYEDIT_NOT_SK, N_("change the ownertrust") },
+      { "revsig"  , cmdREVSIG    , KEYEDIT_NOT_SK, N_("revoke signatures") },
+      { "revuid"  , cmdREVUID    , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke a user ID") },
+      { "revkey"  , cmdREVKEY    , KEYEDIT_NOT_SK|KEYEDIT_NEED_SK, N_("revoke a secondary key") },
+      { "disable" , cmdDISABLEKEY, KEYEDIT_NOT_SK, N_("disable a key") },
+      { "enable"  , cmdENABLEKEY , KEYEDIT_NOT_SK, N_("enable a key") },
+      { "showphoto",cmdSHOWPHOTO , 0, N_("show photo ID") },
+      { NULL, cmdNONE, 0, NULL }
+    };

     enum cmdids cmd = 0;
     int rc = 0;
     KBNODE keyblock = NULL;
     enum cmdids cmd = 0;
     int rc = 0;
     KBNODE keyblock = NULL;


@@ -1183,18 +1348,11 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
 
     if ( opt.command_fd != -1 )
         ;
 
     if ( opt.command_fd != -1 )
         ;

-    else if( opt.batch && !have_commands  ) {
-       log_error(_("can't do that in batchmode\n"));
+    else if( opt.batch && !have_commands )
+      {
+       log_error(_("can't do this in batch mode\n"));

        goto leave;
        goto leave;

-    }
-
-    if( sign_mode ) {
-       commands = NULL;
-       append_to_strlist( &commands, sign_mode == 1? "sign":
-                          sign_mode == 2?"lsign":
-                          sign_mode == 3?"nrsign":"nrlsign");
-       have_commands = 1;
-    }
+      }

 
     /* get the public key */
     rc = get_pubkey_byname (NULL, username, &keyblock, &kdbhd, 1);
 
     /* get the public key */
     rc = get_pubkey_byname (NULL, username, &keyblock, &kdbhd, 1);


@@ -1206,7 +1364,8 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
        modified++;
     reorder_keyblock(keyblock);
 
        modified++;
     reorder_keyblock(keyblock);
 

-    if( !sign_mode ) {/* see whether we have a matching secret key */
+    if(seckey_check)
+      {/* see whether we have a matching secret key */

         PKT_public_key *pk = keyblock->pkt->pkt.public_key;
 
         sec_kdbhd = keydb_new (1);
         PKT_public_key *pk = keyblock->pkt->pkt.public_key;
 
         sec_kdbhd = keydb_new (1);


@@ -1219,28 +1378,30 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
                 afp[an++] = 0;
             rc = keydb_search_fpr (sec_kdbhd, afp);
         }
                 afp[an++] = 0;
             rc = keydb_search_fpr (sec_kdbhd, afp);
         }

-       if (!rc) {
+       if (!rc)
+         {

            rc = keydb_get_keyblock (sec_kdbhd, &sec_keyblock);
            rc = keydb_get_keyblock (sec_kdbhd, &sec_keyblock);

-           if (rc) {
-               log_error (_("error reading secret keyblock `%s': %s\n"),
-                                               username, g10_errstr(rc));
-           }
-            else {
+           if (rc)
+             {
+               log_error (_("error reading secret keyblock \"%s\": %s\n"),
+                          username, g10_errstr(rc));
+             }
+            else
+             {

                 merge_keys_and_selfsig( sec_keyblock );
                 if( fix_keyblock( sec_keyblock ) )
                 merge_keys_and_selfsig( sec_keyblock );
                 if( fix_keyblock( sec_keyblock ) )

-                    sec_modified++;
-            }
-       }
+                 sec_modified++;
+             }
+         }

 
         if (rc) {
             sec_keyblock = NULL;
             keydb_release (sec_kdbhd); sec_kdbhd = NULL;
             rc = 0;
         }
 
         if (rc) {
             sec_keyblock = NULL;
             keydb_release (sec_kdbhd); sec_kdbhd = NULL;
             rc = 0;
         }

-    }

 
 

-    if( sec_keyblock ) { 
-       tty_printf(_("Secret key is available.\n"));
+       if( sec_keyblock && !quiet )
+         tty_printf(_("Secret key is available.\n"));

     }
 
     toggle = 0;
     }
 
     toggle = 0;


@@ -1252,11 +1413,12 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
        PKT_public_key *pk=keyblock->pkt->pkt.public_key;
 
        tty_printf("\n");
        PKT_public_key *pk=keyblock->pkt->pkt.public_key;
 
        tty_printf("\n");

-       if( redisplay ) {
+       if( redisplay && !quiet )
+         {

            show_key_with_all_names( cur_keyblock, 0, 1, 0, 1, 0 );
            tty_printf("\n");
            redisplay = 0;
            show_key_with_all_names( cur_keyblock, 0, 1, 0, 1, 0 );
            tty_printf("\n");
            redisplay = 0;

-       }
+         }

        do {
            m_free(answer);
            if( have_commands ) {
        do {
            m_free(answer);
            if( have_commands ) {


@@ -1296,33 +1458,49 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
                 arg_string = p;
            }
 
                 arg_string = p;
            }
 

-           for(i=0; cmds[i].name; i++ ) {
-               if( !ascii_strcasecmp( answer, cmds[i].name ) )
-                   break;
-           }
-           if( sign_mode && !cmds[i].signmode )
-               cmd = cmdINVCMD;
-           else if( cmds[i].need_sk && !sec_keyblock ) {
+           for(i=0; cmds[i].name; i++ )
+             {
+               if(cmds[i].flags & KEYEDIT_TAIL_MATCH)
+                 {
+                   size_t l=strlen(cmds[i].name);
+                   size_t a=strlen(answer);
+                   if(a>=l)
+                     {
+                       if(ascii_strcasecmp(&answer[a-l],cmds[i].name)==0)
+                         {
+                           answer[a-l]='\0';
+                           break;
+                         }
+                     }
+                 }
+               else if( !ascii_strcasecmp( answer, cmds[i].name ) )
+                 break;
+             }
+           if((cmds[i].flags & KEYEDIT_NEED_SK) && !sec_keyblock )
+             {

                tty_printf(_("Need the secret key to do this.\n"));
                cmd = cmdNOP;
                tty_printf(_("Need the secret key to do this.\n"));
                cmd = cmdNOP;

-           }
-           else if( cmds[i].not_with_sk && sec_keyblock && toggle ) {
+             }
+           else if(((cmds[i].flags & KEYEDIT_NOT_SK) && sec_keyblock
+                    && toggle)
+                    ||((cmds[i].flags & KEYEDIT_ONLY_SK) && sec_keyblock
+                      && !toggle))
+             {

                tty_printf(_("Please use the command \"toggle\" first.\n"));
                cmd = cmdNOP;
                tty_printf(_("Please use the command \"toggle\" first.\n"));
                cmd = cmdNOP;

-           }
+             }

            else
            else

-               cmd = cmds[i].id;
+             cmd = cmds[i].id;

        }
        switch( cmd )  {
          case cmdHELP:
        }
        switch( cmd )  {
          case cmdHELP:

-           for(i=0; cmds[i].name; i++ ) {
-               if( sign_mode && !cmds[i].signmode )
-                   ;
-               else if( cmds[i].need_sk && !sec_keyblock )
-                   ; /* skip if we do not have the secret key */
+           for(i=0; cmds[i].name; i++ )
+             {
+               if((cmds[i].flags & KEYEDIT_NEED_SK) && !sec_keyblock )
+                 ; /* skip if we do not have the secret key */

                else if( cmds[i].desc )
                else if( cmds[i].desc )

-                   tty_printf("%-10s %s\n", cmds[i].name, _(cmds[i].desc) );
-           }
+                 tty_printf("%-10s %s\n", cmds[i].name, _(cmds[i].desc) );
+             }

            break;
 
          case cmdLIST:
            break;
 
          case cmdLIST:


@@ -1351,42 +1529,49 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
            break;
 
          case cmdSIGN: /* sign (only the public key) */
            break;
 
          case cmdSIGN: /* sign (only the public key) */

-         case cmdLSIGN: /* sign (only the public key) */
-         case cmdNRSIGN: /* sign (only the public key) */
-         case cmdNRLSIGN: /* sign (only the public key) */
-         case cmdTSIGN:
-           if( pk->is_revoked )
-             {
-               tty_printf(_("Key is revoked."));
+           {
+             int localsig=0,nonrevokesig=0,trustsig=0;

 
 

-               if(opt.expert)
-                 {
-                   tty_printf("  ");
-                   if(!cpr_get_answer_is_yes("keyedit.sign_revoked.okay",
-                                             _("Are you sure you still want "
-                                               "to sign it? (y/N) ")))
+             if( pk->is_revoked )
+               {
+                 tty_printf(_("Key is revoked."));
+
+                 if(opt.expert)
+                   {
+                     tty_printf("  ");
+                     if(!cpr_get_answer_is_yes("keyedit.sign_revoked.okay",
+                                               _("Are you sure you still want"
+                                                 " to sign it? (y/N) ")))
+                       break;
+                   }
+                 else
+                   {
+                     tty_printf(_("  Unable to sign.\n"));

                      break;
                      break;

-                 }
-               else
-                 {
-                   tty_printf(_("  Unable to sign.\n"));
-                   break;
-                 }
-             }
+                   }
+               }

 
 

-           if( count_uids(keyblock) > 1 && !count_selected_uids(keyblock) ) {
-               if( !cpr_get_answer_is_yes("keyedit.sign_all.okay",
-                                          _("Really sign all user IDs? ")) ) {
-                   tty_printf(_("Hint: Select the user IDs to sign\n"));
-                   break;
+             if( count_uids(keyblock) > 1 && !count_selected_uids(keyblock) )
+               {
+                 if( !cpr_get_answer_is_yes("keyedit.sign_all.okay",
+                                            _("Really sign all user IDs?"
+                                              " (y/N) ")))
+                   {
+                     tty_printf(_("Hint: Select the user IDs to sign\n"));
+                     break;
+                   }
+               }
+
+             /* What sort of signing are we doing? */
+             if(!parse_sign_type(answer,&localsig,&nonrevokesig,&trustsig))
+               {
+                 tty_printf(_("Unknown signature type `%s'\n"),answer);
+                 break;

                }
                }

+
+             sign_uids(keyblock, locusr, &modified,
+                       localsig, nonrevokesig, trustsig);

            }
            }

-           if( !sign_uids( keyblock, locusr, &modified,
-                           (cmd == cmdLSIGN) || (cmd == cmdNRLSIGN),
-                           (cmd == cmdNRSIGN) || (cmd==cmdNRLSIGN),
-                           (cmd == cmdTSIGN))
-               && sign_mode )
-               goto do_cmd_save;

            break;
 
          case cmdDEBUG:
            break;
 
          case cmdDEBUG:


@@ -1411,12 +1596,14 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
            /* fall through */
 
          case cmdADDUID:
            /* fall through */
 
          case cmdADDUID:

-           if( menu_adduid( keyblock, sec_keyblock, photo ) ) {
+           if( menu_adduid( keyblock, sec_keyblock, photo ) )
+             {
+               update_trust = 1;

                redisplay = 1;
                sec_modified = modified = 1;
                merge_keys_and_selfsig( sec_keyblock );
                merge_keys_and_selfsig( keyblock );
                redisplay = 1;
                sec_modified = modified = 1;
                merge_keys_and_selfsig( sec_keyblock );
                merge_keys_and_selfsig( keyblock );

-           }
+             }

            break;
 
          case cmdDELUID: {
            break;
 
          case cmdDELUID: {


@@ -1426,10 +1613,9 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
                    tty_printf(_("You must select at least one user ID.\n"));
                else if( real_uids_left(keyblock) < 1 )
                    tty_printf(_("You can't delete the last user ID!\n"));
                    tty_printf(_("You must select at least one user ID.\n"));
                else if( real_uids_left(keyblock) < 1 )
                    tty_printf(_("You can't delete the last user ID!\n"));

-               else if( cpr_get_answer_is_yes(
-                           "keyedit.remove.uid.okay",
-                       n1 > 1? _("Really remove all selected user IDs? ")
-                             : _("Really remove this user ID? ")
+               else if( cpr_get_answer_is_yes("keyedit.remove.uid.okay",
+               n1 > 1? _("Really remove all selected user IDs? (y/N) ")
+                           : _("Really remove this user ID? (y/N) ")

                       ) ) {
                    menu_deluid( keyblock, sec_keyblock );
                    redisplay = 1;
                       ) ) {
                    menu_deluid( keyblock, sec_keyblock );
                    redisplay = 1;


@@ -1462,17 +1648,60 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
            }
            break;
 
            }
            break;
 

+#ifdef ENABLE_CARD_SUPPORT
+         case cmdADDCARDKEY:
+           if (card_generate_subkey (keyblock, sec_keyblock)) {
+               redisplay = 1;
+               sec_modified = modified = 1;
+               merge_keys_and_selfsig( sec_keyblock );
+               merge_keys_and_selfsig( keyblock );
+           }
+           break;
+
+        case cmdKEYTOCARD:
+         {
+           KBNODE node=NULL;
+           switch ( count_selected_keys (sec_keyblock) )
+             {
+             case 0:
+               if (cpr_get_answer_is_yes("keyedit.keytocard.use_primary",
+                                    _("Really move the primary key? (y/N) ")))
+                 node = sec_keyblock;
+               break;
+             case 1:
+               for (node = sec_keyblock; node; node = node->next )
+                 {
+                   if (node->pkt->pkttype == PKT_SECRET_SUBKEY 
+                       && node->flag & NODFLG_SELKEY)
+                     break;
+                 }
+               break;
+             default:
+               tty_printf(_("You must select exactly one key.\n"));
+               break;
+             }
+           if (node)
+             {
+               PKT_public_key *xxpk = find_pk_from_sknode (keyblock, node);
+               if (card_store_subkey (node, xxpk?xxpk->pubkey_usage:0))
+                 {
+                   redisplay = 1;
+                   sec_modified = 1;
+                 }
+             }
+         }
+          break;
+#endif /* ENABLE_CARD_SUPPORT */

 
          case cmdDELKEY: {
                int n1;
 
                if( !(n1=count_selected_keys( keyblock )) )
                    tty_printf(_("You must select at least one key.\n"));
 
          case cmdDELKEY: {
                int n1;
 
                if( !(n1=count_selected_keys( keyblock )) )
                    tty_printf(_("You must select at least one key.\n"));

-               else if( sec_keyblock && !cpr_get_answer_is_yes(
-                           "keyedit.remove.subkey.okay",
+               else if( !cpr_get_answer_is_yes( "keyedit.remove.subkey.okay",

                       n1 > 1?
                       n1 > 1?

-                       _("Do you really want to delete the selected keys? "):
-                       _("Do you really want to delete this key? ")
+                  _("Do you really want to delete the selected keys? (y/N) "):
+                       _("Do you really want to delete this key? (y/N) ")

                       ))
                    ;
                else {
                       ))
                    ;
                else {


@@ -1507,8 +1736,8 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
                    tty_printf(_("You must select at least one user ID.\n"));
                else if( cpr_get_answer_is_yes(
                            "keyedit.revoke.uid.okay",
                    tty_printf(_("You must select at least one user ID.\n"));
                else if( cpr_get_answer_is_yes(
                            "keyedit.revoke.uid.okay",

-                       n1 > 1? _("Really revoke all selected user IDs? ")
-                             : _("Really revoke this user ID? ")
+                      n1 > 1? _("Really revoke all selected user IDs? (y/N) ")
+                            : _("Really revoke this user ID? (y/N) ")

                       ) ) {
                  if(menu_revuid(keyblock,sec_keyblock))
                    {
                       ) ) {
                  if(menu_revuid(keyblock,sec_keyblock))
                    {


@@ -1527,8 +1756,8 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
                else if( sec_keyblock && !cpr_get_answer_is_yes(
                            "keyedit.revoke.subkey.okay",
                       n1 > 1?
                else if( sec_keyblock && !cpr_get_answer_is_yes(
                            "keyedit.revoke.subkey.okay",
                       n1 > 1?

-                       _("Do you really want to revoke the selected keys? "):
-                       _("Do you really want to revoke this key? ")
+                  _("Do you really want to revoke the selected keys? (y/N) "):
+                  _("Do you really want to revoke this key? (y/N) ")

                       ))
                    ;
                else {
                       ))
                    ;
                else {


@@ -1565,6 +1794,13 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
            break;
 
          case cmdTRUST:
            break;
 
          case cmdTRUST:

+           if(opt.trust_model==TM_EXTERNAL)
+             {
+               tty_printf(_("Owner trust may not be set while "
+                            "using an user provided trust database\n"));
+               break;
+             }
+

            show_key_with_all_names( keyblock, 0, 0, 0, 1, 0 );
            tty_printf("\n");
            if( edit_ownertrust( find_kbnode( keyblock,
            show_key_with_all_names( keyblock, 0, 0, 0, 1, 0 );
            tty_printf("\n");
            if( edit_ownertrust( find_kbnode( keyblock,


@@ -1592,30 +1828,34 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
          case cmdUPDPREF: 
             {
              PKT_user_id *temp=keygen_get_std_prefs();
          case cmdUPDPREF: 
             {
              PKT_user_id *temp=keygen_get_std_prefs();

-             tty_printf(_("Current preference list:\n"));
-             show_prefs(temp,1);
+             tty_printf(_("Set preference list to:\n"));
+             show_prefs(temp,NULL,1);

              m_free(temp);
             }
             if (cpr_get_answer_is_yes ("keyedit.updpref.okay",
                                         count_selected_uids (keyblock)?
              m_free(temp);
             }
             if (cpr_get_answer_is_yes ("keyedit.updpref.okay",
                                         count_selected_uids (keyblock)?

-                                        _("Really update the preferences"
-                                          " for the selected user IDs? "):
-                                       _("Really update the preferences? "))){
+                                       _("Really update the preferences"
+                                        " for the selected user IDs? (y/N) "):
+                                   _("Really update the preferences? (y/N) ")))
+             {

 
 

-                if ( menu_set_preferences (keyblock, sec_keyblock) ) {
-                    merge_keys_and_selfsig (keyblock);
-                    modified = 1;
-                    redisplay = 1;
-                }
-            }
+                if ( menu_set_preferences (keyblock, sec_keyblock) )
+                 {
+                   merge_keys_and_selfsig (keyblock);
+                   modified = 1;
+                   redisplay = 1;
+                 }
+             }

            break;
 
          case cmdPREFKS:
            break;
 
          case cmdPREFKS:

-           if( menu_set_keyserver_url ( keyblock, sec_keyblock ) ) {
+           if( menu_set_keyserver_url ( *arg_string?arg_string:NULL,
+                                        keyblock, sec_keyblock ) )
+             {

                merge_keys_and_selfsig( keyblock );
                modified = 1;
                redisplay = 1;
                merge_keys_and_selfsig( keyblock );
                modified = 1;
                redisplay = 1;

-           }
+             }

            break;
 
          case cmdNOP:
            break;
 
          case cmdNOP:


@@ -1646,16 +1886,15 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
            if( !modified && !sec_modified )
                goto leave;
            if( !cpr_get_answer_is_yes("keyedit.save.okay",
            if( !modified && !sec_modified )
                goto leave;
            if( !cpr_get_answer_is_yes("keyedit.save.okay",

-                                       _("Save changes? ")) ) {
+                                       _("Save changes? (y/N) ")) ) {

                if( cpr_enabled()
                    || cpr_get_answer_is_yes("keyedit.cancel.okay",
                if( cpr_enabled()
                    || cpr_get_answer_is_yes("keyedit.cancel.okay",

-                                            _("Quit without saving? ")) )
+                                            _("Quit without saving? (y/N) ")))

                    goto leave;
                break;
            }
            /* fall thru */
          case cmdSAVE:
                    goto leave;
                break;
            }
            /* fall thru */
          case cmdSAVE:

-         do_cmd_save:

            if( modified || sec_modified  ) {
                if( modified ) {
                    rc = keydb_update_keyblock (kdbhd, keyblock);
            if( modified || sec_modified  ) {
                if( modified ) {
                    rc = keydb_update_keyblock (kdbhd, keyblock);


@@ -1703,7 +1942,7 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
  * show preferences of a public keyblock.
  */
 static void
  * show preferences of a public keyblock.
  */
 static void

-show_prefs (PKT_user_id *uid, int verbose)
+show_prefs (PKT_user_id *uid, PKT_signature *selfsig, int verbose)

 {
     const prefitem_t fake={0,0};
     const prefitem_t *prefs;
 {
     const prefitem_t fake={0,0};
     const prefitem_t *prefs;


@@ -1721,6 +1960,7 @@ show_prefs (PKT_user_id *uid, int verbose)
 
     if (verbose) {
         int any, des_seen=0, sha1_seen=0, uncomp_seen=0;
 
     if (verbose) {
         int any, des_seen=0, sha1_seen=0, uncomp_seen=0;

+

         tty_printf ("     ");
        tty_printf (_("Cipher: "));
         for(i=any=0; prefs[i].type; i++ ) {
         tty_printf ("     ");
        tty_printf (_("Cipher: "));
         for(i=any=0; prefs[i].type; i++ ) {


@@ -1781,7 +2021,7 @@ show_prefs (PKT_user_id *uid, int verbose)
                     tty_printf ("%s", s );
                 else
                     tty_printf ("[%d]", prefs[i].value);
                     tty_printf ("%s", s );
                 else
                     tty_printf ("[%d]", prefs[i].value);

-                if (prefs[i].value == 0 )
+                if (prefs[i].value == COMPRESS_ALGO_NONE )

                     uncomp_seen = 1;
             }
         }
                     uncomp_seen = 1;
             }
         }


@@ -1789,10 +2029,10 @@ show_prefs (PKT_user_id *uid, int verbose)
             if (any)
                 tty_printf (", ");
            else {
             if (any)
                 tty_printf (", ");
            else {

-             tty_printf ("%s",compress_algo_to_string(1));
+             tty_printf ("%s",compress_algo_to_string(COMPRESS_ALGO_ZIP));

              tty_printf (", ");
            }
              tty_printf (", ");
            }

-           tty_printf ("%s",compress_algo_to_string(0));
+           tty_printf ("%s",compress_algo_to_string(COMPRESS_ALGO_NONE));

         }
        if(uid->mdc_feature || !uid->ks_modify)
          {
         }
        if(uid->mdc_feature || !uid->ks_modify)
          {


@@ -1812,6 +2052,22 @@ show_prefs (PKT_user_id *uid, int verbose)
              }
          }
        tty_printf("\n");
              }
          }
        tty_printf("\n");

+
+       if(selfsig)
+         {
+           const byte *pref_ks;
+           size_t pref_ks_len;
+
+           pref_ks=parse_sig_subpkt(selfsig->hashed,
+                                    SIGSUBPKT_PREF_KS,&pref_ks_len);
+           if(pref_ks && pref_ks_len)
+             {
+               tty_printf ("     ");
+               tty_printf(_("Preferred keyserver: "));
+               tty_print_utf8_string(pref_ks,pref_ks_len);
+               tty_printf("\n");
+             }
+         }

     }
     else {
         tty_printf("    ");
     }
     else {
         tty_printf("    ");


@@ -1873,15 +2129,12 @@ show_key_with_all_names_colon (KBNODE keyblock)
              putchar (trust);
            }
 
              putchar (trust);
            }
 

-          printf (":%u:%d:%08lX%08lX:%lu:%lu:",
+          printf (":%u:%d:%08lX%08lX:%lu:%lu::",

                   nbits_from_pk (pk),
                   pk->pubkey_algo,
                   (ulong)keyid[0], (ulong)keyid[1],
                   (ulong)pk->timestamp,
                   (ulong)pk->expiredate );
                   nbits_from_pk (pk),
                   pk->pubkey_algo,
                   (ulong)keyid[0], (ulong)keyid[1],
                   (ulong)pk->timestamp,
                   (ulong)pk->expiredate );

-          if (pk->local_id)
-            printf ("%lu", pk->local_id);
-          putchar (':');

           if (node->pkt->pkttype==PKT_PUBLIC_KEY
              && !(opt.fast_list_mode || opt.no_expensive_trust_checks ))
            putchar(get_ownertrust_info (pk));
           if (node->pkt->pkttype==PKT_PUBLIC_KEY
              && !(opt.fast_list_mode || opt.no_expensive_trust_checks ))
            putchar(get_ownertrust_info (pk));


@@ -2000,7 +2253,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
                         int with_fpr, int with_subkeys, int with_prefs )
 {
     KBNODE node;
                         int with_fpr, int with_subkeys, int with_prefs )
 {
     KBNODE node;

-    int i, rc;
+    int i;

     int do_warn = 0;
     byte pk_version=0;
     PKT_public_key *primary=NULL;
     int do_warn = 0;
     byte pk_version=0;
     PKT_public_key *primary=NULL;


@@ -2037,54 +2290,75 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
                primary=pk;
            }
 
                primary=pk;
            }
 

-           if(with_revoker) {
+           if(with_revoker)
+             {

                if( !pk->revkey && pk->numrevkeys )
                if( !pk->revkey && pk->numrevkeys )

-                   BUG();
+                 BUG();

                else
                else

-                    for(i=0;i<pk->numrevkeys;i++) {
-                        u32 r_keyid[2];
-                        char *user;
-                       const char *algo=
-                         pubkey_algo_to_string(pk->revkey[i].algid);
-
-                        keyid_from_fingerprint(pk->revkey[i].fpr,
-                                               MAX_FINGERPRINT_LEN,r_keyid);
-                        
-                        user=get_user_id_string (r_keyid);
-                        tty_printf (_("This key may be revoked by %s key "),
-                                   algo?algo:"?");
-                        tty_print_utf8_string (user, strlen (user));
-                        if ((pk->revkey[i].class&0x40))
-                          tty_printf (_(" (sensitive)"));
-                        tty_printf ("\n");
-                        m_free(user);
-                      }
-            }
+                 for(i=0;i<pk->numrevkeys;i++)
+                   {
+                     u32 r_keyid[2];
+                     char *user;
+                     const char *algo=
+                       pubkey_algo_to_string(pk->revkey[i].algid);
+
+                     keyid_from_fingerprint(pk->revkey[i].fpr,
+                                            MAX_FINGERPRINT_LEN,r_keyid);
+
+                     user=get_user_id_string_native(r_keyid);
+                     tty_printf(_("This key may be revoked by %s key %s"),
+                                algo?algo:"?",user);
+
+                     if(pk->revkey[i].class&0x40)
+                       {
+                         tty_printf(" ");
+                         tty_printf(_("(sensitive)"));
+                       }
+
+                     tty_printf ("\n");
+                     m_free(user);
+                   }
+             }

 
            keyid_from_pk(pk,NULL);
 
            keyid_from_pk(pk,NULL);

-           tty_printf("%s%c %4u%c/",
+           tty_printf("%s%c %4u%c/%s  ",

                       node->pkt->pkttype == PKT_PUBLIC_KEY? "pub":"sub",
                       (node->flag & NODFLG_SELKEY)? '*':' ',
                       nbits_from_pk( pk ),
                       node->pkt->pkttype == PKT_PUBLIC_KEY? "pub":"sub",
                       (node->flag & NODFLG_SELKEY)? '*':' ',
                       nbits_from_pk( pk ),

-                      pubkey_letter( pk->pubkey_algo ));
-
-           if(opt.list_options&LIST_SHOW_LONG_KEYID)
-             tty_printf("%08lX",(ulong)pk->keyid[0]);
-
-           tty_printf("%08lX  ",(ulong)pk->keyid[1]);
-           tty_printf(_("created: %s expires: %s"),
-                      datestr_from_pk(pk),
-                      expirestr_from_pk(pk) );
+                      pubkey_letter( pk->pubkey_algo ),
+                      keystr(pk->keyid));
+
+           tty_printf(_("created: %s"),datestr_from_pk(pk));
+           tty_printf("  ");
+           if(pk->is_revoked)
+             tty_printf(_("revoked: %s"),revokestr_from_pk(pk));
+           else if(pk->has_expired)
+             tty_printf(_("expired: %s"),expirestr_from_pk(pk));
+           else
+             tty_printf(_("expires: %s"),expirestr_from_pk(pk));
+           tty_printf("  ");
+            tty_printf(_("usage: %s"),usagestr_from_pk(pk));

            tty_printf("\n");
 
            if( node->pkt->pkttype == PKT_PUBLIC_KEY )
              {
            tty_printf("\n");
 
            if( node->pkt->pkttype == PKT_PUBLIC_KEY )
              {

-               tty_printf("                     ");
-               if(opt.list_options&LIST_SHOW_LONG_KEYID)
-                 tty_printf("        ");
-               tty_printf(_("trust: %-13s"), otrust);
-               tty_printf(_("validity: %s"), trust );
-               tty_printf("\n");
+               if(opt.trust_model!=TM_ALWAYS)
+                 {
+                   tty_printf("%*s",keystrlen()+13,"");
+                   /* Ownertrust is only meaningful for the PGP or
+                      classic trust models */
+                   if(opt.trust_model==TM_PGP || opt.trust_model==TM_CLASSIC)
+                     {
+                       int width=14-strlen(otrust);
+                       if(width<=0)
+                         width=1;
+                       tty_printf(_("trust: %s"), otrust);
+                       tty_printf("%*s",width,"");
+                     }
+                   
+                   tty_printf(_("validity: %s"), trust );
+                   tty_printf("\n");
+                 }

                if( node->pkt->pkttype == PKT_PUBLIC_KEY
                    && (get_ownertrust (pk)&TRUST_FLAG_DISABLED))
                  {
                if( node->pkt->pkttype == PKT_PUBLIC_KEY
                    && (get_ownertrust (pk)&TRUST_FLAG_DISABLED))
                  {


@@ -2101,75 +2375,100 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
              }
        }
        else if( node->pkt->pkttype == PKT_SECRET_KEY
              }
        }
        else if( node->pkt->pkttype == PKT_SECRET_KEY

-           || (with_subkeys && node->pkt->pkttype == PKT_SECRET_SUBKEY) ) {
+           || (with_subkeys && node->pkt->pkttype == PKT_SECRET_SUBKEY) )
+         {

            PKT_secret_key *sk = node->pkt->pkt.secret_key;
            PKT_secret_key *sk = node->pkt->pkt.secret_key;

-           tty_printf(_("%s%c %4u%c/%08lX  created: %s expires: %s"),
-                         node->pkt->pkttype == PKT_SECRET_KEY? "sec":"ssb",
-                         (node->flag & NODFLG_SELKEY)? '*':' ',
-                         nbits_from_sk( sk ),
-                         pubkey_letter( sk->pubkey_algo ),
-                         (ulong)keyid_from_sk(sk,NULL),
-                         datestr_from_sk(sk),
-                         expirestr_from_sk(sk) );
+           tty_printf("%s%c %4u%c/%s  ",
+                      node->pkt->pkttype == PKT_SECRET_KEY? "sec":"ssb",
+                      (node->flag & NODFLG_SELKEY)? '*':' ',
+                      nbits_from_sk( sk ),
+                      pubkey_letter( sk->pubkey_algo ),
+                      keystr_from_sk(sk));
+           tty_printf(_("created: %s"),datestr_from_sk(sk));
+           tty_printf("  ");
+           tty_printf(_("expires: %s"),expirestr_from_sk(sk));

            tty_printf("\n");
            tty_printf("\n");

-       }
-       else if( with_subkeys && node->pkt->pkttype == PKT_SIGNATURE
-                && node->pkt->pkt.signature->sig_class == 0x28       ) {
-           PKT_signature *sig = node->pkt->pkt.signature;
-
-           rc = check_key_signature( keyblock, node, NULL );
-           if( !rc )
-               tty_printf( _("rev! subkey has been revoked: %s\n"),
-                           datestr_from_sig( sig ) );
-           else if( rc == G10ERR_BAD_SIGN )
-               tty_printf( _("rev- faked revocation found\n") );
-           else if( rc )
-               tty_printf( _("rev? problem checking revocation: %s\n"),
-                                                        g10_errstr(rc) );
-       }
+            if (sk->is_protected && sk->protect.s2k.mode == 1002)
+              {
+               tty_printf("                     ");
+                tty_printf(_("card-no: ")); 
+                if (sk->protect.ivlen == 16
+                    && !memcmp (sk->protect.iv, "\xD2\x76\x00\x01\x24\x01", 6))
+                  { /* This is an OpenPGP card. */
+                    for (i=8; i < 14; i++)
+                      {
+                        if (i == 10)
+                          tty_printf (" ");
+                        tty_printf ("%02X", sk->protect.iv[i]);
+                      }
+                  }
+                else
+                  { /* Something is wrong: Print all. */
+                    for (i=0; i < sk->protect.ivlen; i++)
+                      tty_printf ("%02X", sk->protect.iv[i]);
+                  }
+                tty_printf ("\n");
+              }
+         }

     }
     
     /* the user ids */
     }
     
     /* the user ids */

+

     i = 0;
     i = 0;

-    for( node = keyblock; node; node = node->next ) {
-       if( node->pkt->pkttype == PKT_USER_ID ) {
+    for( node = keyblock; node; node = node->next )
+      {
+       if( node->pkt->pkttype == PKT_USER_ID )
+         {

            PKT_user_id *uid = node->pkt->pkt.user_id;
            ++i;
            PKT_user_id *uid = node->pkt->pkt.user_id;
            ++i;

-           if( !only_marked || (only_marked && (node->flag & NODFLG_MARK_A))){
-                if(opt.list_options&LIST_SHOW_VALIDITY && primary)
-                 tty_printf("[%8.8s] ",
-                            trust_value_to_string(get_validity(primary,uid)));
+           if( !only_marked || (only_marked && (node->flag & NODFLG_MARK_A)))
+             {
+               if(!only_marked && primary)
+                 tty_printf("%s ",uid_trust_string_fixed(primary,uid));
+

                if( only_marked )
                if( only_marked )

-                  tty_printf("     ");
+                 tty_printf("     ");

                else if( node->flag & NODFLG_SELUID )
                else if( node->flag & NODFLG_SELUID )

-                  tty_printf("(%d)* ", i);
+                 tty_printf("(%d)* ", i);

                else if( uid->is_primary )
                else if( uid->is_primary )

-                  tty_printf("(%d). ", i);
+                 tty_printf("(%d). ", i);

                else
                else

-                  tty_printf("(%d)  ", i);
-                if ( uid->is_revoked )
-                    tty_printf (_("[revoked] "));
-                if ( uid->is_expired )
-                    tty_printf (_("[expired] "));
+                 tty_printf("(%d)  ", i);

                tty_print_utf8_string( uid->name, uid->len );
                tty_printf("\n");
                if( with_prefs )
                  {
                    if(pk_version>3 || uid->selfsigversion>3)
                tty_print_utf8_string( uid->name, uid->len );
                tty_printf("\n");
                if( with_prefs )
                  {
                    if(pk_version>3 || uid->selfsigversion>3)

-                     show_prefs (uid, with_prefs == 2);
+                     {
+                       PKT_signature *selfsig=NULL;
+                       KBNODE signode;
+
+                       for(signode=node->next;
+                           signode && signode->pkt->pkttype==PKT_SIGNATURE;
+                           signode=signode->next)
+                         {
+                           if(signode->pkt->pkt.signature->
+                              flags.chosen_selfsig)
+                             {
+                               selfsig=signode->pkt->pkt.signature;
+                               break;
+                             }
+                         }
+
+                       show_prefs (uid, selfsig, with_prefs == 2);
+                     }

                    else
                    else

-                     tty_printf(_("There are no preferences on a "
-                                  "PGP 2.x-style user ID.\n"));
+                     tty_printf(_("There are no preferences on a"
+                                  " PGP 2.x-style user ID.\n"));

                  }
                  }

-           }
-       }
-    }
+             }
+         }
+      }

 
     if (do_warn)
 
     if (do_warn)

-        tty_printf (_("Please note that the shown key validity "
-                      "is not necessarily correct\n"
+        tty_printf (_("Please note that the shown key validity"
+                      " is not necessarily correct\n"

                       "unless you restart the program.\n")); 
                       "unless you restart the program.\n")); 

-

 }
 
 
 }
 
 


@@ -2192,14 +2491,14 @@ show_basic_key_info ( KBNODE keyblock )
           
           /* Note, we use the same format string as in other show
              functions to make the translation job easier. */
           
           /* Note, we use the same format string as in other show
              functions to make the translation job easier. */

-          tty_printf (_("%s%c %4u%c/%08lX  created: %s expires: %s"),
+          tty_printf ("%s  %4u%c/%s  ",

                       node->pkt->pkttype == PKT_PUBLIC_KEY? "pub":"sub",
                       node->pkt->pkttype == PKT_PUBLIC_KEY? "pub":"sub",

-                      ' ',

                       nbits_from_pk( pk ),
                       pubkey_letter( pk->pubkey_algo ),
                       nbits_from_pk( pk ),
                       pubkey_letter( pk->pubkey_algo ),

-                      (ulong)keyid_from_pk(pk,NULL),
-                      datestr_from_pk(pk),
-                      expirestr_from_pk(pk) );
+                      keystr_from_pk(pk));
+         tty_printf(_("created: %s"),datestr_from_pk(pk));
+         tty_printf("  ");
+         tty_printf(_("expires: %s"),expirestr_from_pk(pk));

           tty_printf("\n");
           print_fingerprint ( pk, NULL, 3 );
           tty_printf("\n");
           tty_printf("\n");
           print_fingerprint ( pk, NULL, 3 );
           tty_printf("\n");


@@ -2207,14 +2506,14 @@ show_basic_key_info ( KBNODE keyblock )
       else if (node->pkt->pkttype == PKT_SECRET_KEY)
         {
           PKT_secret_key *sk = node->pkt->pkt.secret_key;
       else if (node->pkt->pkttype == PKT_SECRET_KEY)
         {
           PKT_secret_key *sk = node->pkt->pkt.secret_key;

-          tty_printf(_("%s%c %4u%c/%08lX  created: %s expires: %s"),
+          tty_printf("%s  %4u%c/%s",

                      node->pkt->pkttype == PKT_SECRET_KEY? "sec":"ssb",
                      node->pkt->pkttype == PKT_SECRET_KEY? "sec":"ssb",

-                     ' ',

                      nbits_from_sk( sk ),
                      pubkey_letter( sk->pubkey_algo ),
                      nbits_from_sk( sk ),
                      pubkey_letter( sk->pubkey_algo ),

-                     (ulong)keyid_from_sk(sk,NULL),
-                     datestr_from_sk(sk),
-                     expirestr_from_sk(sk) );
+                     keystr_from_sk(sk));
+         tty_printf(_("created: %s"),datestr_from_sk(sk));
+         tty_printf("  ");
+         tty_printf(_("expires: %s"),expirestr_from_sk(sk));

           tty_printf("\n");
           print_fingerprint (NULL, sk, 3 );
           tty_printf("\n");
           tty_printf("\n");
           print_fingerprint (NULL, sk, 3 );
           tty_printf("\n");


@@ -2231,9 +2530,9 @@ show_basic_key_info ( KBNODE keyblock )
      
           tty_printf ("     ");
           if (uid->is_revoked)
      
           tty_printf ("     ");
           if (uid->is_revoked)

-            tty_printf ("[revoked] ");
-          if ( uid->is_expired )
-            tty_printf ("[expired] ");
+            tty_printf("[%s] ",_("revoked"));
+          else if ( uid->is_expired )
+            tty_printf("[%s] ",_("expired"));

           tty_print_utf8_string (uid->name, uid->len);
           tty_printf ("\n");
         }
           tty_print_utf8_string (uid->name, uid->len);
           tty_printf ("\n");
         }


@@ -2243,40 +2542,40 @@ show_basic_key_info ( KBNODE keyblock )
 static void
 show_key_and_fingerprint( KBNODE keyblock )
 {
 static void
 show_key_and_fingerprint( KBNODE keyblock )
 {

-    KBNODE node;
-    PKT_public_key *pk = NULL;
+  KBNODE node;
+  PKT_public_key *pk = NULL;

 
 

-    for( node = keyblock; node; node = node->next ) {
-       if( node->pkt->pkttype == PKT_PUBLIC_KEY ) {
-           pk = node->pkt->pkt.public_key;
-           tty_printf("pub   %4u%c/%08lX %s ",
-                         nbits_from_pk( pk ),
-                         pubkey_letter( pk->pubkey_algo ),
-                         (ulong)keyid_from_pk(pk,NULL),
-                         datestr_from_pk(pk) );
+  for( node = keyblock; node; node = node->next )
+    {
+      if( node->pkt->pkttype == PKT_PUBLIC_KEY )
+       {
+         pk = node->pkt->pkt.public_key;
+         tty_printf("pub   %4u%c/%s %s ",
+                    nbits_from_pk( pk ),
+                    pubkey_letter( pk->pubkey_algo ),
+                    keystr_from_pk(pk),
+                    datestr_from_pk(pk) );

        }
        }

-       else if( node->pkt->pkttype == PKT_USER_ID ) {
-           PKT_user_id *uid = node->pkt->pkt.user_id;
-           tty_print_utf8_string( uid->name, uid->len );
-           break;
+      else if( node->pkt->pkttype == PKT_USER_ID )
+       {
+         PKT_user_id *uid = node->pkt->pkt.user_id;
+         tty_print_utf8_string( uid->name, uid->len );
+         break;

        }
     }
        }
     }

-    tty_printf("\n");
-    if( pk )
-       print_fingerprint( pk, NULL, 2 );
+  tty_printf("\n");
+  if( pk )
+    print_fingerprint( pk, NULL, 2 );

 }
 
 
 /* Show a warning if no uids on the key have the primary uid flag
    set. */
 static void
 }
 
 
 /* Show a warning if no uids on the key have the primary uid flag
    set. */
 static void

-no_primary_warning(KBNODE keyblock, int uids)
+no_primary_warning(KBNODE keyblock)

 {
   KBNODE node;
 {
   KBNODE node;

-  int select_all=1,have_uid=0,uid_count=0;
-
-  if(uids)
-    select_all=!count_selected_uids(keyblock);
+  int have_primary=0,uid_count=0;

 
   /* TODO: if we ever start behaving differently with a primary or
      non-primary attribute ID, we will need to check for attributes
 
   /* TODO: if we ever start behaving differently with a primary or
      non-primary attribute ID, we will need to check for attributes


@@ -2289,17 +2588,18 @@ no_primary_warning(KBNODE keyblock, int uids)
        {
          uid_count++;
 
        {
          uid_count++;
 

-         if((select_all || (node->flag & NODFLG_SELUID))
-            && node->pkt->pkt.user_id->is_primary==2)
-           have_uid|=2;
-         else
-           have_uid|=1;
+         if(node->pkt->pkt.user_id->is_primary==2)
+           {
+             have_primary=1;
+             break;
+           }

        }
     }
 
        }
     }
 

-  if(uid_count>1 && have_uid&1 && !(have_uid&2))
-    log_info(_("WARNING: no user ID has been marked as primary.  This command "
-              "may\n              cause a different user ID to become the assumed primary.\n"));
+  if(uid_count>1 && !have_primary)
+    log_info(_("WARNING: no user ID has been marked as primary.  This command"
+              " may\n              cause a different user ID to become"
+              " the assumed primary.\n"));

 }
 
 /****************
 }
 
 /****************


@@ -2426,7 +2726,7 @@ menu_adduid( KBNODE pub_keyblock, KBNODE sec_keyblock, int photo)
 
 
 /****************
 
 
 /****************

- * Remove all selceted userids from the keyrings
+ * Remove all selected userids from the keyrings

  */
 static void
 menu_deluid( KBNODE pub_keyblock, KBNODE sec_keyblock )
  */
 static void
 menu_deluid( KBNODE pub_keyblock, KBNODE sec_keyblock )


@@ -2495,10 +2795,15 @@ menu_delsig( KBNODE pub_keyblock )
            tty_print_utf8_string( uid->name, uid->len );
            tty_printf("\n");
 
            tty_print_utf8_string( uid->name, uid->len );
            tty_printf("\n");
 

-          okay = inv_sig = no_key = other_err = 0;
-           valid = print_and_check_one_sig( pub_keyblock, node,
-                                           &inv_sig, &no_key, &other_err,
-                                           &selfsig, 1 );
+           okay = inv_sig = no_key = other_err = 0;
+           if(opt.with_colons)
+             valid = print_and_check_one_sig_colon( pub_keyblock, node,
+                                              &inv_sig, &no_key, &other_err,
+                                              &selfsig, 1 );
+           else
+             valid = print_and_check_one_sig( pub_keyblock, node,
+                                              &inv_sig, &no_key, &other_err,
+                                              &selfsig, 1 );

 
           if( valid ) {
               okay = cpr_get_answer_yes_no_quit(
 
           if( valid ) {
               okay = cpr_get_answer_yes_no_quit(


@@ -2652,9 +2957,6 @@ menu_addrevoker( KBNODE pub_keyblock, KBNODE sec_keyblock, int sensitive )
   for(;;)
     {
       char *answer;
   for(;;)
     {
       char *answer;

-      u32 keyid[2];
-      char *p;
-      size_t n;

 
       if(revoker_pk)
        free_public_key(revoker_pk);
 
       if(revoker_pk)
        free_public_key(revoker_pk);


@@ -2671,11 +2973,13 @@ menu_addrevoker( KBNODE pub_keyblock, KBNODE sec_keyblock, int sensitive )
          goto fail;
        }
 
          goto fail;
        }
 

+      /* Note that I'm requesting SIG here and not CERT.  We're making
+        a certification, but it is okay to be a subkey. */
+      revoker_pk->req_usage=PUBKEY_USAGE_SIG;

       rc=get_pubkey_byname(revoker_pk,answer,NULL,NULL,1);
       rc=get_pubkey_byname(revoker_pk,answer,NULL,NULL,1);

-

       if(rc)
        {
       if(rc)
        {

-         log_error (_("key `%s' not found: %s\n"),answer,g10_errstr(rc));
+         log_error (_("key \"%s\" not found: %s\n"),answer,g10_errstr(rc));

          m_free(answer);
          continue;
        }
          m_free(answer);
          continue;
        }


@@ -2737,17 +3041,7 @@ menu_addrevoker( KBNODE pub_keyblock, KBNODE sec_keyblock, int sensitive )
            continue;
        }
 
            continue;
        }
 

-      keyid_from_pk(revoker_pk,keyid);
-
-      tty_printf("\npub   %4u%c/%08lX %s   ",
-                nbits_from_pk( revoker_pk ),
-                pubkey_letter( revoker_pk->pubkey_algo ),
-                (ulong)keyid[1], datestr_from_pk(pk) );
-
-      p = get_user_id( keyid, &n );
-      tty_print_utf8_string( p, n );
-      m_free(p);
-      tty_printf("\n");
+      print_pubkey_info(NULL,revoker_pk);

       print_fingerprint(revoker_pk,NULL,2);
       tty_printf("\n");
 
       print_fingerprint(revoker_pk,NULL,2);
       tty_printf("\n");
 


@@ -2758,7 +3052,7 @@ menu_addrevoker( KBNODE pub_keyblock, KBNODE sec_keyblock, int sensitive )
 
       if(!cpr_get_answer_is_yes("keyedit.add_revoker.okay",
                                _("Are you sure you want to appoint this "
 
       if(!cpr_get_answer_is_yes("keyedit.add_revoker.okay",
                                _("Are you sure you want to appoint this "

-                                 "key as a designated revoker? (y/N): ")))
+                                 "key as a designated revoker? (y/N) ")))

        continue;
 
       free_public_key(revoker_pk);
        continue;
 
       free_public_key(revoker_pk);


@@ -2829,12 +3123,12 @@ menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock )
     }
     else if( n1 )
        tty_printf(_("Changing expiration time for a secondary key.\n"));
     }
     else if( n1 )
        tty_printf(_("Changing expiration time for a secondary key.\n"));

-    else {
+    else
+      {

        tty_printf(_("Changing expiration time for the primary key.\n"));
        mainkey=1;
        tty_printf(_("Changing expiration time for the primary key.\n"));
        mainkey=1;

-    }
-
-    no_primary_warning(pub_keyblock,0);
+       no_primary_warning(pub_keyblock);
+      }

 
     expiredate = ask_expiredate();
     node = find_kbnode( sec_keyblock, PKT_SECRET_KEY );
 
     expiredate = ask_expiredate();
     node = find_kbnode( sec_keyblock, PKT_SECRET_KEY );


@@ -2863,7 +3157,9 @@ menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock )
            if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1]
                && ( (mainkey && uid
                      && uid->created && (sig->sig_class&~3) == 0x10)
            if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1]
                && ( (mainkey && uid
                      && uid->created && (sig->sig_class&~3) == 0x10)

-                    || (!mainkey && sig->sig_class == 0x18)  ) ) {
+                    || (!mainkey && sig->sig_class == 0x18)  )
+               && sig->flags.chosen_selfsig )
+             {

                /* this is a selfsignature which is to be replaced */
                PKT_signature *newsig;
                PACKET *newpkt;
                /* this is a selfsignature which is to be replaced */
                PKT_signature *newsig;
                PACKET *newpkt;


@@ -3003,12 +3299,14 @@ menu_set_primary_uid ( KBNODE pub_keyblock, KBNODE sec_keyblock )
        else if ( main_pk && uid && node->pkt->pkttype == PKT_SIGNATURE ) {
            PKT_signature *sig = node->pkt->pkt.signature;
            if ( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1]
        else if ( main_pk && uid && node->pkt->pkttype == PKT_SIGNATURE ) {
            PKT_signature *sig = node->pkt->pkt.signature;
            if ( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1]

-               && (uid && (sig->sig_class&~3) == 0x10)
-               && attribute == (uid->attrib_data!=NULL)) {
+                && (uid && (sig->sig_class&~3) == 0x10)
+                && attribute == (uid->attrib_data!=NULL)
+                && sig->flags.chosen_selfsig )
+             {

              if(sig->version < 4) {
                char *user=utf8_to_native(uid->name,strlen(uid->name),0);
 
              if(sig->version < 4) {
                char *user=utf8_to_native(uid->name,strlen(uid->name),0);
 

-               log_info(_("skipping v3 self-signature on user id \"%s\"\n"),
+               log_info(_("skipping v3 self-signature on user ID \"%s\"\n"),

                         user);
                m_free(user);
              }
                         user);
                m_free(user);
              }


@@ -3086,7 +3384,7 @@ menu_set_preferences (KBNODE pub_keyblock, KBNODE sec_keyblock )
     int selected, select_all;
     int modified = 0;
 
     int selected, select_all;
     int modified = 0;
 

-    no_primary_warning(pub_keyblock,1);
+    no_primary_warning(pub_keyblock);

 
     select_all = !count_selected_uids (pub_keyblock);
 
 
     select_all = !count_selected_uids (pub_keyblock);
 


@@ -3113,11 +3411,12 @@ menu_set_preferences (KBNODE pub_keyblock, KBNODE sec_keyblock )
                   && node->pkt->pkttype == PKT_SIGNATURE ) {
            PKT_signature *sig = node->pkt->pkt.signature;
            if ( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1]
                   && node->pkt->pkttype == PKT_SIGNATURE ) {
            PKT_signature *sig = node->pkt->pkt.signature;
            if ( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1]

-                && (uid && (sig->sig_class&~3) == 0x10) ) {
+                && (uid && (sig->sig_class&~3) == 0x10)
+                && sig->flags.chosen_selfsig ) {

              if( sig->version < 4 ) {
                char *user=utf8_to_native(uid->name,strlen(uid->name),0);
 
              if( sig->version < 4 ) {
                char *user=utf8_to_native(uid->name,strlen(uid->name),0);
 

-               log_info(_("skipping v3 self-signature on user id \"%s\"\n"),
+               log_info(_("skipping v3 self-signature on user ID \"%s\"\n"),

                         user);
                m_free(user);
              }
                         user);
                m_free(user);
              }


@@ -3159,96 +3458,145 @@ menu_set_preferences (KBNODE pub_keyblock, KBNODE sec_keyblock )
 
 
 static int
 
 
 static int

-menu_set_keyserver_url (KBNODE pub_keyblock, KBNODE sec_keyblock )
+menu_set_keyserver_url (const char *url,
+                       KBNODE pub_keyblock, KBNODE sec_keyblock )

 {
 {

-    PKT_secret_key *sk;    /* copy of the main sk */
-    PKT_public_key *main_pk;
-    PKT_user_id *uid;
-    KBNODE node;
-    u32 keyid[2];
-    int selected, select_all;
-    int modified = 0;
-    char *answer;
+  PKT_secret_key *sk;    /* copy of the main sk */
+  PKT_public_key *main_pk;
+  PKT_user_id *uid;
+  KBNODE node;
+  u32 keyid[2];
+  int selected, select_all;
+  int modified = 0;
+  char *answer,*uri;

 
 

-    no_primary_warning(pub_keyblock,1);
+  no_primary_warning(pub_keyblock);

 
 

-    answer=cpr_get_utf8("keyedit.add_keyserver",
-                       _("Enter your preferred keyserver URL: "));
-    if(answer[0]=='\0' || answer[0]=='\004')
-      {
-       m_free(answer);
-       return 0;
-      }
+  if(url)
+    answer=m_strdup(url);
+  else
+    {
+      answer=cpr_get_utf8("keyedit.add_keyserver",
+                         _("Enter your preferred keyserver URL: "));
+      if(answer[0]=='\0' || answer[0]=='\004')
+       {
+         m_free(answer);
+         return 0;
+       }
+    }

 
 

-    select_all = !count_selected_uids (pub_keyblock);
+  if(ascii_strcasecmp(answer,"none")==0)
+    uri=NULL;
+  else
+    {
+      struct keyserver_spec *keyserver=NULL;
+      /* Sanity check the format */
+      keyserver=parse_keyserver_uri(answer,1,NULL,0);
+      m_free(answer);
+      if(!keyserver)
+       {
+         log_info(_("could not parse keyserver URL\n"));
+         return 0;
+       }
+      uri=m_strdup(keyserver->uri);
+      free_keyserver_spec(keyserver);
+    }

 
 

-    node = find_kbnode( sec_keyblock, PKT_SECRET_KEY );
-    sk = copy_secret_key( NULL, node->pkt->pkt.secret_key);
+  select_all = !count_selected_uids (pub_keyblock);

 
 

-    /* Now we can actually change the self signature(s) */
-    main_pk = NULL;
-    uid = NULL;
-    selected = 0;
-    for ( node=pub_keyblock; node; node = node->next ) {
-       if ( node->pkt->pkttype == PKT_PUBLIC_SUBKEY )
-            break; /* ready */
+  node = find_kbnode( sec_keyblock, PKT_SECRET_KEY );
+  sk = copy_secret_key( NULL, node->pkt->pkt.secret_key);

 
 

-       if ( node->pkt->pkttype == PKT_PUBLIC_KEY ) {
-           main_pk = node->pkt->pkt.public_key;
-           keyid_from_pk( main_pk, keyid );
-       }
-       else if ( node->pkt->pkttype == PKT_USER_ID ) {
-           uid = node->pkt->pkt.user_id;
-                   selected = select_all || (node->flag & NODFLG_SELUID);
-        }
-       else if ( main_pk && uid && selected
-                  && node->pkt->pkttype == PKT_SIGNATURE ) {
-           PKT_signature *sig = node->pkt->pkt.signature;
-           if ( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1]
-                && (uid && (sig->sig_class&~3) == 0x10) ) {
-             if( sig->version < 4 ) {
-               char *user=utf8_to_native(uid->name,strlen(uid->name),0);
+  /* Now we can actually change the self signature(s) */
+  main_pk = NULL;
+  uid = NULL;
+  selected = 0;
+  for ( node=pub_keyblock; node; node = node->next )
+    {
+      if ( node->pkt->pkttype == PKT_PUBLIC_SUBKEY )
+       break; /* ready */

 
 

-               log_info(_("skipping v3 self-signature on user id \"%s\"\n"),
+      if ( node->pkt->pkttype == PKT_PUBLIC_KEY )
+       {
+         main_pk = node->pkt->pkt.public_key;
+         keyid_from_pk( main_pk, keyid );
+       }
+      else if ( node->pkt->pkttype == PKT_USER_ID )
+       {
+         uid = node->pkt->pkt.user_id;
+         selected = select_all || (node->flag & NODFLG_SELUID);
+       }
+      else if ( main_pk && uid && selected
+               && node->pkt->pkttype == PKT_SIGNATURE )
+       {
+         PKT_signature *sig = node->pkt->pkt.signature;
+         if ( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1]
+              && (uid && (sig->sig_class&~3) == 0x10) )
+           {
+             char *user=utf8_to_native(uid->name,strlen(uid->name),0);
+             if( sig->version < 4 )
+               log_info(_("skipping v3 self-signature on user ID \"%s\"\n"),

                         user);
                         user);

-               m_free(user);
-             }
-             else {
-               /* This is a selfsignature which is to be replaced 
-                 * We have to ignore v3 signatures because they are
-                 * not able to carry the preferences */
-               PKT_signature *newsig;
-               PACKET *newpkt;
-                int rc;
+             else
+               {
+                 /* This is a selfsignature which is to be replaced
+                  * We have to ignore v3 signatures because they are
+                  * not able to carry the subpacket. */
+                 PKT_signature *newsig;
+                 PACKET *newpkt;
+                 int rc;
+                 const byte *p;
+                 size_t plen;
+
+                 p=parse_sig_subpkt(sig->hashed,SIGSUBPKT_PREF_KS,&plen);
+                 if(p && plen)
+                   {
+                     tty_printf("Current preferred keyserver for user"
+                                " ID \"%s\": ",user);
+                     tty_print_utf8_string(p,plen);
+                     tty_printf("\n");
+                     if(!cpr_get_answer_is_yes("keyedit.confirm_keyserver",
+                        uri?_("Are you sure you want to replace it? (y/N) "):
+                            _("Are you sure you want to delete it? (y/N) ")))
+                       continue;
+                   }
+                 else if(uri==NULL)
+                   {
+                     /* There is no current keyserver URL, so there
+                        is no point in trying to un-set it. */
+                     continue;
+                   }

 
 

-                rc = update_keysig_packet (&newsig, sig,
-                                           main_pk, uid, NULL,
-                                           sk,
-                                           keygen_add_keyserver_url,
-                                           answer );
-                if( rc ) {
-                    log_error ("update_keysig_packet failed: %s\n",
-                               g10_errstr(rc));
-                   m_free(answer);
-                   free_secret_key( sk );
-                    return 0;
-                }
-                /* replace the packet */
-                newpkt = m_alloc_clear( sizeof *newpkt );
-                newpkt->pkttype = PKT_SIGNATURE;
-                newpkt->pkt.signature = newsig;
-                free_packet( node->pkt );
-                m_free( node->pkt );
-                node->pkt = newpkt;
-                modified = 1;
-             }
-            }
+                 rc = update_keysig_packet (&newsig, sig,
+                                            main_pk, uid, NULL,
+                                            sk,
+                                            keygen_add_keyserver_url, uri );
+                 if( rc )
+                   {
+                     log_error ("update_keysig_packet failed: %s\n",
+                                g10_errstr(rc));
+                     free_secret_key( sk );
+                     m_free(uri);
+                     return 0;
+                   }
+                 /* replace the packet */
+                 newpkt = m_alloc_clear( sizeof *newpkt );
+                 newpkt->pkttype = PKT_SIGNATURE;
+                 newpkt->pkt.signature = newsig;
+                 free_packet( node->pkt );
+                 m_free( node->pkt );
+                 node->pkt = newpkt;
+                 modified = 1;
+               }
+
+             m_free(user);
+           }

        }
     }
 
        }
     }
 

-    m_free(answer);
-    free_secret_key( sk );
-    return modified;
+  m_free(uri);
+  free_secret_key( sk );
+  return modified;

 }
 
 
 }
 
 


@@ -3423,6 +3771,7 @@ static void
 ask_revoke_sig( KBNODE keyblock, KBNODE node )
 {
     int doit=0;
 ask_revoke_sig( KBNODE keyblock, KBNODE node )
 {
     int doit=0;

+    char *p;

     PKT_signature *sig = node->pkt->pkt.signature;
     KBNODE unode = find_prev_kbnode( keyblock, node, PKT_USER_ID );
 
     PKT_signature *sig = node->pkt->pkt.signature;
     KBNODE unode = find_prev_kbnode( keyblock, node, PKT_USER_ID );
 


@@ -3431,16 +3780,14 @@ ask_revoke_sig( KBNODE keyblock, KBNODE node )
        return;
     }
 
        return;
     }
 

-    tty_printf(_("user ID: \""));
-    tty_print_utf8_string( unode->pkt->pkt.user_id->name,
-                          unode->pkt->pkt.user_id->len );
+    p=utf8_to_native(unode->pkt->pkt.user_id->name,
+                    unode->pkt->pkt.user_id->len,0);
+    tty_printf(_("user ID: \"%s\"\n"),p);
+    m_free(p);

 
 

-    if(sig->flags.exportable)
-      tty_printf(_("\"\nsigned with your key %08lX at %s\n"),
-                (ulong)sig->keyid[1], datestr_from_sig(sig) );
-    else
-      tty_printf(_("\"\nlocally signed with your key %08lX at %s\n"),
-                (ulong)sig->keyid[1], datestr_from_sig(sig) );
+    tty_printf(_("signed by your key %s on %s%s%s\n"),
+              keystr(sig->keyid),datestr_from_sig(sig),
+              sig->flags.exportable?"":_(" (non-exportable)"),"");

 
     if(sig->flags.expired)
       {
 
     if(sig->flags.expired)
       {


@@ -3476,8 +3823,11 @@ menu_revsig( KBNODE keyblock )
     int rc, any, skip=1, all=!count_selected_uids(keyblock);
     struct revocation_reason_info *reason = NULL;
 
     int rc, any, skip=1, all=!count_selected_uids(keyblock);
     struct revocation_reason_info *reason = NULL;
 

+    assert(keyblock->pkt->pkttype==PKT_PUBLIC_KEY);
+

     /* FIXME: detect duplicates here  */
     /* FIXME: detect duplicates here  */

-    tty_printf(_("You have signed these user IDs:\n"));
+    tty_printf(_("You have signed these user IDs on key %s:\n"),
+              keystr_from_pk(keyblock->pkt->pkt.public_key));

     for( node = keyblock; node; node = node->next ) {
        node->flag &= ~(NODFLG_SELSIG | NODFLG_MARK_A);
        if( node->pkt->pkttype == PKT_USER_ID ) {
     for( node = keyblock; node; node = node->next ) {
        node->flag &= ~(NODFLG_SELSIG | NODFLG_MARK_A);
        if( node->pkt->pkttype == PKT_USER_ID ) {


@@ -3494,22 +3844,29 @@ menu_revsig( KBNODE keyblock )
        }
        else if( !skip && node->pkt->pkttype == PKT_SIGNATURE
                && ((sig = node->pkt->pkt.signature),
        }
        else if( !skip && node->pkt->pkttype == PKT_SIGNATURE
                && ((sig = node->pkt->pkt.signature),

-                     !seckey_available(sig->keyid)  ) ) {
-           if( (sig->sig_class&~3) == 0x10 ) {
-               tty_printf(_("   signed by %08lX at %s%s%s\n"),
-                          (ulong)sig->keyid[1], datestr_from_sig(sig),
-                          sig->flags.exportable?"":" (non-exportable)",
-                          sig->flags.revocable?"":" (non-revocable)");
+                     !seckey_available(sig->keyid)  ) )
+         {
+           if( (sig->sig_class&~3) == 0x10 )
+             {
+               tty_printf("   ");
+               tty_printf(_("signed by your key %s on %s%s%s\n"),
+                          keystr(sig->keyid), datestr_from_sig(sig),
+                          sig->flags.exportable?"":_(" (non-exportable)"),
+                          sig->flags.revocable?"":_(" (non-revocable)"));

                if(sig->flags.revocable)
                  node->flag |= NODFLG_SELSIG;
                if(sig->flags.revocable)
                  node->flag |= NODFLG_SELSIG;

-           }
-           else if( sig->sig_class == 0x30 ) {
-               tty_printf(_("   revoked by %08lX at %s\n"),
-                           (ulong)sig->keyid[1], datestr_from_sig(sig) );
-           }
-       }
+             }
+           else if( sig->sig_class == 0x30 )
+             {
+               tty_printf("   ");
+               tty_printf(_("revoked by your key %s on %s\n"),
+                          keystr(sig->keyid),datestr_from_sig(sig));
+             }
+         }

     }
 
     }
 

+    tty_printf("\n");
+

     /* ask */
     for( node = keyblock; node; node = node->next ) {
        if( !(node->flag & NODFLG_SELSIG) )
     /* ask */
     for( node = keyblock; node; node = node->next ) {
        if( !(node->flag & NODFLG_SELSIG) )


@@ -3534,8 +3891,9 @@ menu_revsig( KBNODE keyblock )
        }
        else if( node->pkt->pkttype == PKT_SIGNATURE ) {
            sig = node->pkt->pkt.signature;
        }
        else if( node->pkt->pkttype == PKT_SIGNATURE ) {
            sig = node->pkt->pkt.signature;

-           tty_printf(_("   signed by %08lX at %s%s\n"),
-                      (ulong)sig->keyid[1], datestr_from_sig(sig),
+           tty_printf("   ");
+           tty_printf(_("signed by your key %s on %s%s%s\n"),
+                      keystr(sig->keyid), datestr_from_sig(sig),"",

                       sig->flags.exportable?"":_(" (non-exportable)") );
        }
     }
                       sig->flags.exportable?"":_(" (non-exportable)") );
        }
     }


@@ -3802,7 +4160,6 @@ menu_showphoto( KBNODE keyblock )
   int select_all = !count_selected_uids(keyblock);
   int count=0;
   PKT_public_key *pk=NULL;
   int select_all = !count_selected_uids(keyblock);
   int count=0;
   PKT_public_key *pk=NULL;

-  u32 keyid[2];

 
   /* Look for the public key first.  We have to be really, really,
      explicit as to which photo this is, and what key it is a UID on
 
   /* Look for the public key first.  We have to be really, really,
      explicit as to which photo this is, and what key it is a UID on


@@ -3811,10 +4168,7 @@ menu_showphoto( KBNODE keyblock )
   for( node = keyblock; node; node = node->next )
     {
       if( node->pkt->pkttype == PKT_PUBLIC_KEY )
   for( node = keyblock; node; node = node->next )
     {
       if( node->pkt->pkttype == PKT_PUBLIC_KEY )

-       {
-         pk = node->pkt->pkt.public_key;
-         keyid_from_pk(pk, keyid);
-       }
+       pk = node->pkt->pkt.public_key;

       else if( node->pkt->pkttype == PKT_USER_ID )
        {
          PKT_user_id *uid = node->pkt->pkt.user_id;
       else if( node->pkt->pkttype == PKT_USER_ID )
        {
          PKT_user_id *uid = node->pkt->pkt.user_id;


@@ -3834,9 +4188,9 @@ menu_showphoto( KBNODE keyblock )
                     parse_image_header(&uid->attribs[i],&type,&size))
                    {
                      tty_printf(_("Displaying %s photo ID of size %ld for "
                     parse_image_header(&uid->attribs[i],&type,&size))
                    {
                      tty_printf(_("Displaying %s photo ID of size %ld for "

-                                  "key 0x%08lX (uid %d)\n"),
+                                  "key %s (uid %d)\n"),

                                 image_type_to_string(type,1),
                                 image_type_to_string(type,1),

-                                (ulong)size,(ulong)keyid[1],count);
+                                (ulong)size,keystr_from_pk(pk),count);

                      show_photos(&uid->attribs[i],1,pk,NULL);
                    }
                }
                      show_photos(&uid->attribs[i],1,pk,NULL);
                    }
                }