logos-messaging/logos-messaging-rust-bindings
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-rust-bindings.git synced 2026-05-23 19:09:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optional signing key on relay a/symmetric publish

Browse Source
This commit is contained in:
Daniel Sanchez Quiros 2022-10-06 17:58:33 +02:00
parent 8673d9953a
commit 12e1cfd486
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
waku/src/node/mod.rs
View File

@ -160,7 +160,7 @@ impl WakuNodeHandle<Running> {
message: &WakuMessage, message: &WakuMessage,
pubsub_topic: Option<WakuPubSubTopic>, pubsub_topic: Option<WakuPubSubTopic>,
public_key: &PublicKey, public_key: &PublicKey,
signing_key: &SecretKey, signing_key: Option<&SecretKey>,
timeout: Duration, timeout: Duration,
) -> Result<MessageId> { ) -> Result<MessageId> {
relay::waku_relay_publish_encrypt_asymmetric( relay::waku_relay_publish_encrypt_asymmetric(
@ -180,7 +180,7 @@ impl WakuNodeHandle<Running> {
message: &WakuMessage, message: &WakuMessage,
pubsub_topic: Option<WakuPubSubTopic>, pubsub_topic: Option<WakuPubSubTopic>,
symmetric_key: &Key<Aes256Gcm>, symmetric_key: &Key<Aes256Gcm>,
signing_key: &SecretKey, signing_key: Option<&SecretKey>,
timeout: Duration, timeout: Duration,
) -> Result<MessageId> { ) -> Result<MessageId> {
relay::waku_relay_publish_encrypt_symmetric( relay::waku_relay_publish_encrypt_symmetric(

12
waku/src/node/relay.rs
View File

@ -107,11 +107,13 @@ pub fn waku_relay_publish_encrypt_asymmetric(
message: &WakuMessage, message: &WakuMessage,
pubsub_topic: Option<WakuPubSubTopic>, pubsub_topic: Option<WakuPubSubTopic>,
public_key: &PublicKey, public_key: &PublicKey,
signing_key: &SecretKey, signing_key: Option<&SecretKey>,
timeout: Duration, timeout: Duration,
) -> Result<MessageId> { ) -> Result<MessageId> {
let pk = hex::encode(public_key.serialize()); let pk = hex::encode(public_key.serialize());
let sk = hex::encode(signing_key.serialize()); let sk = signing_key
.map(|signing_key| hex::encode(signing_key.serialize()))
.unwrap_or_else(String::new);
let pubsub_topic = pubsub_topic let pubsub_topic = pubsub_topic
.unwrap_or_else(waku_dafault_pubsub_topic) .unwrap_or_else(waku_dafault_pubsub_topic)
.to_string(); .to_string();
@ -151,11 +153,13 @@ pub fn waku_relay_publish_encrypt_symmetric(
message: &WakuMessage, message: &WakuMessage,
pubsub_topic: Option<WakuPubSubTopic>, pubsub_topic: Option<WakuPubSubTopic>,
symmetric_key: &Key<Aes256Gcm>, symmetric_key: &Key<Aes256Gcm>,
signing_key: &SecretKey, signing_key: Option<&SecretKey>,
timeout: Duration, timeout: Duration,
) -> Result<MessageId> { ) -> Result<MessageId> {
let symk = hex::encode(symmetric_key.as_slice()); let symk = hex::encode(symmetric_key.as_slice());
let sk = hex::encode(signing_key.serialize()); let sk = signing_key
.map(|signing_key| hex::encode(signing_key.serialize()))
.unwrap_or_else(String::new);
let pubsub_topic = pubsub_topic let pubsub_topic = pubsub_topic
.unwrap_or_else(waku_dafault_pubsub_topic) .unwrap_or_else(waku_dafault_pubsub_topic)
.to_string(); .to_string();