/[winpt]/trunk/Src/wptPassphraseCB.cpp
ViewVC logotype

Diff of /trunk/Src/wptPassphraseCB.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 95 by twoaday, Thu Nov 24 12:09:28 2005 UTC revision 205 by twoaday, Thu Apr 27 12:46:03 2006 UTC
# Line 1  Line 1 
1  /* wptPassphraseCB.cpp - GPGME Passphrase Callback  /* wptPassphraseCB.cpp - GPGME Passphrase Callback
2   *      Copyright (C) 2001, 2002, 2003, 2005 Timo Schulz   *      Copyright (C) 2001, 2002, 2003, 2005, 2006 Timo Schulz
3   *      Copyright (C) 2005 g10 Code GmbH   *      Copyright (C) 2005 g10 Code GmbH
4   *   *
5   * This file is part of WinPT.   * This file is part of WinPT.
# Line 34  Line 34 
34  #include "wptCommonCtl.h"  #include "wptCommonCtl.h"
35  #include "wptContext.h"  #include "wptContext.h"
36  #include "wptDlgs.h"  #include "wptDlgs.h"
 #include "wptUTF8.h"  
37  #include "wptErrors.h"  #include "wptErrors.h"
38  #include "wptTypes.h"  #include "wptTypes.h"
39  #include "wptKeylist.h"  #include "wptKeylist.h"
40  #include "wptAgent.h"  #include "wptAgent.h"
41  #include "wptRegistry.h"  #include "wptRegistry.h"
42    #include "wptUTF8.h"
43    
44  const char* get_symkey_algo (int algo);  const char* get_symkey_algo (int algo);
45    
46  #define item_ctrl_id( cmd ) \  #define item_ctrl_id(cmd) \
47      ((cmd) == GPG_CMD_DECRYPT? IDC_DECRYPT_PWD : IDC_DECRYPT_SIGN_PWD)      ((cmd) == GPG_CMD_DECRYPT? IDC_DECRYPT_PWD : IDC_DECRYPT_SIGN_PWD)
48    
49  #define item_ctrl_id2(cmd) \  #define item_ctrl_id2(cmd) \
50      ((cmd) == GPG_CMD_DECRYPT? IDC_DECRYPT_HIDE : IDC_DECRYPT_SIGN_HIDE)      ((cmd) == GPG_CMD_DECRYPT? IDC_DECRYPT_HIDE : IDC_DECRYPT_SIGN_HIDE)
51    
52    
53    void ListBox_AddString_utf8 (HWND lb, const char *txt);
54    
55  /* Overwrite passphrase and free memory. */  /* Overwrite passphrase and free memory. */
56  static void  static void
57  burn_passphrase (char **pwd)  burn_passphrase (char **pwd)
# Line 76  passphrase_callback_proc (HWND dlg, UINT Line 78  passphrase_callback_proc (HWND dlg, UINT
78      int n;      int n;
79    
80      switch (msg) {      switch (msg) {
81        case WM_ACTIVATE:
82            safe_edit_control_init (dlg, item_ctrl_id (c->gpg_cmd));
83            break;
84    
85        case WM_DESTROY:
86            safe_edit_control_free (dlg, item_ctrl_id (c->gpg_cmd));
87            break;
88    
89      case WM_INITDIALOG:      case WM_INITDIALOG:
90          c = (passphrase_cb_s *)lparam;          c = (passphrase_cb_s *)lparam;
91          if (!c)          if (!c)
92              BUG (0);              BUG (0);
93            SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
94          SetDlgItemText (dlg, IDC_DECRYPT_HIDE, _("&Hide Typing"));          SetDlgItemText (dlg, IDC_DECRYPT_HIDE, _("&Hide Typing"));
95          SetWindowText (dlg, c->title);          SetWindowText (dlg, c->title);
96          if (c->gpg_cmd == GPG_CMD_DECRYPT) {          if (c->gpg_cmd == GPG_CMD_DECRYPT) {
# Line 91  passphrase_callback_proc (HWND dlg, UINT Line 102  passphrase_callback_proc (HWND dlg, UINT
102              SetDlgItemText (dlg, IDC_DECRYPT_SIGN_HIDE, _("&Hide Typing"));              SetDlgItemText (dlg, IDC_DECRYPT_SIGN_HIDE, _("&Hide Typing"));
103              CheckDlgButton (dlg, IDC_DECRYPT_SIGN_HIDE, BST_CHECKED);              CheckDlgButton (dlg, IDC_DECRYPT_SIGN_HIDE, BST_CHECKED);
104          }          }
105            /* Because it depends on the order the keys are stored in the
106               keyring whether res->recipients is complete or not, we also
107               support that the recipients were externally extracted and then
108               we use this list. */
109          if (c->recipients)          if (c->recipients)
110              recip = c->recipients; /* recipients were already extracted. */              recip = c->recipients; /* recipients were already extracted. */
111          else {          else {
             /* XXX: not all ENCRYPT_TO entries are listed here. */  
112              res = gpgme_op_decrypt_result (c->gpg);              res = gpgme_op_decrypt_result (c->gpg);
113              if (res && res->recipients)              if (res && res->recipients)
114                  recip = res->recipients;                  recip = res->recipients;
115          }          }
116          if (recip != NULL && c->gpg_cmd == GPG_CMD_DECRYPT) {          if (recip != NULL && c->gpg_cmd == GPG_CMD_DECRYPT) {
117              for (r = res->recipients; r; r = r->next) {              for (r = recip; r; r = r->next) {
118                  get_pubkey (r->keyid, &key);                  get_pubkey (r->keyid, &key);
119                  if (key) {                  if (key) {
120                      char *uid;                      gpgme_user_id_t u = key->uids;
121                      id = key->uids->name;  
122                        id = u->name;
123                      if (!id)                      if (!id)
124                          id = _("Invalid User ID");                          id = _("Invalid User ID");
125                      uid = utf8_to_wincp (id, strlen (id));                      n = 32+strlen (id)+1+4+strlen (r->keyid)+1;
126                      info = new char [32+strlen (uid)+1 + 4 + strlen (r->keyid)+1                      if (u->email)
127                                       + strlen (key->uids->email)+1];                          n += strlen (u->email)+1;
128                        info = new char [n+1];
129                      if (!info)                      if (!info)
130                          BUG (NULL);                          BUG (NULL);
131                      sprintf (info, "%s <%s> (%s, 0x%s)", uid, key->uids->email,                      if (!u->email || strlen (u->email) < 1)
132                               get_key_pubalgo (r->pubkey_algo), r->keyid+8);                          sprintf (info, "%s (%s, 0x%s)", id,
133                      free (uid);                                   get_key_pubalgo (r->pubkey_algo), r->keyid+8);
134                                            else
135                            sprintf (info, "%s <%s> (%s, 0x%s)", id, u->email,
136                                     get_key_pubalgo (r->pubkey_algo), r->keyid+8);
137                  }                  }
138                  else {                  else {
139                      info = new char [32 + strlen (r->keyid)+1 + 4];                      info = new char [32 + strlen (r->keyid)+1 + 4];
# Line 124  passphrase_callback_proc (HWND dlg, UINT Line 142  passphrase_callback_proc (HWND dlg, UINT
142                      sprintf (info, _("Unknown key ID (%s, 0x%s)"),                      sprintf (info, _("Unknown key ID (%s, 0x%s)"),
143                               get_key_pubalgo (r->pubkey_algo), r->keyid+8);                               get_key_pubalgo (r->pubkey_algo), r->keyid+8);
144                  }                  }
145                  listbox_add_string (GetDlgItem (dlg, IDC_DECRYPT_LIST), info);                  ListBox_AddString_utf8 (GetDlgItem (dlg, IDC_DECRYPT_LIST), info);
146                  free_if_alloc (info);                  free_if_alloc (info);
147              }              }
148          }          }
# Line 151  passphrase_callback_proc (HWND dlg, UINT Line 169  passphrase_callback_proc (HWND dlg, UINT
169                  SetDlgItemText (dlg, IDC_DECRYPT_MSG, c->info);                  SetDlgItemText (dlg, IDC_DECRYPT_MSG, c->info);
170          }          }
171          else {          else {
172              SetFocus( GetDlgItem (dlg, IDC_DECRYPT_SIGN_PWD));              SetFocus (GetDlgItem (dlg, IDC_DECRYPT_SIGN_PWD));
173              SetDlgItemText (dlg, IDC_DECRYPT_SIGN_MSG, c->info);              SetDlgItemText (dlg, IDC_DECRYPT_SIGN_MSG, c->info);
174          }          }
175          center_window (dlg, NULL);          center_window (dlg, NULL);
176          SetForegroundWindow (dlg);          SetForegroundWindow (dlg);
         set_active_window (dlg);  
