logos-messaging/logos-messaging-rust-bindings
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-rust-bindings.git synced 2026-01-04 06:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Free strings on decrypt

Browse Source
This commit is contained in:
Daniel Sanchez Quiros 2023-02-14 13:40:47 +01:00
parent d0d6a97897
commit baeeaf1129
1 changed files with 50 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
waku-bindings/src/decrypt.rs
View File

@ -16,23 +16,33 @@ pub fn waku_decode_symmetric(
symmetric_key: &Key<Aes256Gcm>, symmetric_key: &Key<Aes256Gcm>,
) -> Result<DecodedPayload> { ) -> Result<DecodedPayload> {
let symk = hex::encode(symmetric_key.as_slice()); let symk = hex::encode(symmetric_key.as_slice());
let result = unsafe {
CStr::from_ptr(waku_sys::waku_decode_symmetric( let message_ptr = CString::new(
CString::new( serde_json::to_string(&message)
serde_json::to_string(&message) .expect("WakuMessages should always be able to success serializing"),
.expect("WakuMessages should always be able to success serializing"), )
) .expect("CString should build properly from the serialized waku message")
.expect("CString should build properly from the serialized waku message") .into_raw();
.into_raw(), let symk_ptr = CString::new(symk)
CString::new(symk) .expect("CString should build properly from hex encoded symmetric key")
.expect("CString should build properly from hex encoded symmetric key") .into_raw();
.into_raw(),
)) let result_ptr = unsafe {
} let res = waku_sys::waku_decode_symmetric(message_ptr, symk_ptr);
.to_str() drop(CString::from_raw(message_ptr));
.expect("Response should always succeed to load to a &str"); drop(CString::from_raw(symk_ptr));
res
};
let result = unsafe { CStr::from_ptr(result_ptr) }
.to_str()
.expect("Response should always succeed to load to a &str");
let response: JsonResponse<DecodedPayload> = let response: JsonResponse<DecodedPayload> =
serde_json::from_str(result).map_err(|e| format!("{e}"))?; serde_json::from_str(result).map_err(|e| format!("{e}"))?;
unsafe { waku_sys::waku_utils_free(result_ptr) };
response.into() response.into()
} }
@ -44,22 +54,32 @@ pub fn waku_decode_asymmetric(
asymmetric_key: &SecretKey, asymmetric_key: &SecretKey,
) -> Result<DecodedPayload> { ) -> Result<DecodedPayload> {
let sk = hex::encode(asymmetric_key.secret_bytes()); let sk = hex::encode(asymmetric_key.secret_bytes());
let result = unsafe {
CStr::from_ptr(waku_sys::waku_decode_asymmetric( let message_ptr = CString::new(
CString::new( serde_json::to_string(&message)
serde_json::to_string(&message) .expect("WakuMessages should always be able to success serializing"),
.expect("WakuMessages should always be able to success serializing"), )
) .expect("CString should build properly from the serialized waku message")
.expect("CString should build properly from the serialized waku message") .into_raw();
.into_raw(), let sk_ptr = CString::new(sk)
CString::new(sk) .expect("CString should build properly from hex encoded symmetric key")
.expect("CString should build properly from hex encoded symmetric key") .into_raw();
.into_raw(),
)) let result_ptr = unsafe {
} let res = waku_sys::waku_decode_asymmetric(message_ptr, sk_ptr);
.to_str() drop(CString::from_raw(message_ptr));
.expect("Response should always succeed to load to a &str"); drop(CString::from_raw(sk_ptr));
res
};
let result = unsafe { CStr::from_ptr(result_ptr) }
.to_str()
.expect("Response should always succeed to load to a &str");
let response: JsonResponse<DecodedPayload> = let response: JsonResponse<DecodedPayload> =
serde_json::from_str(result).map_err(|e| format!("{e}"))?; serde_json::from_str(result).map_err(|e| format!("{e}"))?;
unsafe { waku_sys::waku_utils_free(result_ptr) };
response.into() response.into()
} }