/[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 47 by werner, Mon Oct 31 14:04:59 2005 UTC revision 95 by twoaday, Thu Nov 24 12:09:28 2005 UTC
# Line 24  Line 24 
24  #endif  #endif
25    
26  #include <windows.h>  #include <windows.h>
 #include <windows.h>  
27  #include <ctype.h>  #include <ctype.h>
28    
29  #include "resource.h"  #include "resource.h"
# Line 38  Line 37 
37  #include "wptUTF8.h"  #include "wptUTF8.h"
38  #include "wptErrors.h"  #include "wptErrors.h"
39  #include "wptTypes.h"  #include "wptTypes.h"
40  #include "wptKeyList.h"  #include "wptKeylist.h"
41  #include "wptAgent.h"  #include "wptAgent.h"
42  #include "wptRegistry.h"  #include "wptRegistry.h"
43    
# Line 66  burn_passphrase (char **pwd) Line 65  burn_passphrase (char **pwd)
65  static BOOL CALLBACK  static BOOL CALLBACK
66  passphrase_callback_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)  passphrase_callback_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
67  {      {    
68      static passphrase_cb_s * c;      static passphrase_cb_s *c;
69      gpgme_decrypt_result_t res;      gpgme_decrypt_result_t res=NULL;
70      gpgme_sign_result_t res_sig;      gpgme_sign_result_t res_sig=NULL;
71      gpgme_key_t key;      gpgme_key_t key;
72      gpgme_recipient_t recip, r;      gpgme_recipient_t recip=NULL, r;
73      void *ctx = NULL, *item;      void *item;
74      const char *id;      const char *id;
75      char *info;      char *info;
76      int n;      int n;
# Line 81  passphrase_callback_proc (HWND dlg, UINT Line 80  passphrase_callback_proc (HWND dlg, UINT
80          c = (passphrase_cb_s *)lparam;          c = (passphrase_cb_s *)lparam;
81          if (!c)          if (!c)
82              BUG (0);              BUG (0);
83            SetDlgItemText (dlg, IDC_DECRYPT_HIDE, _("&Hide Typing"));
84          SetWindowText (dlg, c->title);          SetWindowText (dlg, c->title);
85          if (c->gpg_cmd == GPG_CMD_DECRYPT) {          if (c->gpg_cmd == GPG_CMD_DECRYPT) {
86              SetDlgItemText (dlg, IDC_DECRYPT_LISTINF,              SetDlgItemText (dlg, IDC_DECRYPT_LISTINF,
87                              _("Encrypted with the following public key(s)"));                              _("Encrypted with the following public key(s)"));
88              CheckDlgButton (dlg, IDC_DECRYPT_HIDE, BST_CHECKED);              CheckDlgButton (dlg, IDC_DECRYPT_HIDE, BST_CHECKED);
89          }          }
90          else if (c->gpg_cmd == GPG_CMD_SIGN)          else if (c->gpg_cmd == GPG_CMD_SIGN) {
91                SetDlgItemText (dlg, IDC_DECRYPT_SIGN_HIDE, _("&Hide Typing"));
92              CheckDlgButton (dlg, IDC_DECRYPT_SIGN_HIDE, BST_CHECKED);              CheckDlgButton (dlg, IDC_DECRYPT_SIGN_HIDE, BST_CHECKED);
93            }
94          if (c->recipients)          if (c->recipients)
95              recip = c->recipients; /* recipients were already extracted. */              recip = c->recipients; /* recipients were already extracted. */
96          else {          else {
# Line 200  passphrase_callback_proc (HWND dlg, UINT Line 202  passphrase_callback_proc (HWND dlg, UINT
202                  }                  }
203                  res = gpgme_op_decrypt_result (c->gpg);                  res = gpgme_op_decrypt_result (c->gpg);
204                  if (!res)                  if (!res)
205                      res_sig = gpgme_op_sign_result (c->gpg);                      res_sig = gpgme_op_sign_result (c->gpg);            
206                  if (reg_prefs.cache_time > 0 && !c->is_card &&                  if (reg_prefs.cache_time > 0 && !c->is_card &&
207                      ((res && res->recipients) || (res_sig && res_sig->signatures))) {                      (res || res_sig)) {
208                      if (agent_get_cache (c->keyid, &item))                      if (agent_get_cache (c->keyid, &item))                      
209                          agent_unlock_cache_entry (&item);                          agent_unlock_cache_entry (&item);
210                      else                      else
211                          agent_put_cache (c->keyid, c->pwd, reg_prefs.cache_time);                          agent_put_cache (c->keyid, c->pwd, reg_prefs.cache_time);
212                  }                  }
213                  c->cancel = 0;                  c->cancel = 0;
# Line 233  parse_gpg_keyid (const char *pass_info) Line 235  parse_gpg_keyid (const char *pass_info)
235      static char keyid[16+1];      static char keyid[16+1];
236            
237      /* XXX: check for leading alpha-chars? */      /* XXX: check for leading alpha-chars? */
238      if (strlen (pass_info) < 16)      if (strlen (pass_info) < 16) {
239            log_debug ("parse_gpg_keyid: error '%s'\r\n", pass_info);
240          return NULL;          return NULL;
241        }
242      /* the format of the desc buffer looks like this:      /* the format of the desc buffer looks like this:
243         request_keyid[16] main_keyid[16] keytype[1] keylength[4]         request_keyid[16] main_keyid[16] keytype[1] keylength[4]
244         we use the main keyid to use only one cache entry. */         we use the main keyid to use only one cache entry. */
# Line 256  parse_gpg_description (const char *uid_h Line 260  parse_gpg_description (const char *uid_h
260      char *uid, *p;      char *uid, *p;
261      int n=0;      int n=0;
262    
263        algo = (gpgme_pubkey_algo_t)0;
264      /* Each uid_hint contains a long key-ID so it is at least 16 bytes. */      /* Each uid_hint contains a long key-ID so it is at least 16 bytes. */
265      if (strlen (uid_hint) < 17) {      if (strlen (uid_hint) < 17) {
266          *desc = 0;          *desc = 0;
267            log_debug ("parse_gpg_description: error '%s'\r\n", uid_hint);
268          return -1;          return -1;
269      }      }
270    
# Line 299  extract_serial_no (const char *id) Line 305  extract_serial_no (const char *id)
305      char *p;      char *p;
306    
307      p = strchr (id, '/');      p = strchr (id, '/');
308      if (!p)      if (!p) {
309            log_debug ("extract_serial_no: error '%s'\r\n", id);
310          return NULL;          return NULL;
311        }
312      strncpy (buf, id+(p-id)-6, 6);      strncpy (buf, id+(p-id)-6, 6);
313      return buf;      return buf;
314  }  }
# Line 315  passphrase_cb (void *hook, const char *u Line 323  passphrase_cb (void *hook, const char *u
323      passphrase_cb_s *c = (passphrase_cb_s*)hook;      passphrase_cb_s *c = (passphrase_cb_s*)hook;
324      HANDLE hd = (HANDLE)fd;      HANDLE hd = (HANDLE)fd;
325      void *item;      void *item;
326      const char *keyid, *pass;      const char *keyid=NULL, *pass;
327      DWORD n;      DWORD n;
328      int rc;      int rc = 0;
329    
330      if (!c)      if (!c) {
331            log_debug ("passphrase_cb: error '!c'\r\n");
332          return gpg_error (GPG_ERR_INV_ARG);          return gpg_error (GPG_ERR_INV_ARG);
333        }
334      c->bad_pwd = prev_was_bad? 1 : 0;      c->bad_pwd = prev_was_bad? 1 : 0;
335      if (prev_was_bad && !c->cancel) {      if (prev_was_bad && !c->cancel) {
336          if (c->pwd)          if (c->pwd)
# Line 333  passphrase_cb (void *hook, const char *u Line 343  passphrase_cb (void *hook, const char *u
343          if (strlen (passphrase_info) < 16 &&          if (strlen (passphrase_info) < 16 &&
344              !strstr (passphrase_info, "OPENPGP")) {              !strstr (passphrase_info, "OPENPGP")) {
345              /* assume symetric encryption. */              /* assume symetric encryption. */
346              int n=2;              int pos=2;
347              c->sym.sym_algo = atoi (passphrase_info);              c->sym.sym_algo = atoi (passphrase_info);
348              if (c->sym.sym_algo > 9)              if (c->sym.sym_algo > 9)
349                  n++;                  pos++;
350              /* XXX: be more strict. */              /* XXX: be more strict. */
351              c->sym.s2k_mode = atoi (passphrase_info+n);              c->sym.s2k_mode = atoi (passphrase_info+pos);
352              c->sym.s2k_hash = atoi (passphrase_info+n+2);              c->sym.s2k_hash = atoi (passphrase_info+pos+2);
353          }          }
354    
355          keyid = parse_gpg_keyid (passphrase_info);          keyid = parse_gpg_keyid (passphrase_info);
356          pass = agent_get_cache (keyid+8, &item);          pass = agent_get_cache (keyid+8, &item);        
357          if (pass) {          if (pass) {
358              agent_unlock_cache_entry (&item);              agent_unlock_cache_entry (&item);
359              c->pwd_init = 0;              c->pwd_init = 0;
# Line 396  passphrase_cb (void *hook, const char *u Line 406  passphrase_cb (void *hook, const char *u
406          return 0;          return 0;
407      }      }
408    
409      WriteFile (hd, c->pwd, strlen (c->pwd), &n, NULL);      if (!WriteFile (hd, c->pwd, strlen (c->pwd), &n, NULL))
410      WriteFile (hd, "\n", 1, &n, NULL);          log_debug ("passphrase_cb: WriteFile() failed ec=%d\n", w32_errno);
411        if (!WriteFile (hd, "\n", 1, &n, NULL))
412            log_debug ("passphrase_cb: WriteFile() failed ec=%d\n", w32_errno);
413      return 0;      return 0;
414  }  }
415    
Legend:
Removed from v.47  
changed lines
  Added in v.95
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26