177          return FALSE;          return FALSE;
178    
179          case WM_SYSCOMMAND:          case WM_SYSCOMMAND:
# Line 198  passphrase_callback_proc (HWND dlg, UINT Line 215  passphrase_callback_proc (HWND dlg, UINT
215                      c->pwd = new char[n+2];                      c->pwd = new char[n+2];
216                      if (!c->pwd)                      if (!c->pwd)
217                          BUG (NULL);                          BUG (NULL);
218                      GetDlgItemText (dlg, item_ctrl_id (c->gpg_cmd), c->pwd, n+1);                      SafeGetDlgItemText (dlg, item_ctrl_id (c->gpg_cmd),
219                                            c->pwd, n+1);
220                  }                  }
221                  res = gpgme_op_decrypt_result (c->gpg);                  res = gpgme_op_decrypt_result (c->gpg);
222                  if (!res)                  if (!res)
# Line 257  parse_gpg_description (const char *uid_h Line 275  parse_gpg_description (const char *uid_h
275      gpgme_pubkey_algo_t algo;      gpgme_pubkey_algo_t algo;
276      char usedkey[16+1];      char usedkey[16+1];
277      char mainkey[16+1];      char mainkey[16+1];
278      char *uid, *p;      char *p, *uid;
279      int n=0;      int n=0;
280    
281      algo = (gpgme_pubkey_algo_t)0;      algo = (gpgme_pubkey_algo_t)0;
# Line 278  parse_gpg_description (const char *uid_h Line 296  parse_gpg_description (const char *uid_h
296      uid_hint += 16; /* skip keyid */      uid_hint += 16; /* skip keyid */
297      uid_hint += 1;  /* space */      uid_hint += 1;  /* space */
298    
299      uid = utf8_to_wincp (uid_hint, strlen (uid_hint));      uid = utf8_to_native (uid_hint);
   
