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

Diff of /trunk/Src/wptMAPI.cpp

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

revision 24 by twoaday, Sat Oct 8 10:43:08 2005 UTC revision 27 by twoaday, Tue Oct 18 07:57:13 2005 UTC
# Line 244  secure_attachment (gpgme_recipients_t rs Line 244  secure_attachment (gpgme_recipients_t rs
244  } /* secure_attachment */  } /* secure_attachment */
245    
246    
247  static char *  static gpgme_error_t
248  secure_message (gpgme_recipients_t rset, const char * data)  secure_message (gpgme_recipients_t rset, const char *data,
249                    char *enc_msg, size_t *r_enclen)
250  {  {
251      gpgme_recipients_t addrs;      gpgme_recipients_t addrs;
252      gpgme_error_t rc;      gpgme_error_t rc;
# Line 263  secure_message (gpgme_recipients_t rset, Line 264  secure_message (gpgme_recipients_t rset,
264      rc = gpgme_data_new_from_mem (&in, data, strlen (data), 1);      rc = gpgme_data_new_from_mem (&in, data, strlen (data), 1);
265      if (rc) {      if (rc) {
266          gpgme_release (ctx);          gpgme_release (ctx);
267          return NULL;          return rc;
268      }      }
269      gpgme_data_new (&out);      gpgme_data_new (&out);
270      rc = gpgme_op_encrypt (ctx, addrs, GPGME_ENCRYPT_ALWAYS_TRUST, in, out);      rc = gpgme_op_encrypt (ctx, addrs, GPGME_ENCRYPT_ALWAYS_TRUST, in, out);
271      if (rc)      if (rc)
272          log_box (_("Secure Message"), MB_ERR, "Could not encrypt the data");          log_box (_("Secure Message"), MB_ERR, "Could not encrypt the data");
273    
274      p = gpgme_data_release_and_get_mem (&n);      *r_enc_msg = gpgme_data_release_and_get_mem (&n);
275      p[n] = 0;      *r_enclen = n;
276    
277      gpgme_data_release (in);      gpgme_data_release (in);
278      gpgme_release (ctx);      gpgme_release (ctx);
279      gpgme_recipients_release (addrs);      gpgme_recipients_release (addrs);
280    
281      return p;      return rc;
282  } /* secure_message */  } /* secure_message */
283    
284    
# Line 292  mapi_send_message (gpgme_recipients_t rs Line 293  mapi_send_message (gpgme_recipients_t rs
293      char * p;      char * p;
294      const char * s;      const char * s;
295      void * ctx=NULL;      void * ctx=NULL;
296      size_t n, i=0;      size_t n, i=0, encmsg_len=0;
297      int rc;      int rc;
298    
299      if (!init)      if (!init)
# Line 310  mapi_send_message (gpgme_recipients_t rs Line 311  mapi_send_message (gpgme_recipients_t rs
311      p = msg->lpszSubject = strdup (subject);      p = msg->lpszSubject = strdup (subject);
312      if (!p)      if (!p)
313          BUG (0);          BUG (0);
314      p = msg->lpszNoteText = secure_message (rset, msgtxt);      p = msg->lpszNoteText = secure_message (rset, msgtxt, &p, &encmsg_len);
315      if (!p)      if (!p)
316          BUG (0);          BUG (0);
317      n = msg->nRecipCount = gpgme_recipients_count (rset);      n = msg->nRecipCount = gpgme_recipients_count (rset);
# Line 357  mapi_send_message (gpgme_recipients_t rs Line 358  mapi_send_message (gpgme_recipients_t rs
358      free_recip_tab (recip, n);      free_recip_tab (recip, n);
359      free_files_tab (attch, nfiles);      free_files_tab (attch, nfiles);
360      free_mapi_msg (msg);      free_mapi_msg (msg);
361        gpgme_free (p);
362      mapi_logoff (hd, 0, 0, 0);      mapi_logoff (hd, 0, 0, 0);
363    
364      return 0;      return 0;
# Line 366  mapi_send_message (gpgme_recipients_t rs Line 368  mapi_send_message (gpgme_recipients_t rs
368  static int  static int
369  add_recipient (gpgme_recipients_t * r_rset, const char * addr)  add_recipient (gpgme_recipients_t * r_rset, const char * addr)
370  {  {
371      gpgme_keycache_t pub = keycache_get_ctx (1);      gpg_keycache_t pub = keycache_get_ctx (1);
372      gpgme_key_t key;      gpgme_key_t key;
373      gpgme_error_t rc;      gpgme_error_t rc;
374      const char * s;      const char * s;
Legend:
Removed from v.24  
changed lines
  Added in v.27
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26