/[winpt]/trunk/Src/wptKeyEditDlgs.cpp

Diff of /trunk/Src/wptKeyEditDlgs.cpp

Parent Directory | Revision Log | View Patch Patch

-revision 117 by twoaday,
Thu Dec  8 09:26:32 2005 UTC
+revision 314 by twoaday,
Sun May 13 09:44:03 2007 UTC
 Line 1
  /* wptKeyEditDlgs.cpp - GPG key edit dialogs
-  *      Copyright (C) 2002-2005 Timo Schulz
+  *      Copyright (C) 2002-2007 Timo Schulz
   *
   * This file is part of WinPT.
   *
 Line 12
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with WinPT; if not, write to the Free Software Foundation,
-  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
   */
  #ifdef HAVE_CONFIG_H
  #include <config.h>
  #endif
  #include <windows.h>
- #include <oleauto.h>
  #include <commctrl.h>
  #include <time.h>
+ #include <assert.h>
  #include "resource.h"
  #include "wptTypes.h"
  #include "wptW32API.h"
  #include "wptVersion.h"
-Line 43
+Line 37
  #include "wptKeyManager.h"
  #include "wptRegistry.h"
  #include "wptKeyEdit.h"
+ #include "StringBuffer.h"
  /* All edit key commands. */
  enum keyedit_commands {
-Line 50 
 enum keyedit_commands {
+Line 46 
 enum keyedit_commands {
      CMD_ADDUID,
      CMD_ADDPHOTO,
      CMD_ADDREVOKER,
-     /*CMD_FPR,*/
      CMD_DELUID,
      CMD_DELKEY,
-     CMD_DELPHOTO,
-     /*CMD_DELSIG,*/
      CMD_EXPIRE,
-     /*CMD_PREF,*/
      CMD_SHOWPREF,
-     /*CMD_SETPREF,*/
+     CMD_SETPREF,
-     /*CMD_UPDPREF,*/
      CMD_PASSWD,
      CMD_PRIMARY,
      CMD_TRUST,
-     /*CMD_REVSIG,*/
      CMD_REVUID,
      CMD_REVKEY,
      CMD_DISABLE,
      CMD_ENABLE,
-     /*CMD_SHOWPHOTO,*/
+     CMD_SIGN,
+     CMD_LSIGN,
+     CMD_CHECK,
+     CMD_CLEAN,
+     CMD_MINIMIZE
+ };
+ struct cmdlist_s {
+     const char   *name;
+     unsigned int  need_pair:1;
+     int       id;
+ } cmdlist[] = {
+     {"ADDKEY", 1, CMD_ADDKEY},
+     {"ADDUID", 1, CMD_ADDUID},
+     {"ADDPHOTO", 1, CMD_ADDPHOTO},
+     {"ADDREVOKER", 1, CMD_ADDREVOKER},
+     {"DELUID", 1, CMD_DELUID},
+     {"DELKEY", 1, CMD_DELKEY},
+     {"EXPIRE", 1, CMD_EXPIRE},
+     {"SHOWPREF", 0, CMD_SHOWPREF},
+     /*{"SETPREF", 1, CMD_SETPREF},*/
+     {"PASSWD", 1, CMD_PASSWD},
+     {"PRIMARY", 1, CMD_PRIMARY},
+     {"TRUST", 0, CMD_TRUST},
+     {"REVUID", 1, CMD_REVUID},
+     {"REVKEY", 1, CMD_REVKEY},
+     {"DISABLE", 0, CMD_DISABLE},
+     {"ENABLE", 0, CMD_ENABLE},
+     {"SIGN", 0, CMD_SIGN},
+     {"LSIGN", 0, CMD_LSIGN},
+     {"CHECK", 0, CMD_CHECK},
+     {"CLEAN", 0, CMD_CLEAN},
+     {"MINIMIZE", 0, CMD_MINIMIZE},
+     {NULL, 0}
  };
-Line 93 
 enum uid_col_t {
+Line 116 
 enum uid_col_t {
      UID_COL_CREATION    = 3
  };
- struct keyedit_callback_s {
+ /* Key edit callback context. */
-     const char     *keyid;
+ struct keyedit_cb_s {
-     const char     *pass;
+     HWND            parent; /* parent window handle. */
+     const char     *keyid;  /* key ID of the key. */
+     const char     *pass;   /* pointer to the passphrase. */
      listview_ctrl_t lv;
+     int             lv_pos;
      void           *opaque;
      unsigned int    finished:1;
+     unsigned int    is_protected:1;
  };
- typedef struct keyedit_callback_s KEYEDIT_CB;
+ typedef struct keyedit_cb_s *keyedit_cb_t;
- struct keygen_callback_s {
-     int   bits;
-     int   algo;
-     u32   expire;
-     char *fpr;
- };
- typedef struct keygen_callback_s KEYGEN_CB;
+ /* Key generation callback context. */
+ struct keygen_cb_s {
+     int    bits;
+     int    algo;
+     DWORD  expire; /* date of expiration or '0' for infinite valid. */
+     char  *fpr;
+     char  *name;
+     char  *comment;
+     char  *email;
+ };
+ typedef struct keygen_cb_s *keygen_cb_t;
+ /* Subclass context for the subkey list. */
  static subclass_s keyedit_subkey_proc;
+ /* Subclass context for the user-id list. */
  static subclass_s keyedit_uid_proc;
  int keygen_check_date (SYSTEMTIME *st);
- void get_userid_preflist (char **r_prefs, int * r_flags);
+ void get_userid_preflist (const char *old_prefs, char **r_prefs, int *r_flags);
- char* get_subkey_fingerprint (const char *keyid);
+ char* get_subkey_keyid (const char *keyid);
+ void ComboBox_AddString_utf8 (HWND cb, const char *txt);
  /* Associate each key with a combo box entry.
     Skip the key in @k. */
  static void
- do_init_keylist (HWND dlg, winpt_key_t k)
+ do_init_keylist (HWND dlg, const char *keyid)
  {
      gpg_keycache_t pub;
      gpgme_key_t key;
-     const char * s, * kid;
+     const char *s, *kid;
-     char * u;
      int i, n;
      pub = keycache_get_ctx (1);
-     if (!pub)
-         BUG (0);
      gpg_keycache_rewind (pub);
-     while( !gpg_keycache_next_key( pub, 0, &key ) ) {
+     while (!gpg_keycache_next_key (pub, 0, &key)) {
-         if (key->expired || key->revoked ||
+         if (!key_is_useable (key) || key->invalid)
-             key->disabled || key->invalid)
              continue;
          s = key->uids->uid;
          kid = key->subkeys->keyid;
-         if (!s || !strcmp (kid+8, k->keyid+2))
+         if (!s || !strcmp (kid+8, keyid))
              continue;
-         u = utf8_to_wincp (s, strlen (s));
+         ComboBox_AddString_utf8 (GetDlgItem (dlg, IDC_ADDREV_KEYLIST), s);
-         SendDlgItemMessage (dlg, IDC_ADDREV_KEYLIST, CB_ADDSTRING,
-, (WPARAM)(char *)u);
-         free (u);
      }
      gpg_keycache_rewind (pub);
-     n = SendDlgItemMessage( dlg, IDC_ADDREV_KEYLIST, CB_GETCOUNT, 0, 0 );
+     /* In the second loop, we set a key pointer for each element. */
+     n = SendDlgItemMessage (dlg, IDC_ADDREV_KEYLIST, CB_GETCOUNT, 0, 0);
      for (i = 0; i < n; i++) {
          gpg_keycache_next_key (pub, 0, &key);
          SendDlgItemMessage (dlg, IDC_ADDREV_KEYLIST, CB_SETITEMDATA,
-Line 163 
 do_init_keylist (HWND dlg, winpt_key_t k
+Line 191 
 do_init_keylist (HWND dlg, winpt_key_t k
  /* Add a new user-id to the list view @lv. */
  static void
  do_add_new_userid (listview_ctrl_t lv,
-                    const char * name, const char *email, const char * comment)
+                    const char *utf8_name, const char *email,
+                    const char *utf8_comment)
  {
-     char * p;
+     StringBuffer p;
-     size_t n;
+     char *native;
-     n = strlen (name) + strlen (email) + 16;
+     if (utf8_comment != NULL)
-     if (comment)
+         p = p + utf8_name + " (" + utf8_comment + ")";
-         n += strlen (comment);
-     p = new char[n+1];
-     if (!p)
-         BUG( NULL );
-     if (comment)
-         sprintf (p, "%s (%s)", name, comment);
      else
-         sprintf (p, "%s", name);
+         p = p + utf8_name;
+     native = utf8_to_native (p.getBuffer ());
      listview_add_item (lv, "");
-     listview_add_sub_item (lv, 0, 0, _("Ultimate" ));
+     listview_add_sub_item (lv, 0, UID_COL_VALID, _("Ultimate" ));
-     listview_add_sub_item (lv, 0, 1, p);
+     listview_add_sub_item (lv, 0, UID_COL_NAME, native);
-     listview_add_sub_item (lv, 0, 2, email && *email? email : "");
+     listview_add_sub_item (lv, 0, UID_COL_EMAIL, email && *email? email : "");
-     listview_add_sub_item (lv, 0, 3, get_key_created (time (NULL)));
+     listview_add_sub_item (lv, 0, UID_COL_CREATION,
-     free_if_alloc (p);
+                            get_key_created (time (NULL)));
- } /* do_add_new_userid */
+     free_if_alloc (native);
+ }
  static void
- do_add_new_subkey (listview_ctrl_t lv, KEYGEN_CB *keygen, unsigned int flags)
+ do_add_new_subkey (listview_ctrl_t lv, keygen_cb_t keygen, unsigned int flags)
  {
      char info[128], keyid[32];
-     const char * expdate, * s;
+     const char *expdate, *s, *kid;
      int n;
      expdate = keygen->expire? get_key_expire_date (keygen->expire) : _("Never");
-     _snprintf (info, sizeof info-1, "%d-bit %s",
+     _snprintf (info, DIM (info)-1, "%d-bit %s", keygen->bits,
-                keygen->bits,
                 get_key_pubalgo ((gpgme_pubkey_algo_t)keygen->algo));
-     _snprintf (keyid, sizeof keyid-1, "0x%s", keygen->fpr+32);
+     kid = get_keyid_from_fpr (keygen->fpr);
+     _snprintf (keyid, DIM (keyid)-1, "0x%s", kid);
+     s = get_key_created (time (NULL));
      n = listview_count_items (lv, 0);
      listview_add_item_pos (lv, n);
-     listview_add_sub_item (lv, n, 0, info);
+     listview_add_sub_item (lv, n, SUBK_COL_DESC, info);
-     listview_add_sub_item (lv, n, 1, keyid);
+     listview_add_sub_item (lv, n, SUBK_COL_KEYID, keyid);
-     listview_add_sub_item (lv, n, 2, get_key_created (time (NULL)));
+     listview_add_sub_item (lv, n, SUBK_COL_CREATION, s);
-     listview_add_sub_item (lv, n, 3, expdate);
+     listview_add_sub_item (lv, n, SUBK_COL_EXPIRES, expdate);
-     if (flags & KM_FLAG_REVOKED) s = _("Revoked");
+     if (flags & KM_FLAG_REVOKED)
-     else if (flags & KM_FLAG_EXPIRED) s = _("Expired");
+         s = _("Revoked");
-     else s = _("OK");
+     else if (flags & KM_FLAG_EXPIRED)
-     listview_add_sub_item (lv, n, 4, s);
+         s = _("Expired");
- } /* do_add_new_subkey */
+     else
+         s = _("OK");
+     listview_add_sub_item (lv, n, SUBK_COL_STATUS, s);
+ }
  /* Try to find the GPG edit key index which belongs to the user ID
-    given by @name. If @r_inf != NULL, the info context will be returned.
+    given by the email address @email, @name is used as a fallback.
+    If @r_inf != NULL, the info context will be returned.
     Return value: index of the user ID or -1 on error. */
  static int
- do_find_userid (const char *keyid, const char *name, gpg_uid_info_t *r_inf)
+ do_find_userid (const char *keyid, const char *email,
+                 const char *name, gpg_uid_info_t *r_inf)
  {
-     GpgKeyEdit *ke;
+     GpgKeyEdit ke;
      gpgme_error_t err;
      gpg_uid_info_t inf, ui;
      int pos = -1;
-     ke = new GpgKeyEdit (keyid);
+     ke.setKeyID (keyid);
-     if (!ke)
+     err = ke.getUseridInfo (&inf);
-         BUG (NULL);
-     err = ke->getUseridInfo (&inf);
-     delete ke;
      if (err) {
          log_box (_("user ID"), MB_ERR,
-                 _("Could not get key information for: \"%s\":\n%s"),
+                  _("Could not get key information for: \"%s\":\n%s"),
-                 name, gpgme_strerror (err));
+                  name, gpgme_strerror (err));
          return -1;
      }
      for (ui = inf; ui; ui = ui->next) {
-         if (!strcmp (ui->email, name)) {
+         if (name && email && ui->email && ui->name) {
+             if (!strcmp (ui->email, email) &&
+                 !strncmp (ui->name, name, strlen (name))) {
+                 pos = ui->index;
+                 break;
+             }
+             continue;
+         }
+         if (email && ui->email) {
+             if (!strcmp (ui->email, email)) {
+                 pos = ui->index;
+                 break;
+             }
+             /* The email address is more unique, use the name just
+                as the fallbck when no email address is available. */
+             continue;
+         }
+         if (ui->name && name && !strcmp (ui->name, name)) {
              pos = ui->index;
              break;
          }
-Line 250 
 do_find_userid (const char *keyid, const
+Line 295 
 do_find_userid (const char *keyid, const
  }
+ /* Return true if @fname is a JPEG file. */
+ bool
+ is_jpg_file (const char *fname)
+ {
+     FILE *fp;
+     BYTE buf[10];
+     int n;
+     fp = fopen (fname, "rb");
+     if (!fp)
+         return false;
+     n = fread (buf, 1, DIM (buf), fp);
+     fclose (fp);
+     if (n < DIM (buf))
+         return false;
+     return buf[6] == 'J' && buf[7] == 'F' &&
+            buf[8] == 'I' && buf[9] == 'F';
+ }
  /* Dialog box procedure to add a photo. */
  BOOL CALLBACK
  keyedit_addphoto_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
  {
-     static winpt_key_t k;
+     static keyedit_cb_t cb;
-     GpgKeyEdit *ke;
+     gpgme_error_t err;
-     gpgme_error_t ec;
+     const char *s;
-     const char * s;
+     char file[128];
-     char pwd[128], file[128];
      int id;
-     switch( msg ) {
+     switch (msg) {
      case WM_INITDIALOG:
-         k = (winpt_key_t)lparam;
+         cb = (keyedit_cb_t)lparam;
-         if (!k)
+         if (!cb)
              BUG (NULL);
-         SetDlgItemText (dlg, IDC_ADDPHOTO_INF, _("Remember that the image is stored within your public key.  If you use a very large picture, your key will become very large as well! Keeping the image close to 240x288 is a good size to use."));
+         SetDlgItemText (dlg, IDC_ADDPHOTO_INF, _("Remember that the image is stored within your public key.  If you use a very large picture, your key will become very large as well! Keeping the image close to 240x288 is advised."));
          SetDlgItemText (dlg, IDC_ADDPHOTO_FILEINF, _("Pick an image to use for your photo ID.\nThe image must be a JPEG file."));
          SetDlgItemText (dlg, IDC_ADDPHOTO_PWDINF, _("Passphrase"));
          SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
          SetWindowText (dlg, _("Add Photo ID"));
          SetForegroundWindow (dlg);
          break;
-     case WM_DESTROY:
-         break;
-     case WM_SYSCOMMAND:
-         if( LOWORD (wparam) == SC_CLOSE )
-             EndDialog( dlg, TRUE );
-         break;
      case WM_COMMAND:
-         switch( LOWORD( wparam ) ) {
+         switch( LOWORD (wparam)) {
          case IDC_ADDPHOTO_SELFILE:
-             s = get_fileopen_dlg( dlg, _("Select Image File"), _("JPEG Files (*.jpg, *.jpeg)\0*.jpg;*.jpeg\0\0"), NULL );
+             s = get_fileopen_dlg (dlg, _("Select Image File"),
-             if( s && *s )
+                                   "JPEG Files (*.jpg, *.jpeg)\0*.jpg;*.jpeg\0\0",
-                 SetDlgItemText( dlg, IDC_ADDPHOTO_FILE, s );
+                                   NULL);
+             if (s && !is_jpg_file (s)) {
+                 log_box (_("Add Photo"), MB_ERR,
+                          _("'%s' is not a valid JPEG file."), s);
+                 return FALSE;
+             }
+             if (s && *s)
+                 SetDlgItemText (dlg, IDC_ADDPHOTO_FILE, s);
              break;
          case IDOK:
-             if( !GetDlgItemText( dlg, IDC_ADDPHOTO_FILE, file, sizeof file-1 ) ){
+             if (!GetDlgItemText (dlg, IDC_ADDPHOTO_FILE, file, sizeof (file)-1)){
-                 msg_box( dlg, _("Please enter a file name."), _("Add Photo"), MB_ERR );
+                 msg_box (dlg, _("Please enter a file name."),
+                          _("Add Photo"), MB_ERR);
                  return FALSE;
              }
-             if( get_file_size( file ) == 0 || get_file_size( file ) > 6144 ) {
+             if (get_file_size (file) == 0 || get_file_size (file) > 6144) {
-                 id = msg_box( dlg, _("The JPEG is really large.\n"
+                 id = msg_box (dlg, _("The JPEG is really large.\n"
                                       "Are you sure you want to use it?"),
-                                      _("Add Photo"), MB_YESNO|MB_INFO );
+                                      _("Add Photo"), MB_YESNO|MB_INFO);
-                 if( id == IDNO )
+                 if (id == IDNO)
                      return TRUE;
              }
-             if( k->is_protected ) {
-                 if( !GetDlgItemText( dlg, IDC_ADDPHOTO_PASS, pwd, sizeof pwd-1 ) ) {
+             {
-                     msg_box( dlg, _("Please enter a passphrase."), _("Add Photo"), MB_ERR );
+                 GpgKeyEdit ke;
-                     return FALSE;
-                 }
+                 ke.setKeyID (cb->keyid);
+                 if (cb->pass)
+                     ke.setPassphrase (cb->pass);
+                 else
+                     ke.setNoPassphrase (true);
+                 err = ke.addPhotoid (file);
              }
-             ke = new GpgKeyEdit (k->keyid);
+             if (err) {
-             if (!ke)
+                 msg_box (dlg, gpgme_strerror (err), _("Add Photo"), MB_ERR);
-                 BUG (NULL);
-             if (k->is_protected)
-                 ke->setPassphrase (pwd);
-             ec = ke->addPhotoid (file);
-             delete ke;
-             memset (pwd, 0, sizeof pwd);
-             if (ec) {
-                 msg_box (dlg, gpgme_strerror (ec), _("Add Photo"), MB_ERR );
                  return FALSE;
              }
              else {
-                 k->update = 1;
+                 cb->finished = 1;
-                 msg_box (dlg, _("Photo successfully added."), _("GnuPG Status"), MB_OK);
+                 msg_box (dlg, _("Photo successfully added."),
+                          _("GnuPG Status"), MB_OK);
              }
              EndDialog (dlg, TRUE);
              break;
-Line 343 
 keyedit_addphoto_dlg_proc (HWND dlg, UIN
+Line 403 
 keyedit_addphoto_dlg_proc (HWND dlg, UIN
  BOOL CALLBACK
  keyedit_addrevoker_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
  {
-     static winpt_key_t k;
+     static keyedit_cb_t cb;
-     static gpgme_key_t seckey;
-     GpgKeyEdit *ke;
      gpgme_error_t err;
-     char uid[128], pwd[128];
+     char *uid=NULL;
-     switch( msg ) {
+     switch (msg) {
      case WM_INITDIALOG:
-         k = (winpt_key_t)lparam;
+         cb = (keyedit_cb_t)lparam;
-         if( !k )
+         if (!cb)
-             BUG( NULL );
+             BUG (NULL);
-         if( get_seckey( k->keyid, &seckey ) )
+         do_init_keylist (dlg, cb->keyid);
-             BUG( NULL );
+         SetDlgItemText (dlg, IDC_ADDREV_INF,
-         if (!k->is_protected)
+                         _("Appointing a key as designated revoker cannot be undone."));
-             EnableWindow (GetDlgItem (dlg, IDC_ADDREV_PASS), FALSE);
-         do_init_keylist (dlg, k);
-         SetDlgItemText (dlg, IDC_ADDREV_INF, _("Appointing a key as designated revoker cannot be undone."));
          SetDlgItemText (dlg, IDC_ADDREV_KEYINF, _("Public key"));
          SetDlgItemText (dlg, IDC_ADDREV_PWDINF, _("Passphrase"));
          SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
          SetWindowText (dlg, _("Add Revoker"));
          SetForegroundWindow (dlg);
-         break;
+         center_window (dlg, cb->parent);
-     case WM_DESTROY:
-         break;
-     case WM_SYSCOMMAND:
-         if( LOWORD (wparam) == SC_CLOSE )
-             EndDialog( dlg, TRUE );
          break;
      case WM_COMMAND:
-         switch( LOWORD( wparam ) ) {
+         switch (LOWORD (wparam)) {
          case IDOK:
-             if( !GetDlgItemText( dlg, IDC_ADDREV_KEYLIST, uid, sizeof uid-1 ) ) {
+             if (!GetDlgItemText_utf8 (dlg, IDC_ADDREV_KEYLIST, &uid)) {
-                 msg_box( dlg, _("Please select a user ID."), _("Add Revoker"), MB_ERR );
+                 msg_box (dlg, _("Please select a user ID."), _("Add Revoker"), MB_ERR);
                  return FALSE;
              }
-             if( k->is_protected ) {
+             {
-                 if( !GetDlgItemText( dlg, IDC_ADDREV_PASS, pwd, sizeof pwd-1 ) ) {
+                 GpgKeyEdit ke;
-                     msg_box( dlg, _("Please enter the passphrase."), _("Add Revoker"), MB_ERR );
-                     return FALSE;
+                 ke.setKeyID (cb->keyid);
-                 }
+                 if (cb->pass)
-             }
+                     ke.setPassphrase (cb->pass);
-             ke = new GpgKeyEdit (k->keyid);
+                 else
-             if (k->is_protected)
+                     ke.setNoPassphrase (true);
-                 ke->setPassphrase (pwd);
+                 err = ke.addDesignatedRevoker (uid);
-             err = ke->addDesignatedRevoker (uid);
+             }
-             delete ke;
-             memset (pwd, 0, sizeof pwd);
+             safe_free (uid);
              if (err) {
                  msg_box (dlg, gpgme_strerror (err), _("Add Revoker"), MB_ERR);
                  return TRUE;
              }
              else {
-                 k->update = 1;
+                 cb->finished = 1;
-                 msg_box (dlg, _("Revoker successfully addded."), _("GnuPG Status"), MB_OK);
+                 msg_box (dlg, _("Revoker successfully addded."),
+                          _("GnuPG Status"), MB_OK);
              }
-             EndDialog( dlg, TRUE );
+             EndDialog (dlg, TRUE);
              break;
          case IDCANCEL:
-             EndDialog( dlg, FALSE );
+             EndDialog (dlg, FALSE);
              break;
          }
          break;
-Line 421 
 keyedit_addrevoker_dlg_proc (HWND dlg, U
+Line 469 
 keyedit_addrevoker_dlg_proc (HWND dlg, U
  BOOL CALLBACK
  keyedit_adduid_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
  {
-     static KEYEDIT_CB *ctx;
+     static keyedit_cb_t ctx;
+     keygen_cb_t keygen;
      gpgme_error_t err;
-     GpgKeyEdit *ke;
      char *utf8_name = NULL;
-     char name[128], email[128], comment[128];
+     char *utf8_comment = NULL;
+     char email[128];
      int rc;
-     switch ( msg ) {
+     switch (msg) {
      case WM_INITDIALOG:
-         ctx = (KEYEDIT_CB *)lparam;
+         ctx = (keyedit_cb_t)lparam;
-         if( !ctx )
+         if (!ctx)
              dlg_fatal_error(dlg, "Could not get dialog param!");
          SetWindowText (dlg, _("Add new User ID"));
          SetDlgItemText (dlg, IDC_ADDUID_INFNAME, _("&Name"));
          SetDlgItemText (dlg, IDC_ADDUID_INFEMAIL, _("&Email"));
          SetDlgItemText (dlg, IDC_ADDUID_INFCOMMENT, _("&Comment"));
          SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
          SetForegroundWindow (dlg);
-         return FALSE;
+         center_window (dlg, ctx->parent);
-     case WM_SYSCOMMAND:
-         if (LOWORD (wparam) == SC_CLOSE) {
-             EndDialog(dlg, TRUE);
-         }
          return FALSE;
      case WM_COMMAND:
          switch ( LOWORD( wparam ) )  {
          case IDOK:
-             rc = GetDlgItemText( dlg, IDC_ADDUID_NAME, name, sizeof name-1 );
+             keygen = (keygen_cb_t)ctx->opaque;
+             rc = GetDlgItemText_utf8 (dlg, IDC_ADDUID_NAME, &utf8_name);
              if (!rc || rc < 5) {
-                 msg_box( dlg, _("Please enter a name (min. 5 chars.)"), _("UserID"), MB_ERR );
+                 msg_box (dlg, _("Please enter a name (min. 5 chars.)"),
+                          _("UserID"), MB_ERR);
+                 free_if_alloc (utf8_name);
                  return FALSE;
              }
-             if (strchr (name, '@')) {
+             if (strchr (utf8_name, '@')) {
-                 msg_box( dlg, _("Please enter the email address in the email field and not in the name field"), _("UserID"), MB_INFO );
+                 msg_box (dlg, _("Please enter the email address in the email field and not in the name field"),
+                          _("UserID"), MB_INFO);
+                 free_if_alloc (utf8_name);
                  return FALSE;
              }
-             if( !GetDlgItemText( dlg, IDC_ADDUID_EMAIL, email, sizeof email -1 ) ) {
+             if( !GetDlgItemText (dlg, IDC_ADDUID_EMAIL, email, sizeof (email) -1)) {
-                 msg_box( dlg, _("Please enter an email address."), _("UserID"), MB_ERR );
+                 msg_box (dlg, _("Please enter an email address."), _("UserID"), MB_ERR);
+                 free_if_alloc (utf8_name);
                  return FALSE;
              }
-             if( !strchr( email, '@' ) || strchr (email, ' ')) {
+             if (check_email_address (email)) {
-                 msg_box( dlg, _("Invalid email address."), _("UserID"), MB_ERR );
+                 msg_box (dlg, _("Invalid email address."), _("UserID"), MB_ERR);
+                 free_if_alloc (utf8_name);
                  return FALSE;
              }
-             rc = GetDlgItemText( dlg, IDC_ADDUID_COMMENT, comment, sizeof comment -1 );
+             rc = GetDlgItemText_utf8 (dlg, IDC_ADDUID_COMMENT, &utf8_comment);
-             /* XXX: something is wrong with the encoding :-( */
+             {
-             utf8_name = wincp_to_utf8 (name, strlen (name));
+                 GpgKeyEdit ke;
-             ke = new GpgKeyEdit (ctx->keyid);
+                 ke.setKeyID (ctx->keyid);
-             if (!ke)
+                 if (ctx->is_protected)
-                 BUG (NULL);
+                     ke.setPassphrase (ctx->pass);
-             if (ctx->pass)
+                 else
-                 ke->setPassphrase (ctx->pass);
+                     ke.setNoPassphrase (true);
-             err = ke->addUserid (utf8_name? utf8_name : name,
+                 err = ke.addUserid (utf8_name, utf8_comment, email);
-                                  rc > 0? comment : NULL, email);
+             }
              if (err)
                  msg_box (dlg, gpgme_strerror (err), _("UserID"), MB_ERR);
              else {
                  msg_box (dlg, _("user ID successfully added."), _("GnuPG Status"), MB_OK);
                  ctx->finished = 1;
+                 /* The caller releases this items later. */
+                 keygen->name = utf8_name;
+                 keygen->comment = utf8_comment;
+                 keygen->email = m_strdup (email);
              }
-             delete ke;
-             free (utf8_name);
-             if (!err && ctx->lv)
-                 do_add_new_userid (ctx->lv, name, email, rc?comment : NULL);
              EndDialog (dlg, TRUE);
              return TRUE;
-Line 506 
 keyedit_adduid_dlg_proc (HWND dlg, UINT
+Line 556 
 keyedit_adduid_dlg_proc (HWND dlg, UINT
  }
- static int
+ /* Initalize a combo box with default key sizes (1024-4096). */
- diff_time (HWND dt, SYSTEMTIME *in_exp)
- {
-     SYSTEMTIME exp, now;
-     double e=0, n=0;
-     if (in_exp)
-         memcpy (&exp, in_exp, sizeof (SYSTEMTIME));
-     else
-         DateTime_GetSystemtime (dt, &exp);
-     GetSystemTime (&now);
-     SystemTimeToVariantTime (&exp, &e);
-     SystemTimeToVariantTime (&now, &n);
-     if (n > e)
-         return 0;
-     return (int)(e-n);
- }
  static void
  init_keysize_box (HWND dlg, int ctlid)
  {
+     /* Array with standard key-length in bits. */
      const char *sizelist[] = {
-         "1024", "1536", "2048", "2560", "3072", "3854", "4096", NULL
+         "1024", "1536",
+         "2048", "3072",
+         "4096", NULL
      };
      int i;
      for (i=0; sizelist[i] != NULL; i++)
-         SendDlgItemMessage (dlg, ctlid, CB_ADDSTRING, 0, (LPARAM)(char*)sizelist[i]);
+         SendDlgItemMessage (dlg, ctlid, CB_ADDSTRING, 0,
+                             (LPARAM)(char*)sizelist[i]);
      SendDlgItemMessage (dlg, ctlid, CB_SETCURSEL, (WPARAM)2, 0);
  }
  static int
  get_keysize_from_box (HWND dlg, int ctlid)
  {
-Line 547 
 get_keysize_from_box (HWND dlg, int ctli
+Line 585 
 get_keysize_from_box (HWND dlg, int ctli
      if (pos == CB_ERR)
          return -1;
      SendDlgItemMessage (dlg, ctlid, CB_GETLBTEXT, pos, (LPARAM)(char*)buf);
-     return atol (buf);
+     return atoi (buf);
  }
+ /* Create a time_t from a system time @st. */
+ time_t
+ w32_mktime (SYSTEMTIME *st)
+ {
+     struct tm tm;
+     memset (&tm, 0, sizeof (tm));
+     tm.tm_year = st->wYear-1900;
+     tm.tm_mday = st->wDay+1;
+     tm.tm_mon = st->wMonth-1;
+     return mktime (&tm);
+ }
+ /* Dialog procedure for adding a new secondary key. */
  BOOL CALLBACK
  keyedit_addsubkey_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
  {
-     static KEYEDIT_CB *ctx;
+     static keyedit_cb_t ctx;
-     static KEYGEN_CB *keygen;
+     keygen_cb_t keygen;
-     GpgKeyEdit *ke;
      gpgme_error_t err;
-     HWND lb;
+     SYSTEMTIME st;
+     HWND hwnd;
      int index, size, valid;
      switch (msg) {
      case WM_INITDIALOG:
-         ctx = (KEYEDIT_CB *)lparam;
+         ctx = (keyedit_cb_t)lparam;
          if (!ctx)
-             dlg_fatal_error (dlg, "Could not get dialog param!");
+             BUG (NULL);
-         keygen = (KEYGEN_CB *)ctx->opaque;
          SetWindowText (dlg, _("Add new Subkey"));
          SetDlgItemText (dlg, IDC_ADDSUBKEY_INFALGO, _("Key type"));
          SetDlgItemText (dlg, IDC_ADDSUBKEY_INFSIZE, _("Size in bits"));
-Line 575 
 keyedit_addsubkey_dlg_proc (HWND dlg, UI
+Line 626 
 keyedit_addsubkey_dlg_proc (HWND dlg, UI
          SetDlgItemText (dlg, IDC_ADDSUBKEY_EXPIRE, _("&Never"));
          SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
-         lb = GetDlgItem (dlg, IDC_ADDSUBKEY_ALGO);
+         hwnd = GetDlgItem (dlg, IDC_ADDSUBKEY_ALGO);
-         listbox_add_string (lb, "DSA (sign only)");
+         listbox_add_string (hwnd, "DSA (sign only)");
-         listbox_add_string (lb, "ElGamal (encrypt only)");
+         listbox_add_string (hwnd, "ElGamal (encrypt only)");
-         listbox_add_string (lb, "RSA (sign only)");
+         listbox_add_string (hwnd, "RSA (sign only)");
-         listbox_add_string (lb, "RSA (encrypt only)");
+         listbox_add_string (hwnd, "RSA (encrypt only)");
          CheckDlgButton (dlg, IDC_ADDSUBKEY_EXPIRE, BST_CHECKED);
          EnableWindow (GetDlgItem (dlg, IDC_ADDSUBKEY_EXPDATE), FALSE);
          init_keysize_box (dlg, IDC_ADDSUBKEY_SIZE);
          SetForegroundWindow (dlg);
-         return FALSE;
+         center_window (dlg, ctx->parent);
-     case WM_SYSCOMMAND:
-         if( LOWORD (wparam) == SC_CLOSE ) {
-             EndDialog( dlg, TRUE );
-         }
          return FALSE;
      case WM_COMMAND:
-         if (HIWORD (wparam) == BN_CLICKED && LOWORD (wparam) == IDC_ADDSUBKEY_EXPIRE) {
+         if (HIWORD (wparam) == BN_CLICKED &&
+             LOWORD (wparam) == IDC_ADDSUBKEY_EXPIRE) {
              if (IsDlgButtonChecked (dlg, IDC_ADDSUBKEY_EXPIRE))
                  EnableWindow (GetDlgItem (dlg, IDC_ADDSUBKEY_EXPDATE), FALSE);
              else
                  EnableWindow (GetDlgItem (dlg, IDC_ADDSUBKEY_EXPDATE), TRUE);
          }
-         if (HIWORD (wparam) == LBN_SELCHANGE && LOWORD (wparam) == IDC_ADDSUBKEY_ALGO) {
+         if (HIWORD (wparam) == LBN_SELCHANGE &&
+             LOWORD (wparam) == IDC_ADDSUBKEY_ALGO) {
+             /* If the selected algorithm is DSA, automatically set the
+                size to 1024, otherwise use the default keysize. */
              index = SendMessage ((HWND)lparam, LB_GETCURSEL, 0, 0);
-             if (index == 0)
+             SendDlgItemMessage (dlg, IDC_ADDSUBKEY_SIZE, CB_SETCURSEL,
-                 SendDlgItemMessage (dlg, IDC_ADDSUBKEY_SIZE, CB_SETCURSEL, 0, 0);
+                                 index==0? 0 : 2, 0);
          }
-         switch ( LOWORD(wparam) ) {
+         switch (LOWORD (wparam)) {
          case IDOK:
-             lb = GetDlgItem (dlg, IDC_ADDSUBKEY_ALGO);
+             keygen = (keygen_cb_t)ctx->opaque;
-             switch (listbox_get_cursel (lb)) {
+             assert (keygen);
+             hwnd = GetDlgItem (dlg, IDC_ADDSUBKEY_ALGO);
+             /* Map combo box numbers to GPG answers. */
+             switch (listbox_get_cursel (hwnd)) {
              case 0: index = 2; break;
              case 1: index = 4; break;
              case 2: index = 5; break;
              case 3: index = 6; break;
              default:
-                 msg_box( dlg, _("Please select one entry."), _("Add Subkey"), MB_ERR );
+                 msg_box (dlg, _("Please select one entry."),
+                          _("Add Subkey"), MB_ERR);
                  return FALSE;
              }
              size = get_keysize_from_box (dlg, IDC_ADDSUBKEY_SIZE);
              if (index == 2 && size != 1024) {
-                 msg_box( dlg,_("DSS uses a fixed keysize of 1024. Size changed."), _("Add Subkey"), MB_INFO );
+                 msg_box (dlg,_("DSS uses a fixed keysize of 1024. Size changed."),
+                          _("Add Subkey"), MB_INFO);
                  size = 1024;
              }
-             valid = diff_time (GetDlgItem (dlg, IDC_ADDSUBKEY_EXPDATE), NULL);
+             hwnd = GetDlgItem (dlg, IDC_ADDSUBKEY_EXPDATE);
+             DateTime_GetSystemtime (hwnd, &st);
+             valid = w32_mktime (&st) - time (NULL);
+             valid /= 86400;
              keygen->bits = size;
              switch (index) {
-Line 634 
 keyedit_addsubkey_dlg_proc (HWND dlg, UI
+Line 693 
 keyedit_addsubkey_dlg_proc (HWND dlg, UI
              if (valid > 0)
                  keygen->expire = time (NULL) + valid*24*60*60;
-             ke = new GpgKeyEdit (ctx->keyid);
+             {
-             if (!ke)
+                 GpgKeyEdit ke;
-                 BUG (NULL);
-             ke->setCallback (keygen_cb, NULL);
+                 ke.setKeyID (ctx->keyid);
-             if (ctx->pass)
+                 ke.setCallback (keygen_cb, NULL);
-                 ke->setPassphrase (ctx->pass);
+                 if (ctx->is_protected)
-             keygen_cb_dlg_create ();
+                     ke.setPassphrase (ctx->pass);
+                 else
-             err = ke->addSubkey ((gpgme_pubkey_algo_t)index, size, valid);
+                     ke.setNoPassphrase (true);
-             keygen->fpr = get_subkey_fingerprint (ctx->keyid);
+                 keygen_cb_dlg_create ();
-             keygen_cb_dlg_destroy ();
+                 err = ke.addSubkey ((gpgme_pubkey_algo_t)index, size, valid);
-             keygen_cb (NULL, NULL, 0, 0, 0); /* flush */
+             }
+             keygen->fpr = get_subkey_keyid (ctx->keyid);
+             keygen_cb_dlg_destroy (1);
              if (err)
                  msg_box (dlg, gpgme_strerror (err), _("Add Subkey"), MB_ERR);
              else {
-                 msg_box (dlg, _("Subkey successfully added."), _("GnuPG Status"), MB_OK);
+                 msg_box (dlg, _("Subkey successfully added."),
-                 if (ctx->lv)
+                          _("GnuPG Status"), MB_OK);
-                     do_add_new_subkey (ctx->lv, keygen, /*XXXk->flags*/0);
                  ctx->finished = 1;
              }
-             delete ke;
+             EndDialog (dlg, TRUE);
-             EndDialog (dlg, TRUE);
              return TRUE;
          case IDCANCEL:
-             EndDialog( dlg, FALSE );
+             EndDialog (dlg, FALSE);
              return FALSE;
          }
          break;
      }
      return FALSE;
- } /* keyedit_addsubkey_dlg_proc */
+ }
  BOOL
  keyedit_add_userid (winpt_key_t k, HWND dlg, listview_ctrl_t lv)
  {
-     KEYEDIT_CB cb;
+     keyedit_cb_s cb;
+     keygen_cb_s keygen;
      char *pass = NULL;
      int cancel = 0;
      if (!k->key_pair) {
-         msg_box( dlg, _("There is no secret key available!"), _("Add user ID"), MB_ERR );
+         msg_box (dlg, _("There is no secret key available!"),
+                  _("Add user ID"), MB_ERR);
          return FALSE;
      }
      if (k->is_protected) {
-         pass = request_passphrase( _("Key Edit"), 1, &cancel );
+         pass = request_key_passphrase (k->ctx, _("Key Edit"), &cancel);
          if (cancel)
              return FALSE;
      }
-     memset (&cb, 0, sizeof cb);
+     memset (&keygen, 0, sizeof (keygen));
-     cb.pass = k->is_protected? pass : NULL;
+     memset (&cb, 0, sizeof (cb));
-     cb.lv = lv;
+     cb.parent = dlg;
+     cb.opaque = &keygen;
+     cb.is_protected = k->is_protected;
+     cb.pass = pass;
      cb.keyid = k->keyid;
      dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYEDIT_ADDUID,
                        dlg, keyedit_adduid_dlg_proc,
                        (LPARAM)&cb, _("Add user ID"),
                        IDS_WINPT_KEYEDIT_ADDUID);
+     if (lv != NULL && cb.finished)
+         do_add_new_userid (lv, keygen.name, keygen.email, keygen.comment);
      if (cb.finished)
          k->update = 1;
+     free_if_alloc (keygen.name);
+     free_if_alloc (keygen.email);
+     free_if_alloc (keygen.comment);
      sfree_if_alloc (pass);
      return TRUE;
  }
+ /* Return the keyID of the last subkey. */
  char*
- get_subkey_fingerprint (const char *keyid)
+ get_subkey_keyid (const char *keyid)
  {
      gpgme_error_t err;
-     gpgme_key_t key, main;
+     gpgme_key_t key;
      gpgme_ctx_t ctx;
-     gpgme_subkey_t last_sk, k, new_sk;
+     gpgme_subkey_t subk;
-     int n;
+     char *kid = NULL;
      err = gpgme_new (&ctx);
      if (err)
          return NULL;
      err = gpgme_get_key (ctx, keyid, &key, 0);
+     gpgme_release (ctx);
      if (err)
          return NULL;
-     /* XXX: this is very slow and complicated */
+     subk = get_nth_key (key, count_subkeys (key));
+     if (subk != NULL)
-     n = count_subkeys (key);
+         kid = strdup (subk->keyid);
-     last_sk = get_nth_key (key, n-1);
-     new_sk = (gpgme_subkey_t)calloc (1, sizeof *new_sk);
-     if (!new_sk)
-         BUG (NULL);
-     memcpy (new_sk, last_sk, sizeof *last_sk);
-     new_sk->fpr = strdup (last_sk->fpr);
-     new_sk->keyid = strdup (last_sk->keyid);
-     get_pubkey (keyid, &main);
-     for (k=main->subkeys; k->next; k=k->next)
-         ;
-     k->next = new_sk;
      gpgme_key_release (key);
-     return new_sk->fpr;
+     return kid;
  }
  BOOL
  keyedit_add_subkey (winpt_key_t k, HWND dlg, listview_ctrl_t lv)
  {
-     KEYEDIT_CB cb;
+     keyedit_cb_s cb;
-     KEYGEN_CB keygen;
+     keygen_cb_s keygen;
      char *pass = NULL;
      int cancel = 0;
      if (!k->key_pair) {
-         msg_box (dlg, _("There is no secret key available!"), _("Add Subkey"), MB_ERR);
+         msg_box (dlg, _("There is no secret key available!"),
+                  _("Add Subkey"), MB_ERR);
          return FALSE;
      }
      if (k->is_protected) {
-         pass = request_passphrase (_("Key Edit"), 1, &cancel);
+         pass = request_key_passphrase (k->ctx, _("Key Edit"), &cancel);
          if (cancel)
              return FALSE;
      }
-Line 761 
 keyedit_add_subkey (winpt_key_t k, HWND
+Line 819 
 keyedit_add_subkey (winpt_key_t k, HWND
      memset (&keygen, 0, sizeof (keygen));
      memset (&cb, 0, sizeof (cb));
      cb.keyid = k->keyid;
-     cb.pass = k->is_protected? pass : NULL;
+     cb.is_protected = k->is_protected;
+     cb.pass = pass;
      cb.opaque = &keygen;
      dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_KEYEDIT_ADDSUBKEY,
                        dlg, keyedit_addsubkey_dlg_proc,
                        (LPARAM)&cb, _("Add new Subkey"),
                        IDS_WINPT_KEYEDIT_ADDSUBKEY);
+     if (lv != NULL && cb.finished)
+         do_add_new_subkey (lv, &keygen, 0);
      if (cb.finished)
          k->update = 1;
-     sfree_if_alloc (pass);
+     safe_free (keygen.fpr);
+     sfree_if_alloc (pass);
      return cb.finished? TRUE: FALSE;
  }
+ /* Set the preferred keyserver of the given key @k. */
  BOOL
  keyedit_set_pref_keyserver (winpt_key_t k, HWND dlg)
  {
-     GpgKeyEdit *ke;
+     GpgKeyEdit ke;
      gpgme_error_t err;
      struct URL_ctx_s *url;
-     char *pass;
+     char *pass = NULL;
      url = (struct URL_ctx_s *)get_keyserver_URL_dlg (dlg);
      if (url->cancel == 1) {
-Line 789 
 keyedit_set_pref_keyserver (winpt_key_t
+Line 852 
 keyedit_set_pref_keyserver (winpt_key_t
          return FALSE;
      }
-     pass = request_passphrase (_("Key Edit"), 1, &url->cancel);
+     pass = request_key_passphrase (k->ctx, _("Key Edit"), &url->cancel);
      if (url->cancel) {
          delete url;
          return FALSE;
      }
-     ke = new GpgKeyEdit (k->keyid);
+     ke.setKeyID (k->keyid);
-     if (!ke)
+     if (k->is_protected)
-         BUG (NULL);
+         ke.setPassphrase (pass);
-     ke->setPassphrase (pass);
+     else
-     err = ke->setPreferredKeyserver (0 /* XXX */, url->url);
+         ke.setNoPassphrase (true);
+     err = ke.setPreferredKeyserver (-1, url->url);
      if (!err)
-         msg_box (dlg, _("Preferred keyserver successfully set."), _("Key Edit"), MB_OK);
+         msg_box (dlg, _("Preferred keyserver successfully set."),
+                  _("Key Edit"), MB_OK);
+     else
+         msg_box (dlg, gpgme_strerror (err), _("Key Edit"), MB_ERR);
      sfree_if_alloc (pass);
-     delete ke;
+     delete url;
-     delete url;
      return err == 0? 0 : WPTERR_GENERAL;
  }
-Line 815 
 keyedit_set_pref_keyserver (winpt_key_t
+Line 881 
 keyedit_set_pref_keyserver (winpt_key_t
  BOOL
  keyedit_add_photo (winpt_key_t k, HWND dlg)
  {
+     keyedit_cb_s cb;
+     char *pass = NULL;
+     int cancel;
      if (!k->key_pair) {
-         msg_box (dlg, _("There is no secret key available!"), _("Add Photo"), MB_ERR);
+         msg_box (dlg, _("There is no secret key available!"),
+                  _("Add Photo"), MB_ERR);
          return FALSE;
      }
+     memset (&cb, 0, sizeof (cb));
+     if (k->is_protected) {
+         pass = request_key_passphrase (k->ctx, _("Key Edit"), &cancel);
+         if (cancel)
+             return FALSE;
+     }
+     cb.parent = dlg;
+     cb.pass = pass;
+     cb.keyid = k->keyid;
      DialogBoxParam (glob_hinst, (LPCTSTR)IDD_WINPT_KEYEDIT_ADDPHOTO, dlg,
-                     keyedit_addphoto_dlg_proc, (LPARAM)k);
+                     keyedit_addphoto_dlg_proc, (LPARAM)&cb);
+     if (cb.finished)
+         k->update = 1;
+     sfree_if_alloc (pass);
      return TRUE;
  }
-Line 828 
 keyedit_add_photo (winpt_key_t k, HWND d
+Line 913 
 keyedit_add_photo (winpt_key_t k, HWND d
  BOOL
  keyedit_add_revoker (winpt_key_t k, HWND dlg)
  {
-     if( !k->key_pair ) {
+     keyedit_cb_s cb;
-         msg_box( dlg, _("There is no secret key available!"), _("Add Revoker"), MB_ERR );
+     char *pass = NULL;
+     int cancel;
+     if (!k->key_pair) {
+         msg_box (dlg, _("There is no secret key available!"), _("Add Revoker"), MB_ERR);
          return FALSE;
      }
+     if (k->is_protected) {
+         pass = request_key_passphrase (k->ctx, _("Key Edit"), &cancel);
+         if (cancel)
+             return FALSE;
+     }
+     memset (&cb, 0, sizeof (cb));
+     cb.parent = dlg;
+     cb.is_protected = k->is_protected;
+     cb.keyid = k->keyid;
+     cb.pass = pass;
      DialogBoxParam (glob_hinst, (LPCTSTR)IDD_WINPT_KEYEDIT_ADDREV, dlg,
-                     keyedit_addrevoker_dlg_proc, (LPARAM)k);
+                     keyedit_addrevoker_dlg_proc, (LPARAM)&cb);
+     if (cb.finished)
+         k->update = 1;
+     sfree_if_alloc (pass);
      return TRUE;
- } /* keyedit_add_revoker */
+ }
+ /* Change ownertrust of the given key @key.
+    Return TRUE if the ownertrust was changed. */
+ BOOL
+ keyedit_change_ownertrust (winpt_key_t key, HWND dlg)
+ {
+     int rc;
+     rc = dialog_box_param (glob_hinst,
+                              (LPCSTR)IDD_WINPT_KEYEDIT_OWNERTRUST,
+                              dlg, keyedit_ownertrust_dlg_proc,
+                              (LPARAM)key, _("Change Ownertrust"),
+                              IDS_WINPT_KEYEDIT_OWNERTRUST);
+     if (rc == TRUE) {
+         msg_box (dlg, _("Key status changed."), _("Key Edit"), MB_OK);
+         key->update = 1;
+     }
+     return rc;
+ }
+ /* Check if the given key is supposed to have IDEA
+    for secret key protection. */
  static int
- is_idea_protect_algo (const char * keyid)
+ is_idea_protect_algo (const char *keyid)
  {
      winpt_key_s k;
      const unsigned char *sym_prefs;
-Line 848 
 is_idea_protect_algo (const char * keyid
+Line 975 
 is_idea_protect_algo (const char * keyid
      memset (&k, 0, sizeof (k));
      if (winpt_get_pubkey (keyid, &k))
          BUG (NULL);
+     if (!k.is_v3)
+         return 0;
      sym_prefs = k.ext->sym_prefs;
+     /* Assume that only v3 keys have no symmetric cipher
+        preferences and thus IDEA is explicit. */
      if (!sym_prefs)
-         return 1; /* assume that only v3 keys have no symmetric cipher preferences
+         return 1;
-                      and thus IDEA is explicit. */
      for (n = 0; sym_prefs[n]; n++)
          ;
      if ((n == 0 || n == 1) && *sym_prefs == 0x01)
          return 1;
      return 0;
- } /* is_idea_protect_algo */
+ }
  BOOL
- keyedit_change_passwd( winpt_key_t k, HWND dlg )
+ keyedit_change_passwd (winpt_key_t k, HWND dlg)
  {
-     GpgKeyEdit *ke;
+     gpgme_error_t err;
-     gpgme_error_t ec;
+     GpgKeyEdit ke;
-     char *old_pass = NULL, *new_pass = NULL;
+     char *old_pass = NULL;
+     char *new_pass = NULL;
      int cancel = 0;
-     if( !k->key_pair ) {
+     if (!k->key_pair) {
-         msg_box( dlg, _("There is no secret key available!"), _("Key Edit"), MB_ERR );
+         msg_box (dlg, _("There is no secret key available!"),
+                  _("Key Edit"), MB_ERR);
          return FALSE;
      }
-     if( !idea_available && is_idea_protect_algo( k->keyid ) ) {
+     if (!idea_available && is_idea_protect_algo (k->keyid)) {
-         msg_box( dlg, _("Cannot change passphrase because the key\n"
+         msg_box (dlg, _("Cannot change passphrase because the key\n"
                          "is protected with the IDEA encryption algorithm."),
-                         _("Key Edit"), MB_ERR );
+                         _("Key Edit"), MB_ERR);
          return FALSE;
      }
-     if( k->is_protected ) {
+     if (k->is_protected) {
-         old_pass = request_passphrase( _("Current (old) Passphrase"), 1, &cancel );
+         old_pass = request_passphrase (_("Current (old) Passphrase"),
-         if( cancel )
+                                        PASSDLG_INIT, &cancel);
+         if (cancel)
              return FALSE;
      }
-     new_pass = request_passphrase( _("New Passphrase" ), 1, &cancel );
+     new_pass = request_passphrase2 (_("New Passphrase" ),
-     if( cancel ) {
+                                     PASSDLG_INIT|PASSDLG_WARN_UTF8, &cancel);
-         free_if_alloc( old_pass );
+     if (cancel) {
+         sfree_if_alloc (old_pass);
          return FALSE;
      }
-     if( is_8bit_string( new_pass ) ) {
+     if (strlen (new_pass) == 0) {
-         msg_box( dlg, _("The passphrase contains 8-bit characters.\n"
+         cancel = msg_box (dlg, _("Are you sure that you really don't want a passphrase?\n"
-                          "It is not suggested to use charset specific characters."),
+                                  "This is propably a bad idea, continue?"),
-                          _("Key Edit"), MB_ERR );
+                             _("Key Edit"), MB_WARN_ASK);
-         free_if_alloc( old_pass );
+         if (cancel != IDYES) {
-         free_if_alloc( new_pass );
+             sfree_if_alloc (old_pass);
-         return FALSE;
+             sfree_if_alloc (new_pass);
+             return FALSE;
+         }
      }
-     ke = new GpgKeyEdit (k->keyid);
+     ke.setKeyID (k->keyid);
-     if (!ke)
+     ke.setPassphrase (k->is_protected? old_pass : NULL);
-         BUG (NULL);
+     if (!k->is_protected)
+         ke.setNoPassphrase (true);
-     ke->setPassphrase (k->is_protected? old_pass : NULL);
+     err = ke.changePassphrase (new_pass, 1);
-     ec = ke->changePassphrase (new_pass, 0);
+     if (err)
-     if( ec )
+         msg_box (dlg, gpgme_strerror (err), _("Change Password"), MB_ERR);
-         msg_box (dlg, gpgme_strerror (ec), _("Change Passwd"), MB_ERR);
      else
          msg_box (dlg, _("Passphrase successfully changed."),  _("GnuPG status"), MB_OK);
      sfree_if_alloc (old_pass);
      sfree_if_alloc (new_pass);
-     delete ke;
      return TRUE;
  }
+ /* Initialize sub key list from key @k and return
+    the new listview control. */
  listview_ctrl_t
- subkey_list_init( HWND dlg, winpt_key_t k )
+ subkey_list_init (HWND dlg, winpt_key_t k)
  {
      LV_ITEM lvi;
-     gpgme_key_t key;
      gpgme_subkey_t sub;
      struct listview_column_s cols[] = {
          {0, 80, (char *)_("Description")},
-Line 938 
 subkey_list_init( HWND dlg, winpt_key_t
+Line 1074 
 subkey_list_init( HWND dlg, winpt_key_t
      listview_ctrl_t lv;
      char buf[256], tmp[128];
      const char *t;
-     int nkeys = 0, rc = 0, i, bits;
+     int nkeys = 0, i;
-     if( get_pubkey( k->keyid, &key ) ) {
+     nkeys = count_subkeys (k->ctx);
-         msg_box( dlg, _("Could not find key."), _("Key Edit"), MB_ERR );
+     if (!nkeys)
-         return NULL;
+         BUG (NULL); /* should never happen. */
-     }
-     nkeys = count_subkeys (key);
-     if( !nkeys ) {
-         msg_box( dlg, _("No subkey(s) found."), _("Key Edit"), MB_ERR );
-         return NULL;
-     }
-     rc  = listview_new( &lv );
-     if( rc )
-         BUG( dlg );
-     lv->ctrl = GetDlgItem( dlg, IDC_KEYEDIT_KEYLIST );
+     listview_new (&lv, GetDlgItem (dlg, IDC_KEYEDIT_KEYLIST));
-     for( i = 0; cols[i].fieldname != NULL; i++ )
+     for (i = 0; cols[i].fieldname != NULL; i++)
-         listview_add_column( lv, &cols[i] );
+         listview_add_column (lv, &cols[i]);
-     for( i = 0; i < nkeys; i++ ) {
+     for (i = 0, sub = k->ctx->subkeys; i < nkeys; i++, sub = sub->next) {
-         listview_add_item( lv, "" );
+         listview_add_item (lv, "");
-         listview_add_sub_item( lv, 0, 1, "" );
+         listview_add_sub_item (lv, 0, 1, "");
-         memset( &lvi, 0, sizeof lvi );
+         memset (&lvi, 0, sizeof (lvi));
          lvi.mask = LVIF_PARAM;
-         lvi.lParam = (LPARAM )key;
+         lvi.lParam = (LPARAM)sub;
-         if( ListView_SetItem( lv->ctrl, &lvi ) == FALSE )
+         if (ListView_SetItem (lv->ctrl, &lvi) == FALSE)
-             return NULL;
+             BUG (NULL);
      }
-     listview_set_ext_style( lv );
+     listview_set_ext_style (lv);
-     for( i = 0, sub = key->subkeys; i < nkeys; i++, sub = sub->next ) {
+     for (i = 0, sub = k->ctx->subkeys; i < nkeys; i++, sub = sub->next) {
-         memset( buf, 0, sizeof buf );
+         _snprintf (buf, DIM (buf)-1, "%d-bit %s", sub->length,
+                                 get_key_pubalgo (sub->pubkey_algo));
-         bits = sub->length;
+         listview_add_sub_item (lv, i, SUBK_COL_DESC, buf);
-         _snprintf( tmp, sizeof tmp-1, "%d-bit ", bits );
-         strcat( buf, tmp );
-         _snprintf( tmp, sizeof tmp-1, "%s", get_key_pubalgo (sub->pubkey_algo));
-         strcat( buf, tmp );
-         listview_add_sub_item( lv, i, 0, buf );
          t = sub->keyid;
-         if( !t )
+         assert (t != NULL);
-             t = "DEADBEEFDEADBEEF";
+         _snprintf (tmp, DIM (tmp)-1, "0x%s", t+8);
-         _snprintf( tmp, sizeof tmp-1, "0x%s", t+8 );
+         listview_add_sub_item (lv, i, SUBK_COL_KEYID, tmp);
-         listview_add_sub_item( lv, i, 1, tmp );
          t = get_key_created (sub->timestamp);
-         if( !t )
+         if (!t)
              t = "????" "-??" "-??";
-         listview_add_sub_item( lv, i, 2, t );
+         listview_add_sub_item (lv, i, SUBK_COL_CREATION, t);
-         if( sub->expires ) {
+         if (sub->expires) {
              t = get_key_created (sub->expires);
-             listview_add_sub_item( lv, i, 3, t );
+             listview_add_sub_item (lv, i, SUBK_COL_EXPIRES, t);
          }
          else
-             listview_add_sub_item( lv, i, 3, _("Never") );
+             listview_add_sub_item (lv, i, SUBK_COL_EXPIRES, _("Never"));
+         if (sub->expired)
-         if( sub->expired )
              t = _("Expired");
-         else if( sub->revoked )
+         else if (sub->revoked)
              t = _("Revoked");
          else
              t = _("OK");
-         listview_add_sub_item( lv, i, 4, t );
+         listview_add_sub_item (lv, i, SUBK_COL_STATUS, t);
          if (sub->can_certify) t = "*"; else t = "";
-         listview_add_sub_item (lv, i, 5, t);
+         listview_add_sub_item (lv, i, SUBK_COL_C_FLAG, t);
          if (sub->can_sign) t = "*"; else t = "";
-         listview_add_sub_item( lv, i, 6, t );
+         listview_add_sub_item (lv, i, SUBK_COL_S_FLAG, t);
          if (sub->can_encrypt) t = "*"; else t = "";
-         listview_add_sub_item( lv, i, 7, t );
+         listview_add_sub_item (lv, i, SUBK_COL_E_FLAG, t);
          if (sub->can_authenticate) t = "*"; else t = "";
-         listview_add_sub_item (lv, i, 8, t);
+         listview_add_sub_item (lv, i, SUBK_COL_A_FLAG, t);
      }
      return lv;
- } /* subkey_list_init */
+ }
  static listview_ctrl_t
  userid_list_init (HWND dlg, winpt_key_t k)
  {
      listview_ctrl_t lv = NULL;
-     gpgme_key_t key;
      gpgme_key_sig_t ks;
-     gpgme_user_id_t u;
+     struct native_uid_s *u;
-     int nuids = 0, rc, j, u_attr;
+     int nuids = 0, j, u_attr;
      struct listview_column_s cols[] = {
          {0,  72, (char *)_("Validity")},
          {1, 150, (char *)_("Name")},
-Line 1035 
 userid_list_init (HWND dlg, winpt_key_t
+Line 1151 
 userid_list_init (HWND dlg, winpt_key_t
          {0, 0, 0}
      };
      const char *attr;
-     if (get_pubkey( k->keyid, &key)) {
-         msg_box( dlg, _("Could not find key."), _("Key Edit"), MB_ERR );
-         return NULL;
-     }
-     nuids = count_userids (key);
+     nuids = count_userids (k->ctx);
-     if (!nuids) {
+     if (!nuids)
-         msg_box (dlg, _("No user ID(s) found."), _("Key Edit"), MB_ERR);
+         BUG (NULL); /* should never happen. */
-         return NULL;
-     }
-     rc = listview_new (&lv);
+     listview_new (&lv, GetDlgItem (dlg, IDC_KEYEDIT_UIDLIST));
-     if( rc )
+     for (j = 0; cols[j].fieldname != NULL; j++)
-         BUG( dlg );
+         listview_add_column (lv, &cols[j]);
-     lv->ctrl = GetDlgItem( dlg, IDC_KEYEDIT_UIDLIST );
-     for( j = 0; cols[j].fieldname != NULL; j++ )
-         listview_add_column( lv, &cols[j] );
-     for( j = 0; j < nuids; j++ ) {
+     for (j = 0; j < nuids; j++) {
-         listview_add_item( lv, " " );
+         listview_add_item (lv, " ");
-         listview_add_sub_item( lv, 0, 1, " " );
+         listview_add_sub_item (lv, 0, 1, " " );
      }
      listview_set_ext_style (lv);
-     for (j = 0, u=key->uids; j < nuids; u=u->next, j++) {
+     for (j = 0, u=k->ext->uids; j < nuids; u=u->next, j++) {
          if (u->revoked)
              attr = _("Revoked");
          else {
              u_attr = (int)u->validity;
              attr = get_key_trust2 (NULL, u_attr, 0, 0);
          }
-         listview_add_sub_item( lv, j, 0, (char *)attr );
+         listview_add_sub_item (lv, j, UID_COL_VALID, (char *)attr);
          /* XXX: add comment if available */
-         attr = u->name;
+         listview_add_sub_item (lv, j, UID_COL_NAME,
-         if (attr) {
+                                u->name? u->name : _("Invalid user ID"));
-             char * uid = utf8_to_wincp (attr, strlen (attr));
+         if (u->email)
-             if (uid) {
+             listview_add_sub_item (lv, j, UID_COL_EMAIL, u->email);
-                 listview_add_sub_item( lv, j, 1, uid );
-                 free( uid );
-             }
-         }
-         else
-             listview_add_sub_item( lv, j, 1, _("Invalid user ID") );
-         attr = u->email;
-         if (attr)
-             listview_add_sub_item (lv, j, 2, attr);
-         ks = get_selfsig (u, k->keyid+2, 1);
+         ks = get_selfsig (u->signatures, k->keyid, 1);
          if (ks)
-             listview_add_sub_item (lv, j, 3, get_key_created (ks->timestamp));
+             listview_add_sub_item (lv, j, UID_COL_CREATION,
+                                    get_key_created (ks->timestamp));
      }
-     if( !k->key_pair ) {
+     if (!k->key_pair) {
-         CheckDlgButton( dlg, IDC_KEYUID_ADD, BST_INDETERMINATE );
+         CheckDlgButton (dlg, IDC_KEYUID_ADD, BST_INDETERMINATE);
-         CheckDlgButton( dlg, IDC_KEYUID_REVOKE, BST_INDETERMINATE );
+         CheckDlgButton (dlg, IDC_KEYUID_REVOKE, BST_INDETERMINATE);
      }
      return lv;
- } /* userid_list_init */
+ }
  static void
- do_init_cmdlist( HWND dlg )
+ do_init_cmdlist (HWND dlg, int is_keypair)
  {
-     const char *cmdlist[] = {
+     const char *s;
-         "ADDKEY",
+     int i;
-         "ADDUID",
-         "ADDPHOTO",
-         "ADDREVOKER",
-         /*"FPR",*/
-         "DELUID",
-         "DELKEY",
-         "DELPHOTO",
-         /*"DELSIG",*/
-         "EXPIRE",
-         /*"PREF",*/
-         "SHOWPREF",
-         /*"SETPREF",*/
-         "PASSWD",
-         "PRIMARY",
-         "TRUST",
-         /*"REVSIG",*/
-         "REVUID",
-         "REVKEY",
-         "DISABLE",
-         "ENABLE",
-         "SHOWPHOTO",
-         NULL
-     };
-     const char * s;
-     int i = 0;
-     for( i = 0; (s=cmdlist[i]); i++ ) {
+     for (i = 0; (s=cmdlist[i].name); i++) {
-         SendDlgItemMessage( dlg, IDC_KEYEDIT_CMD, CB_ADDSTRING, 0,
+         if (is_keypair)
-                             (LPARAM)(char *)s );
+             SendDlgItemMessage (dlg, IDC_KEYEDIT_CMD, CB_ADDSTRING, 0,
+                                 (LPARAM)(char *)s);
+         else if (!cmdlist[i].need_pair)
+             SendDlgItemMessage (dlg, IDC_KEYEDIT_CMD, CB_ADDSTRING, 0,
+                                 (LPARAM)(char *)s);
      }
-     SendDlgItemMessage( dlg, IDC_KEYEDIT_CMD, CB_SETCURSEL, 0, 0 );
+     SendDlgItemMessage (dlg, IDC_KEYEDIT_CMD, CB_SETCURSEL, 0, 0);
- } /* do_init_cmdlist */
+ }
+ /* Return 1 if the requested command is RFC2440. */
  static int
- is_cmd_openpgp( int cmdid )
+ is_cmd_openpgp (int cmdid)
  {
-     switch( cmdid ) {
+     switch (cmdid) {
      case CMD_ADDKEY:
      case CMD_ADDPHOTO:
      case CMD_ADDREVOKER:
-     case CMD_DELPHOTO:
+     case CMD_SETPREF:
-     /*case CMD_SHOWPHOTO:*/
-     /*case CMD_SETPREF:*/
          return 1;
      }
      return 0;
- } /* is_cmd_openpgp */
+ }
+ /* Display a message box with a short description of the commands. */
  static void
- do_show_help( HWND dlg )
+ do_show_help (HWND dlg)
  {
-     char helptext[2048];
+     const char *help;
+     help =
+         _(
+          "ADDUID      add a user ID\r\n"
+          "ADDPHOTO    add a photo ID\r\n"
+          "DELUID      delete a user ID\r\n"
+          "ADDKEY      add a secondary key\r\n"
+          "DELKEY      delete a secondary key\r\n"
+          "ADDREVOKER  add a revocation key\r\n"
+          "EXPIRE      change the expire date\r\n"
+          "SHOWPREF    list preferences (verbose)\r\n"
+          /*"SETPREF     update specific algorithm preferences\r\n"*/
+          "PASSWD      change the passphrase\r\n"
+          "PRIMARY     flag user ID as primary\r\n"
+          "TRUST       change the ownertrust\r\n"
+          "REVUID      revoke a user ID\r\n"
+          "REVKEY      revoke a secondary key\r\n"
+          "DISABLE     disable a key\r\n"
+          "ENABLE      enable a key\r\n"
+          "SIGN        sign a user-id (exportable)\r\n"
+          "LSIGN       sign a user-id (non-exportable)\r\n"
+          "CLEAN       remove unusable signatures from key\r\n"
+          "MINIMIZE    remove all signatures from key\r\n"
+          );
+     msg_box (dlg, help, _("Key Edit Help"), MB_OK);
+ }
+ static gpgme_subkey_t
+ get_subkey_bypos (const char *keyid, int idx)
+ {
+     gpgme_key_t key;
+     if (get_pubkey (keyid, &key))
+         return NULL;
+     return get_nth_key (key, idx);
+ }
-     _snprintf( helptext, sizeof helptext-1,
-         _(/*"FPR            \t\tshow fingerprint\r\n"*/
-          "ADDUID   \t\tadd a user ID\r\n"
-          "ADDPHOTO  \t\tadd a photo ID\r\n"
-          "DELUID    \t\tdelete a user ID\r\n"
-          "ADDKEY    \t\tadd a secondard key\r\n"
-          "DELKEY    \t\tdelete a secondary key\r\n"
-          "ADDREVOKER\t\tadd a revocation key\r\n"
-          /*"DELSIG    \t\tdelete signatures\r\n"*/
-          "EXPIRE    \t\tchange the expire date\r\n"
-          /*"PREF            \t\tlist preferences (expert)\r\n"
-          "SHOWPREF  \t\tlist preferences (verbose)\r\n"
-          "SETPREF   \t\tset preference list\r\n"*/
-          "UPDPREF   \t\tupdated preferences\r\n"
-          "PASSWD    \t\tchange the passphrase\r\n"
-          "PRIMARY   \t\tflag user ID as primary\r\n"
-          "TRUST     \t\tchange the ownertrust\r\n"
-          /*"REVSIG    \t\trevoke signatures\r\n"*/
-          "REVUID    \t\trevoke a user ID\r\n"
-          "REVKEY    \t\trevoke a secondary key\r\n"
-          "DISABLE   \t\tdisable a key\r\n"
-          "ENABLE    \t\tenable a key\r\n"
-          /*"SHOWPHOTO \t\tshow photo ID\r\n"*/) );
-     msg_box( dlg, helptext, _("Key Edit Help"), MB_OK );
- } /* do_show_help */
  static int
  do_editkey_delkey (winpt_key_t k, HWND dlg, listview_ctrl_t lv)
  {
      gpgme_error_t err;
-     GpgKeyEdit *ke;
+     gpgme_subkey_t subk;
-     int j, id;
+     GpgKeyEdit ke;
+     int pos, id;
+     const char *warn;
      char tmp[64];
      if (!k->key_pair)
-         return FALSE; /* XXX: shall we allow to modify non-secret keys?? */
+         return FALSE;
-     if( listview_count_items( lv, 0 ) == 1 ) {
+     if (listview_count_items (lv, 0) == 1) {
-         msg_box( dlg, _("Primary key can not be deleted!"), _("Key Edit"), MB_ERR);
+         msg_box (dlg, _("Primary key can not be deleted!"), _("Key Edit"), MB_ERR);
          return FALSE;
      }
-     if( (j = listview_get_curr_pos( lv )) == -1 ) {
+     pos = listview_get_curr_pos (lv);
-         msg_box( dlg, _("Please select a key."), _("Key Edit"), MB_ERR );
+     if (pos == -1) {
+         msg_box (dlg, _("Please select a key."), _("Key Edit"), MB_ERR);
          return FALSE;
      }
-     if( j == 0 ) {
+     if (pos == 0) {
-         msg_box( dlg, _("Primary subkey can not be deleted!"), _("Key Edit"), MB_ERR );
+         msg_box (dlg, _("Primary key can not be deleted!"), _("Key Edit"), MB_ERR);
          return FALSE;
      }
-     listview_get_item_text( lv, j, 0, tmp, sizeof tmp -1 );
+     listview_get_item_text (lv, pos, 0, tmp, DIM (tmp) -1);
-     id = log_box( _("Key Edit"), MB_YESNO|MB_ICONWARNING,
+     subk = get_subkey_bypos (k->keyid, pos);
-                     _("\"Subkey %s.\"\n\n"
+     /* Issue different warning for the different key capabilities. */
-                       "Anything encrypted to the selected subkey will no longer\n"
+     if (subk->can_encrypt)
-                       "be able to be decrypted.\n\n"
+         warn = _("Anything encrypted to the selected subkey cannot be\n"
-                       "Do you really want to delete this subkey?"), tmp );
+                  "decrypted any longer.");
-     if( id == IDNO )
+     else if (subk->can_sign || subk->can_certify)
+         warn = _("Anything signed by the selected subkey cannot be\n"
+                  "verified any longer.");
+     else
+         warn = ""; /* just get rid of the warning. */
+     id = log_box (_("Key Edit"), MB_YESNO|MB_ICONWARNING,
+                   _("\"Subkey %s.\"\n\n%s\n\n"
+                     "Do you really want to delete this subkey?"),
+                   tmp, warn);
+     if (id == IDNO)
          return FALSE;
-     ke = new GpgKeyEdit (k->keyid);
+     ke.setKeyID (k->keyid);
-     if (!ke)
+     err = ke.delKey (pos);
-         BUG (NULL);
-     err = ke->delKey (j);
      if (err)
          msg_box (dlg, gpgme_strerror (err), _("Delete Subkey"), MB_ERR);
      else {
-         listview_del_item (lv, j);
+         listview_del_item (lv, pos);
          k->update = 1;
          status_box (dlg, _("Subkey successfully deleted."), _("GnuPG status"));
      }
-     delete ke;
      return err? FALSE : TRUE;
- } /* do_editkey_delkey */
+ }
  /* Set the expiration date for the selected key in list view @lv.
-Line 1238 
 static int
+Line 1336 
 static int
  do_editkey_expire (winpt_key_t k, HWND dlg, listview_ctrl_t lv)
  {
      gpgme_error_t err;
-     GpgKeyEdit *ke;
+     GpgKeyEdit ke;
      date_s udd = {0};
      char buf[256], * pass = NULL;
-     int j, cancel = 0;
+     time_t exp;
+     int pos, cancel = 0;
      if (!k->key_pair) {
          msg_box (dlg, _("There is no secret key available!"), _("Key Edit"), MB_ERR);
          return FALSE;
      }
-     if ((j = listview_get_curr_pos (lv)) == -1) {
+     pos = listview_get_curr_pos (lv);
-         msg_box( dlg, _("Please select a key."), _("Key Edit"), MB_ERR );
+     if (pos == -1) {
+         msg_box (dlg, _("Please select a key."), _("Key Edit"), MB_ERR);
          return FALSE;
      }
      /* If a key already expired, it is possible the user wants to
         set a new expiration date.. */
-     listview_get_item_text (lv, j, SUBK_COL_STATUS, buf, sizeof buf -1);
+     listview_get_item_text (lv, pos, SUBK_COL_STATUS, buf, DIM (buf)-1);
      if (!strcmp (buf, _("Expired"))) {
          cancel = msg_box (dlg, _("Key already expired.\n\n"
                            "Do you want to change the expiration date?"),
-Line 1264 
 do_editkey_expire (winpt_key_t k, HWND d
+Line 1364 
 do_editkey_expire (winpt_key_t k, HWND d
          cancel = 0;
      }
-     memset (&udd, 0, sizeof udd);
+     memset (&udd, 0, sizeof (udd));
      udd.text = _("Key Expiration Date");
      dialog_box_param (glob_hinst, (LPCSTR)IDD_WINPT_DATE, dlg,
                        date_dlg_proc, (LPARAM)&udd,
-Line 1272 
 do_editkey_expire (winpt_key_t k, HWND d
+Line 1372 
 do_editkey_expire (winpt_key_t k, HWND d
      if (udd.cancel == 1)
          return FALSE;
      if (!keygen_check_date (&udd.st)) {
-         msg_box (dlg, _("The date you have chosen lies in the past."),
+         msg_box (dlg, _("The date you have chosen has already passed."),
                   _("Key Edit"), MB_ERR);
          return FALSE;
      }
-     if( k->is_protected ) {
+     if (k->is_protected) {
-         pass = request_passphrase (_("Key Edit"), 1, &cancel);
+         pass = request_key_passphrase (k->ctx, _("Key Edit"), &cancel);
          if (cancel)
              return FALSE;
      }
+     exp = w32_mktime (&udd.st);
-     ke = new GpgKeyEdit (k->keyid);
+     ke.setKeyID (k->keyid);
-     if (!ke)
-         BUG (NULL);
      if (k->is_protected)
-         ke->setPassphrase (pass);
+         ke.setPassphrase (pass);
-     err = ke->setKeyExpireDate (j, diff_time (NULL, &udd.st), true);
+     else
+         ke.setNoPassphrase (true);
+     err = ke.setKeyExpireDate (pos, exp, false);
      if (err)
          msg_box (dlg, gpgme_strerror (err), _("Expire Subkey"), MB_ERR);
      else {
-         _snprintf (buf, sizeof buf - 1, "%04d-%02d-%02d",
+         _snprintf (buf, DIM (buf)-1, "%s", get_key_created (exp));
-                    udd.st.wYear, udd.st.wMonth, udd.st.wDay);
+         listview_add_sub_item (lv, pos, SUBK_COL_EXPIRES, buf);
-         listview_add_sub_item (lv, j, SUBK_COL_EXPIRES, buf);
          k->update = 1;
          msg_box (dlg, _("Subkey expire date successfully set."),
                   _("GnuPG status"), MB_OK);
      }
      sfree_if_alloc (pass);
-     delete ke;
      return TRUE;
  }
-Line 1311 
 static int
+Line 1410 
 static int
  do_editkey_revoke (winpt_key_t k, HWND dlg, listview_ctrl_t lv)
  {
      gpgme_error_t err;
-     GpgKeyEdit *ke;
+     GpgKeyEdit ke;
      char buf[256];
      char *pass = NULL;
      int j, cancel = 0;
-Line 1333 
 do_editkey_revoke (winpt_key_t k, HWND d
+Line 1432 
 do_editkey_revoke (winpt_key_t k, HWND d
          return FALSE;
      }
-     listview_get_item_text (lv, j, SUBK_COL_STATUS, buf, sizeof (buf)-1);
+     listview_get_item_text (lv, j, SUBK_COL_STATUS, buf, DIM (buf)-1);
      if (!strcmp (buf, _("Revoked"))) {
          msg_box (dlg, _("Key already revoked."), _("Key Edit"), MB_ERR);
          return FALSE;
      }
      if (k->is_protected) {
-         pass = request_passphrase (_("Key Edit"), 1, &cancel);
+         pass = request_key_passphrase (k->ctx, _("Key Edit"), &cancel);
          if (cancel)
              return FALSE;
      }
-     ke = new GpgKeyEdit (k->keyid);
+     ke.setKeyID (k->keyid);
-     if (!ke)
-         BUG (NULL);
      if (k->is_protected)
-         ke->setPassphrase (pass);
+         ke.setPassphrase (pass);
-     err = ke->revokeSubkey (j, 0, NULL);
+     else
+         ke.setNoPassphrase (true);
+     err = ke.revokeSubkey (j, 0, NULL);
      if (err)
          msg_box( dlg, gpgme_strerror (err), _("Revoke Subkey"), MB_ERR);
      else {
-Line 1359 
 do_editkey_revoke (winpt_key_t k, HWND d
+Line 1458 
 do_editkey_revoke (winpt_key_t k, HWND d
          msg_box( dlg, _("Subkey successfully revoked."), _("GnuPG Status"), MB_OK );
      }
      sfree_if_alloc (pass);
-     delete ke;
      return TRUE;
  }
-Line 1370 
 int
+Line 1468 
 int
  do_editkey_revuid (winpt_key_t k, HWND dlg, listview_ctrl_t lv)
  {
      gpgme_error_t err;
-     GpgKeyEdit *ke;
+     GpgKeyEdit ke;
-     char buf[256], t[512];
+     char buf[128], email[128];
-     char *pass=NULL;
+     char inf[512];
+     char *pass = NULL;
      int cancel = 0, id = 0, j;
      if (!k->key_pair) {
-         msg_box( dlg, _("There is no secret key available!"), _("Revoke user ID"), MB_ERR );
+         msg_box (dlg, _("There is no secret key available!"),
+                  _("Revoke user ID"), MB_ERR);
          return FALSE;
      }
-     if( listview_count_items( lv, 0 ) == 1 ) {
+     if (listview_count_items (lv, 0) == 1) {
-         msg_box( dlg, _("Key has only one user ID."), _("Key Edit"), MB_ERR );
+         msg_box (dlg, _("Key has only one user ID."), _("Key Edit"), MB_ERR);
          return FALSE;
      }
      if( (j = listview_get_curr_pos( lv )) == -1 ) {
          msg_box( dlg, _("Please select a user ID."), _("Key Edit"), MB_ERR );
          return FALSE;
      }
-     listview_get_item_text( lv, j, 0, buf, sizeof buf - 1 );
+     listview_get_item_text( lv, j, UID_COL_VALID, buf, DIM (buf) - 1);
-     if( strstr( buf, _("Revoked") ) ) {
+     if (strstr (buf, _("Revoked"))) {
-         msg_box( dlg, _("This user ID has been already revoked."), _("Key Edit"), MB_INFO );
+         msg_box (dlg, _("This user ID has been already revoked."),
+                  _("Key Edit"), MB_INFO);
          return FALSE;
      }
-     listview_get_item_text (lv, j, 1, buf, sizeof buf -1);
+     listview_get_item_text (lv, j, UID_COL_NAME, buf, sizeof buf -1);
-     _snprintf( t, sizeof t -1, _("user ID \"%s\".\n\n"
+     _snprintf (inf, DIM (inf) -1, _("user ID \"%s\".\n\n"
-                 "Do you really want to revoke this user ID?"), buf );
+                "Do you really want to revoke this user ID?"), buf);
-     if( msg_box( dlg, t, _("Key Edit"), MB_WARN_ASK) == IDNO )
+     if (msg_box (dlg, inf, _("Key Edit"), MB_WARN_ASK) == IDNO)
          return FALSE;
-     if( k->is_protected ) {
+     if (k->is_protected) {
-         pass = request_passphrase (_("Key Edit"), 1, &cancel);
+         pass = request_key_passphrase (k->ctx, _("Key Edit"), &cancel);
          if (cancel)
              return FALSE;
      }
-     listview_get_item_text (lv, j, 2, buf, sizeof (buf)-1);
+     listview_get_item_text (lv, j, UID_COL_EMAIL, email, DIM (email)-1);
-     id = do_find_userid (k->keyid, buf, NULL);
+     listview_get_item_text (lv, j, UID_COL_NAME, buf, DIM (buf)-1);
+     id = do_find_userid (k->keyid, email, buf, NULL);
      if (id == -1)
          BUG (NULL);
-     ke = new GpgKeyEdit (k->keyid);
+     ke.setKeyID (k->keyid);
-     if (!ke)
-         BUG (NULL);
      if (k->is_protected)
-         ke->setPassphrase (pass);
+         ke.setPassphrase (pass);
-     err = ke->revokeUserid (id);
+     else
+         ke.setNoPassphrase (true);
+     err = ke.revokeUserid (id);
      if (err)
-         msg_box (dlg, gpgme_strerror (err), _("Revoke Signature"), MB_ERR);
+         msg_box (dlg, gpgme_strerror (err), _("Revoke User ID"), MB_ERR);
      else {
          listview_add_sub_item (lv, j, 0, _("Revoked"));
          k->update = 1;
          status_box (dlg, _("User ID successfully revoked"), _("GnuPG Status"));
      }
      sfree_if_alloc (pass);
-     delete ke;
      return err? FALSE : TRUE;
  }
-Line 1433 
 do_editkey_revuid (winpt_key_t k, HWND d
+Line 1534 
 do_editkey_revuid (winpt_key_t k, HWND d
  static int
  do_editkey_setpref (winpt_key_t k, HWND dlg, listview_ctrl_t lv)
  {
-     gpgme_error_t rc;
+     gpgme_error_t err;
-     GpgKeyEdit *ke;
+     GpgKeyEdit ke;
-     char buf[256], * pass = NULL, * prefs;
+     gpg_uid_info_t uidinf = NULL;
-     int j, id, cancel=0, flags=0;
+     char buf[256], *pass = NULL, *prefs = NULL;
+     int pos, id, cancel=0, flags=0;
-     if ((j = listview_get_curr_pos (lv)) == -1) {
+     pos = listview_get_curr_pos (lv);
+     if (pos == -1) {
          msg_box (dlg, _("Please select a user ID."), _("Key Edit"), MB_ERR);
          return FALSE;
      }
-     listview_get_item_text (lv, j, 2, buf, sizeof buf-1);
+     listview_get_item_text (lv, pos, 2, buf, DIM (buf)-1);
-     id = do_find_userid (k->keyid, buf, NULL);
+     id = do_find_userid (k->keyid, buf, NULL, &uidinf);
      if (id == -1)
-         BUG (dlg);
+         BUG (NULL);
      if (k->is_protected) {
-         pass = request_passphrase (_("Key Edit"), 1, &cancel);
+         pass = request_key_passphrase (k->ctx, _("Key Edit"), &cancel);
+         gpg_uid_info_release (uidinf);
          if (cancel)
              return FALSE;
      }
-     ke = new GpgKeyEdit (k->keyid);
+     get_userid_preflist (uidinf->prefs, &prefs, &flags);
-     if (!ke)
+     gpg_uid_info_release (uidinf);
-         BUG (NULL);
+     if (!prefs) {
-     if (k->is_protected)
+         sfree_if_alloc (pass);
-         ke->setPassphrase (pass);
+         return FALSE;
+     }
-     get_userid_preflist (&prefs, &flags);
-     rc = ke->setUseridPreferences (id, prefs);
+     ke.setKeyID (k->keyid);
-     /* XXX */
+     if (k->is_protected)
+         ke.setPassphrase (pass);
+     else
+         ke.setNoPassphrase (true);
+     err = ke.setUseridPreferences (id, prefs);
+     if (err)
+         msg_box (dlg, gpgme_strerror (err), _("Set user ID preferences"), MB_ERR);
+     else {
+         k->update = 1;
+         status_box (dlg, _("User ID preferences successfully updated"), _("GnuPG Status"));
+     }
      sfree_if_alloc (pass);
      free_if_alloc (prefs);
-     delete ke;
+     return err? FALSE: TRUE;
-     return 0;
  }
-Line 1474 
 static int
+Line 1586 
 static int
  do_editkey_primary (winpt_key_t k, HWND dlg, listview_ctrl_t lv)
  {
      gpgme_error_t err;
-     GpgKeyEdit *ke;
+     GpgKeyEdit ke;
      int j, id, cancel=0;
-     char buf[256], * pass = NULL;
+     char valid[32];
+     char buf[256], *pass = NULL;
      if (listview_count_items (lv, 0) == 1)
          return TRUE;
      if ((j = listview_get_curr_pos (lv)) == -1) {
-         msg_box( dlg, _("Please select a user ID."), _("Key Edit"), MB_ERR );
+         msg_box (dlg, _("Please select a user ID."), _("Key Edit"), MB_ERR);
          return FALSE;
      }
-     listview_get_item_text (lv, j, 2, buf, sizeof buf-1);
+     listview_get_item_text (lv, j, UID_COL_VALID, valid, DIM (valid)-1);
-     id = do_find_userid (k->keyid, buf, NULL);
+     if (!strcmp (valid, _("Revoked")))
+         return FALSE;
+     listview_get_item_text (lv, j, UID_COL_EMAIL, buf, DIM (buf)-1);
+     id = do_find_userid (k->keyid, buf, NULL, NULL);
      if (id == -1)
-         BUG (dlg);
+         BUG (NULL);
      if (k->is_protected) {
-         pass = request_passphrase (_("Key Edit"), 1, &cancel);
+         pass = request_key_passphrase (k->ctx, _("Key Edit"), &cancel);
-         if( cancel )
+         if (cancel)
              return FALSE;
      }
-     ke = new GpgKeyEdit (k->keyid);
+     ke.setKeyID (k->keyid);
      if (k->is_protected)
-         ke->setPassphrase (pass);
+         ke.setPassphrase (pass);
-     err = ke->setPrimaryUserid (id);
+     else
+         ke.setNoPassphrase (true);
+     err = ke.setPrimaryUserid (id);
      if (err)
          msg_box (dlg, gpgme_strerror (err), _("Primary"), MB_ERR);
      else {
-Line 1506 
 do_editkey_primary (winpt_key_t k, HWND
+Line 1624 
 do_editkey_primary (winpt_key_t k, HWND
      }
      sfree_if_alloc (pass);
-     delete ke;
      return err? FALSE : TRUE;
  }
+ #define CIPHER  11
+ #define HASH    11
+ #define COMPR    4
  static int
  parse_preflist (HWND dlg, const char *list)
  {
-     char *p, buf[128] = {0}, *pbuf = buf;
+     char buf[128] = {0};
-     const char *ciphers[11] = {0, "IDEA", "3DES", "CAST5", "BLOWFISH", 0, 0, "AES", "AES192", "AES256", "TWOFISH"};
+     char *p, *pbuf = buf;
-     const char *hash[11] = {0, "MD5", "SHA1", "RMD160", 0, 0, 0, 0, "SHA256", "SHA384", "SHA512"};
+     const char *ciphers[CIPHER] = {"", "IDEA", "3DES",
-     const char *compress[4] = {0, "ZIP", "ZLIB", "BZIP2"};
+                                    "CAST5", "BLOWFISH", "", "",
+                                    "AES", "AES192", "AES256", "TWOFISH"};
+     const char *hash[HASH] = {"", "MD5", "SHA1", "RMD160", "",
+                               "", "", "", "SHA256", "SHA384", "SHA512"};
+     const char *compress[COMPR] = {"", "ZIP", "ZLIB", "BZIP2"};
      int n=0;
      strncpy (buf, list, 127);
-Line 1527 
 parse_preflist (HWND dlg, const char *li
+Line 1653 
 parse_preflist (HWND dlg, const char *li
          n++;
          switch (*p) {
          case 'S':
-             SendDlgItemMessage (dlg, IDC_SHOWPREF_CIPHERS, LB_ADDSTRING, 0, (LPARAM)(const char*)ciphers[algid % 11]);
+             SendDlgItemMessage (dlg, IDC_SHOWPREF_CIPHERS, LB_ADDSTRING, 0,
+                                 (LPARAM)(const char*)ciphers[algid % CIPHER]);
              break;
          case 'H':
-             SendDlgItemMessage (dlg, IDC_SHOWPREF_HASH, LB_ADDSTRING, 0, (LPARAM)(const char*)hash[algid % 10]);
+             SendDlgItemMessage (dlg, IDC_SHOWPREF_HASH, LB_ADDSTRING, 0,
+                                 (LPARAM)(const char*)hash[algid % HASH]);
              break;
          case 'Z':
-             SendDlgItemMessage (dlg, IDC_SHOWPREF_ZIP, LB_ADDSTRING, 0, (LPARAM)(const char*)compress[algid % 4]);
+             SendDlgItemMessage (dlg, IDC_SHOWPREF_ZIP, LB_ADDSTRING, 0,
+                                 (LPARAM)(const char*)compress[algid % COMPR]);
              break;
          default:
-Line 1551 
 parse_preflist (HWND dlg, const char *li
+Line 1680 
 parse_preflist (HWND dlg, const char *li
  BOOL CALLBACK
  showpref_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
  {
-     static keyedit_callback_s *cb = NULL;
+     static keyedit_cb_t cb = NULL;
-     gpg_uid_info_t inf=NULL;
+     gpg_uid_info_t inf=NULL, u;
+     gpgme_key_t key;
      char buf[128];
      int pos;
      switch (msg) {
      case WM_INITDIALOG:
-         cb = (keyedit_callback_s *)lparam;
+         cb = (keyedit_cb_t)lparam;
-         if (cb == NULL)
+         if (!cb)
-             BUG (dlg);
+             BUG (NULL);
-         listview_get_item_text (cb->lv, listview_get_curr_pos (cb->lv), 2, buf, DIM (buf)-1);
+         key = (gpgme_key_t)cb->opaque;
-         SetDlgItemText (dlg, IDC_SHOWPREF_INFO, buf);
+         listview_get_item_text (cb->lv, cb->lv_pos,
-         pos = do_find_userid (((winpt_key_t)cb->opaque)->keyid, buf, &inf);
+                                 UID_COL_EMAIL, buf, DIM (buf)-1);
-         if (inf) {
+         pos = do_find_userid (cb->keyid, buf, NULL, &inf);
-             const char *prefs = inf->prefs;
+         if (pos < 0 || !inf) {
-             if (prefs && *prefs) {
-                 if (parse_preflist (dlg, prefs) <= 0)
-                     pos = -1;
-             }
-             else
-                 pos = -1;
              gpg_uid_info_release (inf);
-             if (pos == -1) {
+             EndDialog (dlg, FALSE);
-                 msg_box (dlg, _("No preferences available."), _("Key Edit"), MB_ERR);
+             break;
-                 EndDialog (dlg, TRUE);
+         }
+         for (u=inf; u; u = u->next) {
+             if (u->index == pos && u->prefs && *u->prefs) {
+                 _snprintf (buf, DIM (buf)-1, "%s", u->name);
+                 SetDlgItemText (dlg, IDC_SHOWPREF_INFO, buf);
+                 if (parse_preflist (dlg, u->prefs) <= 0)
+                     pos = -1;
+                 if (u->flags.mdc)
+                     CheckDlgButton (dlg, IDC_SHOWPREF_MDC, BST_CHECKED);
+                 break;
              }
-             if (inf->flags.mdc)
-                 CheckDlgButton (dlg, IDC_SHOWPREF_MDC, BST_CHECKED);
          }
+         gpg_uid_info_release (inf);
+         if (pos == -1) {
+             msg_box (dlg, _("No preferences available."), _("Key Edit"), MB_ERR);
+             EndDialog (dlg, FALSE);
+             break;
+         }
+         SetDlgItemText (dlg, IDC_SHOWPREF_MDC, _("MDC feature"));
+         SetDlgItemText (dlg, IDC_SHOWPREF_PREFINF, _("Preferences"));
+         SetDlgItemText (dlg, IDC_SHOWPREF_UIDHINT, _("user ID:"));
          SetWindowText (dlg, _("Key Preferences"));
          SetForegroundWindow (dlg);
+         center_window (dlg, cb->parent);
          break;
      case WM_COMMAND:
-Line 1589 
 showpref_dlg_proc (HWND dlg, UINT msg, W
+Line 1730 
 showpref_dlg_proc (HWND dlg, UINT msg, W
          case IDOK:
              EndDialog (dlg, TRUE);
              break;
+         case IDCANCEL:
+             EndDialog (dlg, FALSE);
+             break;
          }
          break;
      }
-Line 1599 
 showpref_dlg_proc (HWND dlg, UINT msg, W
+Line 1744 
 showpref_dlg_proc (HWND dlg, UINT msg, W
  static int
  do_editkey_showpref (winpt_key_t k, HWND dlg, listview_ctrl_t lv)
  {
-     struct keyedit_callback_s cb;
+     struct keyedit_cb_s cb;
+     char status[32];
      if (k->is_v3)
          return TRUE;
-Line 1608 
 do_editkey_showpref (winpt_key_t k, HWND
+Line 1754 
 do_editkey_showpref (winpt_key_t k, HWND
          msg_box (dlg, _("Please select a user ID."), _("Key Edit"), MB_ERR);
          return FALSE;
      }
      memset (&cb, 0, sizeof (cb));
+     cb.parent = dlg;
+     cb.opaque = k->ctx;
+     cb.keyid = k->keyid;
      cb.lv = lv;
-     cb.opaque = k;
+     cb.lv_pos = listview_get_curr_pos (lv);
+     listview_get_item_text (lv, cb.lv_pos, UID_COL_VALID,
+                             status, DIM (status)-1);
+     if (!strcmp (status, _("Revoked")))
+         return TRUE;
      DialogBoxParam (glob_hinst, (LPCTSTR)IDD_WINPT_KEYEDIT_SHOWPREF, dlg,
                      showpref_dlg_proc, (LPARAM)&cb);
      return TRUE;
-Line 1622 
 static int
+Line 1776 
 static int
  do_editkey_deluid (winpt_key_t k, HWND dlg, listview_ctrl_t lv)
  {
      gpgme_error_t err;
-     GpgKeyEdit *ke;
+     GpgKeyEdit ke;
-     char buf[256], t[512];
+     char email[128], name[128];
-     int j, id = 0;
+     char inf[384];
+     int pos, id = 0;
      if (!k->key_pair)
-         return FALSE; /* XXX: see do_editkey_delsubkey */
+         return FALSE;
-     if( listview_count_items( lv, 0 ) == 1 ) {
+     if (listview_count_items (lv, 0) == 1) {
-         msg_box( dlg, _("Primary user ID can not be deleted!"), _("Key Edit"), MB_ERR );
+         msg_box (dlg, _("Primary user ID can not be deleted!"),
+                  _("Key Edit"), MB_ERR);
          return FALSE;
      }
-     if( (j = listview_get_curr_pos( lv )) == -1 ) {
+     pos = listview_get_curr_pos (lv);
-         msg_box( dlg, _("Please select a user ID."), _("Key Edit"), MB_ERR );
+     if (pos == -1) {
+         msg_box (dlg, _("Please select a user ID."), _("Key Edit"), MB_ERR);
          return FALSE;
      }
-     /* XXX: add a hint that also all signatures will be deleted? */
+     listview_get_item_text (lv, pos, UID_COL_NAME, name, DIM(name) -1);
-     listview_get_item_text( lv, j, 1, buf, DIM(buf) -1 );
+     _snprintf (inf, DIM (inf)-1, _("user ID \"%s\".\n\n"
-     _snprintf( t, DIM (t)-1, _("user ID \"%s\".\n\n"
+                                    "All signatures on this user ID will be also deleted."
-                                "Do you really want to delete this user ID?"),
+                                    "\n\n"
-                                buf);
+                                    "Do you really want to delete this user ID?"),
-     if( msg_box( dlg, t, _("Key Edit"), MB_YESNO|MB_ICONWARNING ) == IDNO )
+                                name);
+     if (msg_box (dlg, inf, _("Key Edit"), MB_YESNO|MB_ICONWARNING) == IDNO)
          return FALSE;
-     listview_get_item_text (lv, j, 2, buf, DIM (buf)-1);
+     listview_get_item_text (lv, pos, UID_COL_EMAIL, email, DIM (email)-1);
-     id = do_find_userid (k->keyid, buf, NULL);
+     listview_get_item_text (lv, pos, UID_COL_NAME, name, DIM (name)-1);
+     id = do_find_userid (k->keyid, email, name, NULL);
      if (id == -1)
-         BUG (dlg);
-     ke = new GpgKeyEdit (k->keyid);
-     if (!ke)
          BUG (NULL);
-     err = ke->delUserid (id);
+     ke.setKeyID (k->keyid);
-     if( err )
+     err = ke.delUserid (id);
-         msg_box( dlg, gpgme_strerror (err), _("Delete user ID"), MB_ERR );
+     if (err)
+         msg_box (dlg, gpgme_strerror (err), _("Delete User ID"), MB_ERR);
      else {
-         listview_del_item( lv, j );
+         listview_del_item (lv, pos);
          k->update = 1;
-         status_box( dlg, _("User ID successfully deleted"), _("GnuPG Status") );
+         status_box (dlg, _("User ID successfully deleted"), _("GnuPG Status"));
      }
-     delete ke;
      return err? FALSE : TRUE;
- } /* do_editkey_deluid */
+ }
+ /* Subclass routine for the subkey listview control to allow shortcuts. */
  static BOOL CALLBACK
- subkey_subclass_proc( HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam )
+ subkey_subclass_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
  {
-     switch( msg ) {
+     int virt_key = 0;
+     winpt_key_t key;
+     switch (msg) {
      case WM_KEYUP:
-         int virt_key = (int)wparam;
+         virt_key = (int)wparam;
-         switch( virt_key ) {
+         key = (winpt_key_t)keyedit_subkey_proc.opaque;
+         if (!key || !key->key_pair)
+             break;
+         switch (virt_key) {
          case VK_DELETE:
-             SendDlgItemMessage( keyedit_subkey_proc.dlg, IDC_KEYEDIT_CMD,
+             SendDlgItemMessage (keyedit_subkey_proc.dlg, IDC_KEYEDIT_CMD,
-                                 CB_SETCURSEL, CMD_DELKEY, 0 );
+                                 CB_SETCURSEL, CMD_DELKEY, 0);
-             send_cmd_id( keyedit_subkey_proc.dlg, IDOK );
+             send_cmd_id (keyedit_subkey_proc.dlg, IDOK);
              break;
          case VK_INSERT:
-             SendDlgItemMessage( keyedit_subkey_proc.dlg, IDC_KEYEDIT_CMD,
+             SendDlgItemMessage (keyedit_subkey_proc.dlg, IDC_KEYEDIT_CMD,
-                                 CB_SETCURSEL, CMD_ADDKEY, 0 );
+                                 CB_SETCURSEL, CMD_ADDKEY, 0);
-             send_cmd_id( keyedit_subkey_proc.dlg, IDOK );
+             send_cmd_id (keyedit_subkey_proc.dlg, IDOK);
              break;
          }
      }
-     return CallWindowProc( keyedit_subkey_proc.old, dlg, msg, wparam, lparam );
+     return CallWindowProc (keyedit_subkey_proc.old, dlg, msg, wparam, lparam);
- } /* subkey_subclass_proc */
+ }
  static BOOL CALLBACK
  uid_subclass_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
  {
-     switch( msg ) {
+     int virt_key = 0;
+     winpt_key_t key;
+     switch (msg) {
      case WM_KEYUP:
-         int virt_key = (int)wparam;
+         virt_key = (int)wparam;
+         key = (winpt_key_t)keyedit_uid_proc.opaque;
+         if (!key || !key->key_pair)
+             break;
          switch (virt_key) {
          case VK_DELETE:
              SendDlgItemMessage (keyedit_uid_proc.dlg, IDC_KEYEDIT_CMD,
-Line 1713 
 uid_subclass_proc (HWND dlg, UINT msg, W
+Line 1882 
 uid_subclass_proc (HWND dlg, UINT msg, W
              break;
          }
      }
-     return CallWindowProc( keyedit_uid_proc.old, dlg, msg, wparam, lparam );
+     return CallWindowProc (keyedit_uid_proc.old, dlg, msg, wparam, lparam);
- } /* uid_subclass_proc */
+ }
+ /* Enable the key @k when @enable is 1, disable it otherwise. */
+ static void
+ do_editkey_enable_disable (winpt_key_t k, HWND dlg,
+                            listview_ctrl_t lv, int enable)
+ {
+     km_enable_disable_key (lv, dlg, 0, enable);
+     k->update = 1;
+ }
+ static void
+ do_editkey_minimize (winpt_key_t k, HWND dlg)
+ {
+     gpgme_error_t err;
+     GpgKeyEdit ke;
+     ke.setKeyID (k->keyid);
+     err = ke.minimizeKey ();
+     if (err)
+         msg_box (dlg, gpgme_strerror (err), _("Key Edit"), MB_ERR);
+     else {
+         msg_box (dlg, _("Finished to compact key."), _("Key Edit"), MB_OK);
+         k->update = 1;
+     }
+ }
+ static void
+ do_editkey_clean (winpt_key_t k, HWND dlg)
+ {
+     gpgme_error_t err;
+     GpgKeyEdit ke;
+     ke.setKeyID (k->keyid);
+     err = ke.cleanKey ();
+     if (err)
+         msg_box (dlg, gpgme_strerror (err), _("Key Edit"), MB_ERR);
+     else {
+         msg_box (dlg, _("Finished to compact key."), _("Key Edit"), MB_OK);
+         k->update = 1;
+     }
+ }
+ /* Start the dialog to list and display the status of all
+    signatures for this key. */
+ static void
+ do_editkey_check (winpt_key_t k, HWND dlg)
+ {
+     if (!k->ctx)
+         get_pubkey (k->keyid, &k->ctx);
+     if (!k->uid && k->ctx)
+         k->uid = k->ctx->uids->uid;
+     DialogBoxParam (glob_hinst, (LPCTSTR)IDD_WINPT_KEYSIG_TREE, dlg,
+                     sigtree_dlg_proc, (LPARAM)k);
+ }
+ static int
+ do_editkey_sign_userid (winpt_key_t k, HWND dlg, listview_ctrl_t lv, int mode)
+ {
+     gpgme_error_t err;
+     winpt_key_s signer;
+     GpgKeyEdit ke;
+     char *pass = NULL;
+     char *defkey;
+     char email[64], name[128], valid[32];
+     int uid_index;
+     int cancel = 0;
+     uid_index = listview_get_curr_pos (lv);
+     if (uid_index == -1) {
+         msg_box (dlg, _("Please select a user ID."), _("Key Edit"), MB_ERR);
+         return FALSE;
+     }
+     listview_get_item_text (lv, uid_index, UID_COL_VALID, valid, DIM (valid)-1);
+     if (!strcmp (valid, _("Revoked")))
+         return TRUE;
+     if (mode == CMD_SIGN) {
+         cancel = msg_box (dlg, _("Do you really want to make this sig exportable?"),
+                           _("Key Edit"), MB_QUEST_ASK);
+         if (cancel == IDNO)
+             return FALSE;
+     }
+     listview_get_item_text (lv, uid_index, UID_COL_EMAIL, email, DIM (email)-1);
+     listview_get_item_text (lv, uid_index, UID_COL_NAME, name, DIM (name)-1);
+     uid_index = do_find_userid (k->keyid, email, name, NULL);
+     defkey = get_gnupg_default_key ();
+     memset (&signer, 0, sizeof (signer));
+     if (winpt_get_seckey (defkey, &signer)) {
+         log_debug ("do_editkey_sign_userid: no default secret key.\r\n");
+         free_if_alloc (defkey);
+         return FALSE;
+     }
+     if (signer.is_protected) {
+         pass = request_key_passphrase (signer.ctx, _("Key Edit"), &cancel);
+         if (cancel)
+             return FALSE;
+     }
+     ke.setKeyID (k->keyid);
+     if (signer.is_protected)
+         ke.setPassphrase (pass);
+     else
+         ke.setNoPassphrase (true);
+     ke.setLocalUser (signer.ctx);
+     err = ke.signUserid (uid_index,
+                           mode == CMD_SIGN? GPG_EDITKEY_SIGN : GPG_EDITKEY_LSIGN,
+, NULL);
+     if (!err) {
+         msg_box (dlg, _("Key successfully signed."), _("Key Edit"), MB_OK);
+         k->update = 1;
+     }
+     else
+         msg_box (dlg, gpgme_strerror (err), _("Key Edit"), MB_ERR);
+     sfree_if_alloc (pass);
+     return !err? TRUE : FALSE;
+ }
+ static int
+ lookup_cmd (HWND dlg)
+ {
+     char buf[64];
+     int i;
+     i = SendDlgItemMessage (dlg, IDC_KEYEDIT_CMD, CB_GETCURSEL, 0, 0);
+     if (i == LB_ERR)
+         return LB_ERR;
+     GetDlgItemText (dlg, IDC_KEYEDIT_CMD, buf, DIM (buf)-1);
+     for (i=0; cmdlist[i].name != NULL; i++) {
+         if (!strcmp (buf, cmdlist[i].name))
+             return cmdlist[i].id;
+     }
+     return LB_ERR;
+ }
+ gpgme_error_t key_get_revokers (winpt_key_t key, int reload,
+                                 gpg_desig_rev_t *r_rev);
+ /* Check if the key supports designated revokers and if
+     secret keys exist to generate such a revoke cert. */
+ static bool
+ check_desig_rev (winpt_key_t key)
+ {
+     gpg_desig_rev_t rev, u;
+     struct winpt_key_s sk;
+     if (!key->ext->gloflags.has_desig_rev)
+         return false;
+     key_get_revokers (key, 0, &rev);
+     for (u = rev; u; u = u->next) {
+         memset (&sk, 0, sizeof (sk));
+         if (!winpt_get_seckey (u->fpr+32, &sk))
+             return true;
+     }
+     return false;
+ }
+ /* Use the gpg --desig-revoker command to create a revocation
+    cert for a key that lists our key as a designated revoker. */
+ static void
+ gen_desig_revoke_cert (winpt_key_t key, HWND dlg)
+ {
+     const char *warn;
+     char *inf, *p;
+     int id;
+     inf = km_key_get_info (key, 0);
+     warn = _("Your keys is listed as a designated revoker for the key\n\n"
+              "%s\n\n"
+              "Are you sure you want to create a revocation certificate\n"
+              "which allows you to revoke the key listed above?");
+     p = new char[strlen (inf)+1+strlen (warn)+1];
+     sprintf (p, warn, inf);
+     free_if_alloc (inf);
+     id = msg_box (dlg, p, _("Key Edit"), MB_YESNO|MB_ICONWARNING);
+     free_if_alloc (p);
+     if (id == IDNO)
+         return;
+     key->internal = 1;
+     DialogBoxParam (glob_hinst, (LPCTSTR)IDD_WINPT_KEYREVOKE, dlg,
+                     key_revoke_dlg_proc, (LPARAM)key);
+ }
+ /* Create tooltip control for the listview header. */
+ static HWND
+ create_header_tooltip (HWND dlg)
+ {
+     TOOLINFO ti;
+     HWND tt;
+     tt = CreateWindow (TOOLTIPS_CLASS, (LPSTR) NULL, TTS_ALWAYSTIP,
+                         CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
+                         CW_USEDEFAULT,
+                         NULL, (HMENU) NULL, glob_hinst, NULL);
+     if (!tt)
+         BUG (NULL);
+     memset (&ti, 0, sizeof (ti));
+     ti.cbSize = sizeof (TOOLINFO);
+     ti.uFlags = TTF_IDISHWND|TTF_SUBCLASS;
+     ti.hwnd = dlg;
+     ti.uId = (UINT) ListView_GetHeader (GetDlgItem (dlg, IDC_KEYEDIT_KEYLIST));
+     ti.hinst = 0;
+     ti.lpszText = (char*)_("Capabilties: C = Certify, S = Sign, E = Encrypt, A = Authenticate");
+     SendMessage(tt, TTM_ADDTOOL, 0, (LPARAM) (LPTOOLINFO) &ti);
+     return tt;
+ }
+ /* Dialog box procedure for the edit key dialog. */
  BOOL CALLBACK
  keyedit_main_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
  {
      static winpt_key_t k;
      static listview_ctrl_t lvsub = NULL, lvuid = NULL;
-     int cmd, idxsub = 0;
+     static HWND tt;
+     int cmd;
      HWND item;
-     switch( msg ) {
+     switch (msg) {
      case WM_INITDIALOG:
          k = (winpt_key_t)lparam;
          if (!k)
              BUG (NULL);
-         do_init_cmdlist (dlg);
+         do_init_cmdlist (dlg, k->key_pair);
          lvsub = subkey_list_init (dlg, k);
-         if( !lvsub )
-             BUG( NULL );
          lvuid = userid_list_init (dlg, k);
-         if( !lvuid )
+         item = GetDlgItem (dlg, IDC_KEYEDIT_KEYLIST);
-             BUG( NULL );
+         keyedit_subkey_proc.opaque = (void*)k;
-         item = GetDlgItem( dlg, IDC_KEYEDIT_KEYLIST );
          keyedit_subkey_proc.dlg = dlg;
          keyedit_subkey_proc.current = (WNDPROC)subkey_subclass_proc;
-         keyedit_subkey_proc.old = (WNDPROC)GetWindowLong( item, GWL_WNDPROC );
+         keyedit_subkey_proc.old = (WNDPROC)GetWindowLong (item, GWL_WNDPROC);
-         if( keyedit_subkey_proc.old ) {
+         if (keyedit_subkey_proc.old) {
-             if( !SetWindowLong( item, GWL_WNDPROC, (LONG)keyedit_subkey_proc.current ) ) {
+             if (!SetWindowLong (item, GWL_WNDPROC,
-                 msg_box( dlg, _("Could not set subkey window procedure."), _("Key Edit"), MB_ERR );
+                                 (LONG)keyedit_subkey_proc.current)) {
-                 BUG( NULL );
+                 msg_box (dlg, "Could not set subkey window procedure.",
+                          _("Key Edit"), MB_ERR);
+                 BUG (NULL);
              }
          }
-         item = GetDlgItem( dlg, IDC_KEYEDIT_UIDLIST );
+         tt = create_header_tooltip (dlg);
+         item = GetDlgItem (dlg, IDC_KEYEDIT_UIDLIST);
+         keyedit_uid_proc.opaque = (void*)k;
          keyedit_uid_proc.dlg = dlg;
          keyedit_uid_proc.current = (WNDPROC)uid_subclass_proc;
-         keyedit_uid_proc.old = (WNDPROC)GetWindowLong( item, GWL_WNDPROC );
+         keyedit_uid_proc.old = (WNDPROC)GetWindowLong (item, GWL_WNDPROC);
-         if( keyedit_uid_proc.old ) {
+         if (keyedit_uid_proc.old) {
-             if( !SetWindowLong( item, GWL_WNDPROC, (LONG)keyedit_uid_proc.current ) ) {
+             if (!SetWindowLong (item, GWL_WNDPROC,
-                 msg_box( dlg, _("Could not set user ID window procedure."), _("Key Edit"), MB_ERR );
+                                 (LONG)keyedit_uid_proc.current)) {
-                 BUG( NULL );
+                 msg_box (dlg, "Could not set user ID window procedure.",
+                          _("Key Edit"), MB_ERR);
+                 BUG (NULL);
              }
          }
-         if (!k->key_pair) {
+         if (k->ctx->revoked) {
              EnableWindow (GetDlgItem (dlg, IDC_KEYEDIT_CMD), FALSE);
              EnableWindow (GetDlgItem (dlg, IDOK), FALSE);
          }
          SetDlgItemText (dlg, IDC_KEYEDIT_CMDINF, _("Command>"));
          SetDlgItemText (dlg, IDCANCEL, _("&Close"));
          SetDlgItemText (dlg, IDC_KEYEDIT_HELP, _("&Help"));
+         SetDlgItemText (dlg, IDC_KEYEDIT_REVOKE, _("&Revoke..."));
+         SetDlgItemText (dlg, IDOK, _("&OK"));
+         if (!check_desig_rev (k))
+             ShowWindow (GetDlgItem (dlg, IDC_KEYEDIT_REVOKE), SW_HIDE);
          SetWindowText (dlg, _("Key Edit"));
+         SetForegroundWindow (dlg);
-         SetForegroundWindow( dlg );
+         center_window (dlg, NULL);
-         center_window( dlg, NULL );
          return TRUE;
      case WM_DESTROY:
-         if( lvsub ) {
+         if (lvsub) {
-             listview_release( lvsub );
+             listview_release (lvsub);
              lvsub = NULL;
          }
-         if( lvuid ) {
+         if (lvuid) {
-             listview_release( lvuid );
+             listview_release (lvuid);
              lvuid = NULL;
          }
          break;
      case WM_NOTIFY:
-         NMHDR * notify;
+         NMHDR *notify;
          notify = (NMHDR *)lparam;
-         if (notify && notify->code == NM_DBLCLK &&
+         if (!notify || notify->idFrom != IDC_KEYEDIT_UIDLIST)
-             notify->idFrom == IDC_KEYEDIT_UIDLIST)
+             break;
+         if (notify->code == NM_DBLCLK)
              do_editkey_showpref (k, dlg, lvuid);
+         else if (notify->code == NM_RCLICK && k->key_pair) {
+             HMENU hm = LoadMenu (glob_hinst, MAKEINTRESOURCE (IDR_WINPT_KEYEDIT));
+             HMENU popup = GetSubMenu (hm, 0);
+             POINT p;
+             GetCursorPos (&p);
+             TrackPopupMenu (popup, TPM_RIGHTALIGN, p.x, p.y, 0, dlg, NULL);
+             DestroyMenu (hm);
+             DestroyMenu (popup);
+         }
          break;
      case WM_COMMAND:
-         switch( LOWORD( wparam ) ) {
+         switch (LOWORD (wparam)) {
          case IDOK:
-             cmd = SendDlgItemMessage (dlg, IDC_KEYEDIT_CMD, CB_GETCURSEL, 0, 0);
+             cmd = lookup_cmd (dlg);
              if (cmd == LB_ERR) {
                  msg_box( dlg, _("Please select a command."), _("Key Edit"), MB_INFO );
                  return FALSE;
              }
-             idxsub = listview_get_curr_pos (lvsub);
              if (k->is_v3 && is_cmd_openpgp (cmd)) {
                  msg_box (dlg, _("This command cannot be used with PGP 2 (v3) keys.\n"),
                                  _("Key Edit"), MB_ERR);
-Line 1809 
 keyedit_main_dlg_proc (HWND dlg, UINT ms
+Line 2213 
 keyedit_main_dlg_proc (HWND dlg, UINT ms
              case CMD_ADDKEY: keyedit_add_subkey (k, dlg, lvsub); break;
              case CMD_EXPIRE: do_editkey_expire (k, dlg, lvsub); break;
              case CMD_REVKEY: do_editkey_revoke (k, dlg, lvsub); break;
-             /*case CMD_SETPREF:do_editkey_setpref( k, dlg, lvuid ); break;*/
+             case CMD_SETPREF:/*do_editkey_setpref (k, dlg, lvuid);*/ break;
              case CMD_ADDUID: keyedit_add_userid( k, dlg, lvuid ); break;
              case CMD_ADDREVOKER: keyedit_add_revoker( k, dlg ); break;
              case CMD_ADDPHOTO: keyedit_add_photo( k, dlg ); break;
-Line 1817 
 keyedit_main_dlg_proc (HWND dlg, UINT ms
+Line 2221 
 keyedit_main_dlg_proc (HWND dlg, UINT ms
              case CMD_DELUID: do_editkey_deluid( k, dlg, lvuid ); break;
              case CMD_PASSWD: keyedit_change_passwd( k, dlg ); break;
              case CMD_PRIMARY: do_editkey_primary( k, dlg, lvuid ); break;
-             case CMD_ENABLE: km_enable_disable_key( lvsub, dlg, idxsub, 1 ); break;
+             case CMD_ENABLE: do_editkey_enable_disable (k, dlg, lvsub, 1); break;
-             case CMD_DISABLE: km_enable_disable_key( lvsub, dlg, idxsub, 0 ); break;
+             case CMD_DISABLE: do_editkey_enable_disable (k, dlg, lvsub, 0); break;
+             case CMD_CHECK: do_editkey_check (k, dlg); break;
+             case CMD_TRUST: keyedit_change_ownertrust (k, dlg); break;
+             case CMD_SIGN:
+             case CMD_LSIGN: do_editkey_sign_userid (k, dlg,
+                                                     lvuid, cmd);
+                             break;
+             case CMD_CLEAN: do_editkey_clean (k, dlg); break;
+             case CMD_MINIMIZE: do_editkey_minimize (k, dlg); break;
              }
              break;
          case IDCANCEL:
              EndDialog (dlg, FALSE);
-Line 1829 
 keyedit_main_dlg_proc (HWND dlg, UINT ms
+Line 2241 
 keyedit_main_dlg_proc (HWND dlg, UINT ms
          case IDC_KEYEDIT_HELP:
              do_show_help (dlg);
              break;
+         case IDC_KEYEDIT_REVOKE:
+             gen_desig_revoke_cert (k, dlg);
+             break;
+         case ID_KEYEDIT_UID_PRIM:
+             do_editkey_primary (k, dlg, lvuid);
+             break;
+         case ID_KEYEDIT_UID_DEL:
+             do_editkey_deluid (k, dlg, lvuid);
+             break;
+         case ID_KEYEDIT_UID_REV:
+             do_editkey_revuid (k, dlg, lvuid);
+             break;
          }
          break;
      }
      return FALSE;
- } /* keyedit_main_dlg_proc */
+ }

 Legend:



Removed from v.117
 


changed lines


 
Added in v.314
 Legend:



Removed from v.117
 


changed lines


 
Added in v.314
-Removed from v.117
+Added in v.314

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26