Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-12 11:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #264 from link2xt/key-to_asc-safe

Browse Source 
Make key::to_asc return String
This commit is contained in:
Friedel Ziegelmayer
2019-07-30 09:53:42 +02:00
committed by GitHub
parent e79c168279 3ace4fcc2f
commit dd9b83dc24
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dc_imex.rs
View File

@@ -242,16 +242,16 @@ pub unsafe extern "C" fn dc_render_setup_file(
None
};
if let Some(payload_key_asc) = curr_private_key.map(|k| k.to_asc_c(headers)) {
if let Some(payload_key_asc) = curr_private_key.map(|k| k.to_asc(headers)) {
let payload_key_asc_c = CString::new(payload_key_asc).unwrap();
if let Some(encr) = dc_pgp_symm_encrypt(
passphrase,
payload_key_asc as *const libc::c_void,
strlen(payload_key_asc),
payload_key_asc_c.as_ptr() as *const libc::c_void,
payload_key_asc_c.as_bytes().len(),
) {
let encr_string_c = CString::new(encr).unwrap();
let mut encr_string = strdup(encr_string_c.as_ptr());
free(payload_key_asc as *mut libc::c_void);
let replacement: *mut libc::c_char =
dc_mprintf(b"-----BEGIN PGP MESSAGE-----\r\nPassphrase-Format: numeric9x4\r\nPassphrase-Begin: %s\x00"
as *const u8 as *const libc::c_char,