/[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 260 by twoaday, Wed Aug 16 10:01:30 2006 UTC revision 297 by twoaday, Sat Mar 17 22:13:40 2007 UTC
# Line 13  Line 13 
13   * but WITHOUT ANY WARRANTY; without even the implied warranty of   * but WITHOUT ANY WARRANTY; without even the implied warranty of
14   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15   * General Public License for more details.   * 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  
16   */   */
   
17  #ifdef HAVE_CONFIG_H  #ifdef HAVE_CONFIG_H
18  #include <config.h>  #include <config.h>
19  #endif  #endif
# Line 40  Line 35 
35  #include "wptAgent.h"  #include "wptAgent.h"
36  #include "wptRegistry.h"  #include "wptRegistry.h"
37  #include "wptUTF8.h"  #include "wptUTF8.h"
38    #include "StringBuffer.h"
39    
40    
41  /* Return the control ID dependent on the mode (sign or decrypt). */  /* Return the control ID dependent on the mode (sign or decrypt). */
# Line 58  static void Line 54  static void
54  burn_passphrase (char **pwd)  burn_passphrase (char **pwd)
55  {  {
56      char *pass = *pwd;      char *pass = *pwd;
57    
58      wipememory (pass, strlen (pass));      wipememory (pass, strlen (pass));
59      delete []pass;      delete []pass;
60      *pwd = NULL;      *pwd = NULL;
# Line 74  passphrase_callback_proc (HWND dlg, UINT Line 71  passphrase_callback_proc (HWND dlg, UINT
71      gpgme_recipient_t recip=NULL, r;      gpgme_recipient_t recip=NULL, r;
72      winpt_key_s key;      winpt_key_s key;
73      void *item;      void *item;
     const char *id;  
     char *info;  
74      int n;      int n;
75    
76      switch (msg) {      switch (msg) {
77      case WM_ACTIVATE:      case WM_ACTIVATE:
78          safe_edit_control_init (dlg, item_ctrl_id (c->gpg_cmd));          /* Some people complained that it is no longer possible to
79               paste in the passphrase in this dialog. When this option
80               is enabled, the ordinary passphrase control will be used. */
81            if (!reg_prefs.no_safe_pwd_ctrl)
82                safe_edit_control_init (dlg, item_ctrl_id (c->gpg_cmd));
83          break;          break;
84    
85      case WM_DESTROY:      case WM_DESTROY:
86          safe_edit_control_free (dlg, item_ctrl_id (c->gpg_cmd));          if (!reg_prefs.no_safe_pwd_ctrl)
87                safe_edit_control_free (dlg, item_ctrl_id (c->gpg_cmd));
88          break;          break;
89    
90      case WM_INITDIALOG:      case WM_INITDIALOG:
# Line 115  passphrase_callback_proc (HWND dlg, UINT Line 115  passphrase_callback_proc (HWND dlg, UINT
115                  recip = res->recipients;                  recip = res->recipients;
116          }          }
117          if (recip != NULL && c->gpg_cmd == GPG_CMD_DECRYPT) {          if (recip != NULL && c->gpg_cmd == GPG_CMD_DECRYPT) {
118                StringBuffer inf;
119    
120              for (r = recip; r; r = r->next) {              for (r = recip; r; r = r->next) {
121                  memset (&key, 0, sizeof (key));                  memset (&key, 0, sizeof (key));
122                  if (!winpt_get_pubkey (r->keyid, &key)) {                  if (!winpt_get_pubkey (r->keyid, &key)) {
123                      gpgme_user_id_t u = key.ctx->uids;                      gpgme_user_id_t u = key.ctx->uids;
124                        
125                      id = u->name;                      inf = (u->name? u->name : _("Invalid User ID"));
126                      if (!id)                      if (u->email != NULL && strlen (u->email) > 1)
127                          id = _("Invalid User ID");                          inf = inf + " <" + u->email + ">";
128                      n = 32+strlen (id)+1+4+strlen (r->keyid)+1;                      inf = inf + " (" + get_key_pubalgo (r->pubkey_algo);
129                      if (u->email)                      inf = inf + ", 0x" + (r->keyid+8) + ")";
                         n += strlen (u->email)+1;  
                     info = new char [n+1];  
                     if (!info)  
                         BUG (NULL);  
                     if (!u->email || strlen (u->email) < 1)  
                         sprintf (info, "%s (%s, 0x%s)", id,  
                                  get_key_pubalgo (r->pubkey_algo), r->keyid+8);  
                     else  
                         sprintf (info, "%s <%s> (%s, 0x%s)", id, u->email,  
                                  get_key_pubalgo (r->pubkey_algo), r->keyid+8);  
130                  }                  }
131                  else {                  else {
132                      info = new char [32 + strlen (r->keyid)+1 + 4];                      inf = _("Unknown key ID");
133                      if (!info)                      inf = inf + " (" + get_key_pubalgo (r->pubkey_algo);
134                          BUG (NULL);                      inf = inf + ", 0x" + (r->keyid+8) + ")";
                     sprintf (info, _("Unknown key ID (%s, 0x%s)"),  
                              get_key_pubalgo (r->pubkey_algo), r->keyid+8);  
135                  }                  }
136                  ListBox_AddString_utf8 (GetDlgItem (dlg, IDC_DECRYPT_LIST), info);                  ListBox_AddString_utf8 (GetDlgItem (dlg, IDC_DECRYPT_LIST),
137                  free_if_alloc (info);                                          inf.getBuffer ());
138                  winpt_release_pubkey (&key);                  winpt_release_pubkey (&key);
139              }              }
140          }          }
# Line 157  passphrase_callback_proc (HWND dlg, UINT Line 147  passphrase_callback_proc (HWND dlg, UINT
147          if (c->gpg_cmd == GPG_CMD_DECRYPT) {          if (c->gpg_cmd == GPG_CMD_DECRYPT) {
148              SetFocus (GetDlgItem (dlg, IDC_DECRYPT_PWD));              SetFocus (GetDlgItem (dlg, IDC_DECRYPT_PWD));
149              if (res && !res->recipients) {              if (res && !res->recipients) {
150                  const char *s = _("Symmetric encryption.\n"                  StringBuffer sinf;
151                                    "%s encrypted data.");  
152                  const char *alg = get_symkey_algo (c->sym.sym_algo);                  sinf = _("Symmetric encryption.");
153                  info = new char[strlen (s) + strlen (alg) + 2];                  sinf = sinf + "\n" + get_symkey_algo (c->sym.sym_algo);
154                  if (!info)                  sinf = sinf + " " + _("encrypted data.");
155                      BUG (NULL);                  SetDlgItemText (dlg, IDC_DECRYPT_MSG, sinf.getBuffer ());
                 sprintf (info, s, alg);  
                 SetDlgItemText (dlg, IDC_DECRYPT_MSG, info);  
                 free_if_alloc (info);  
156              }              }
157              else              else
158                  SetDlgItemText (dlg, IDC_DECRYPT_MSG, c->info);                  SetDlgItemText (dlg, IDC_DECRYPT_MSG, c->info);
# Line 178  passphrase_callback_proc (HWND dlg, UINT Line 165  passphrase_callback_proc (HWND dlg, UINT
165          SetForegroundWindow (dlg);          SetForegroundWindow (dlg);
166          return FALSE;          return FALSE;
167    
         case WM_SYSCOMMAND:  
             if (LOWORD (wparam) == SC_CLOSE) {  
                 c->cancel = 1;  
                 EndDialog (dlg, TRUE);  
             }  
             break;  
   
168          case WM_COMMAND:          case WM_COMMAND:
169              switch (HIWORD (wparam)) {              switch (HIWORD (wparam)) {
170              case BN_CLICKED:              case BN_CLICKED:
# Line 224  passphrase_callback_proc (HWND dlg, UINT Line 204  passphrase_callback_proc (HWND dlg, UINT
204                  }                  }
205                  res = gpgme_op_decrypt_result (c->gpg);                  res = gpgme_op_decrypt_result (c->gpg);
206                  if (!res)                  if (!res)
207                      res_sig = gpgme_op_sign_result (c->gpg);                                  res_sig = gpgme_op_sign_result (c->gpg);
208                  if (!c->is_card && reg_prefs.cache_time > 0 &&                  if (!c->is_card && reg_prefs.cache_time > 0 &&
209                      (res || res_sig)) {                      (res || res_sig)) {
210                      if (agent_get_cache (c->keyid, &item))                      if (agent_get_cache (c->keyid, &item))
# Line 240  passphrase_callback_proc (HWND dlg, UINT Line 220  passphrase_callback_proc (HWND dlg, UINT
220                  SetDlgItemText (dlg, item_ctrl_id (c->gpg_cmd), "");                  SetDlgItemText (dlg, item_ctrl_id (c->gpg_cmd), "");
221                  c->cancel = 1;                  c->cancel = 1;
222                  EndDialog (dlg, FALSE);                  EndDialog (dlg, FALSE);
223                  return FALSE;                  return TRUE;
224              }              }
225              break;              break;
226      }      }
# Line 350  passphrase_cb (void *hook, const char *u Line 330  passphrase_cb (void *hook, const char *u
330      int rc = 0;      int rc = 0;
331    
332      if (!c) {      if (!c) {
333          log_debug ("passphrase_cb: error '!c'\r\n");          log_debug ("passphrase_cb: error no valid callback\r\n");
334          return gpg_error (GPG_ERR_INV_ARG);          return gpg_error (GPG_ERR_INV_ARG);
335      }      }
336      c->bad_pwd = prev_was_bad? 1 : 0;      c->bad_pwd = prev_was_bad? 1 : 0;
# Line 397  passphrase_cb (void *hook, const char *u Line 377  passphrase_cb (void *hook, const char *u
377              const char *s=passphrase_info;              const char *s=passphrase_info;
378              while (s && *s && *s != 'D')              while (s && *s && *s != 'D')
379                  s++;                  s++;
380              _snprintf (c->info, sizeof c->info-1,              _snprintf (c->info, sizeof (c->info)-1,
381                         _("Please enter the PIN to unlock your secret card key\n"                         _("Please enter the PIN to unlock your secret card key\n"
382                           "Card: %s"), extract_serial_no (s));                           "Card: %s"), extract_serial_no (s));
383              c->is_card = 1;              c->is_card = 1;
# Line 418  passphrase_cb (void *hook, const char *u Line 398  passphrase_cb (void *hook, const char *u
398          if (rc == -1) {          if (rc == -1) {
399              if (!WriteFile (hd, "\n", 1, &n, NULL))              if (!WriteFile (hd, "\n", 1, &n, NULL))
400                  log_debug ("passphrase_cb: WriteFile() failed ec=%d\n", w32_errno);                  log_debug ("passphrase_cb: WriteFile() failed ec=%d\n", w32_errno);
401                log_debug ("passphrase_cb: could not create dialog box\n");
402              return 0;              return 0;
403          }          }
404          c->pwd_init = 0;          c->pwd_init = 0;
# Line 487  release_gpg_passphrase_cb (passphrase_cb Line 468  release_gpg_passphrase_cb (passphrase_cb
468  }  }
469    
470    
471  /* Simple check to measure passphrase (@pass) quality.  /* _Simple_ check to measure passphrase (@pass) quality.
472     Return value: 0 on success. */     Return value: 0 on success. */
473  int  int
474  check_passwd_quality (const char *pass, int strict)  check_passwd_quality (const char *pass, int strict)
475  {  {
476      int i, nd=0, nc=0, n;      int i, nd=0, nc=0, n;
477    
478        /* A good passphrase should be at least 8 characters. */
479      n = strlen (pass);      n = strlen (pass);
480      if (n < 8)      if (n < 8)
481          return -1;          return -1;
482    
483      for (i=0; i < n; i++) {      for (i=0; i < n; i++) {
484          if (isdigit (pass[i]))          if (isdigit (pass[i]))
485              nd++;              nd++;
486          if (isalpha (pass[i]))          if (isalpha (pass[i]))
487              nc++;              nc++;
488      }      }
489    
490      /* check that the passphrase contains letters and numbers. */      /* Check that the passphrase contains letters and numbers. */
491      if (nd == n || nc == n)      if (nd == n || nc == n)
492          return -1;          return -1;
493    
Legend:
Removed from v.260  
changed lines
  Added in v.297
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26