300      if (strcmp (usedkey, mainkey))      if (strcmp (usedkey, mainkey))
301          _snprintf (desc, size-1,          _snprintf (desc, size-1,
302                     _("You need a passphrase to unlock the secret key for\n"                     _("You need a passphrase to unlock the secret key for\n"
# Line 292  parse_gpg_description (const char *uid_h Line 309  parse_gpg_description (const char *uid_h
309                       "user: \"%s\"\n"                       "user: \"%s\"\n"
310                       "%s key, ID %s\n"),                       "%s key, ID %s\n"),
311                       uid, get_key_pubalgo (algo), usedkey+8);                       uid, get_key_pubalgo (algo), usedkey+8);
312      free (uid);      safe_free (uid);
313      return 0;      return 0;
314  }  }
315    
# Line 382  passphrase_cb (void *hook, const char *u Line 399  passphrase_cb (void *hook, const char *u
399          }          }
400          else if (uid_hint)          else if (uid_hint)
401              parse_gpg_description (uid_hint, passphrase_info,              parse_gpg_description (uid_hint, passphrase_info,
402                                     c->info, sizeof c->info - 1);                                     c->info, sizeof (c->info) - 1);
403          if (c->gpg_cmd == GPG_CMD_DECRYPT) {          if (c->gpg_cmd == GPG_CMD_DECRYPT) {
404              rc = DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_DECRYPT,              rc = DialogBoxParam (glob_hinst, (LPCSTR)IDD_WINPT_DECRYPT,
405                                   (HWND)c->hwnd, passphrase_callback_proc,                                   (HWND)c->hwnd, passphrase_callback_proc,
Legend:
Removed from v.95  
changed lines
  Added in v.205
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26