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

Diff of /trunk/Src/wptFileManager.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 69 by twoaday, Sat Nov 5 12:28:12 2005 UTC
# Line 50  Line 50 
50  #include "wptUTF8.h"  #include "wptUTF8.h"
51  #include "wptRegistry.h"  #include "wptRegistry.h"
52  #include "wptImport.h"  #include "wptImport.h"
53    #include "wptCrypto.h"
54    
55  #include "openpgp.h"  #include "openpgp.h"
56    
# Line 281  fm_get_file_type (const char *fname, int Line 282  fm_get_file_type (const char *fname, int
282      armor_filter_context_t afx;      armor_filter_context_t afx;
283      PACKET *pkt;      PACKET *pkt;
284      const char *s = NULL;      const char *s = NULL;
285      int i = 0, rc = 0;      int rc=0;
286    
287      if (r_type)      if (r_type)
288          *r_type = PGP_NONE;          *r_type = PGP_NONE;
# Line 338  fm_get_file_type (const char *fname, int Line 339  fm_get_file_type (const char *fname, int
339              s = "SECKEY";   rc = -2;              s = "SECKEY";   rc = -2;
340              if (r_type) *r_type = PGP_SECKEY;              if (r_type) *r_type = PGP_SECKEY;
341              break;              break;
342                
343            default:
344                break;
345          }          }
346          gpg_free_packet (pkt);          gpg_free_packet (pkt);
347          gpg_init_packet (pkt);          gpg_init_packet (pkt);
# Line 500  int Line 504  int
504  fm_add_dropped_files (listview_ctrl_t lv, HDROP dd_files)  fm_add_dropped_files (listview_ctrl_t lv, HDROP dd_files)
505  {  {
506      char name[384+4];      char name[384+4];
507      int nfiles, rc, i;      int nfiles, i;
508        int rc=0;
509            
510      memset (name, 0, sizeof (name));      memset (name, 0, sizeof (name));
511      nfiles = DragQueryFile (dd_files, 0xFFFFFFFF, NULL, 0);      nfiles = DragQueryFile (dd_files, 0xFFFFFFFF, NULL, 0);
# Line 1012  fm_encrypt (fm_state_t c, const char *na Line 1017  fm_encrypt (fm_state_t c, const char *na
1017      gpgme_ctx_t ctx = c->ctx;      gpgme_ctx_t ctx = c->ctx;
1018      file_data_t in=NULL, out=NULL;      file_data_t in=NULL, out=NULL;
1019      char *keyid = NULL, ext[5];      char *keyid = NULL, ext[5];
1020      int no_compr = 0;      /*int no_compr = 0;*/
1021      int rc = 0;      int rc = 0;
1022    
1023      c->output = new char[strlen (name) + 5 + 1];      c->output = new char[strlen (name) + 5 + 1];
# Line 1122  fm_sym_encrypt (fm_state_t c, const char Line 1127  fm_sym_encrypt (fm_state_t c, const char
1127      gpgme_error_t err;          gpgme_error_t err;    
1128      file_data_t in=NULL, out=NULL;      file_data_t in=NULL, out=NULL;
1129      int rc = 0, cancel = 0;      int rc = 0, cancel = 0;
     char * src = NULL, * dst = NULL;  
1130      char ext[5], * pass;          char ext[5], * pass;    
1131            
1132      pass = request_passphrase2 (_("Symmetric"), 0, &cancel);      pass = request_passphrase2 (_("Symmetric"), 0, &cancel);
# Line 1233  fm_decrypt (fm_state_t c, const char *na Line 1237  fm_decrypt (fm_state_t c, const char *na
1237      gpgme_decrypt_result_t res;      gpgme_decrypt_result_t res;
1238      gpgme_verify_result_t sigres;      gpgme_verify_result_t sigres;
1239      file_data_t in =NULL, out=NULL;      file_data_t in =NULL, out=NULL;
     int is_signed = 0;  
1240      int rc = 0;      int rc = 0;
1241            
1242      if (!c->init_cb || !c->cache_cb) {      if (!c->init_cb || !c->cache_cb) {
# Line 1386  fm_add_sig_stat (file_sig_ctx_t log) Line 1389  fm_add_sig_stat (file_sig_ctx_t log)
1389  {  {
1390      gpgme_key_t key;          gpgme_key_t key;    
1391      const char *kid;      const char *kid;
     int not_found = 0;  
1392    
1393      kid = log->sig->fpr;      kid = log->sig->fpr;
1394      if (!kid)      if (!kid)
# Line 1639  leave: Line 1641  leave:
1641  int  int
1642  fm_export (fm_state_t c)  fm_export (fm_state_t c)
1643  {  {
1644      int rc = 0, id = 0;      int rc = 0;
1645      gpgme_ctx_t ctx = c->ctx;      gpgme_ctx_t ctx = c->ctx;
1646      gpgme_error_t err;      gpgme_error_t err;
1647      gpgme_key_t *rset = c->recp;      gpgme_key_t *rset = c->recp;
1648      file_data_t keydata = NULL;      file_data_t keydata = NULL;
1649      const char *name, *s = NULL;      const char *name;
1650      char *p = NULL, *patt = NULL;      char *p = NULL, *patt = NULL;
1651    
1652      if (!rset || !rset[0]) {      if (!rset || !rset[0]) {
Legend:
Removed from v.47  
changed lines
  Added in v.69
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26