From d7778a9fbfc91b4d58d6e7b3088efb10c9c43fcf Mon Sep 17 00:00:00 2001 From: Hannes Date: Fri, 14 May 2021 18:42:17 +0200 Subject: [PATCH] Added associated data --- README.md | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 09bbd73..2461a37 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,10 @@ let sk = [1; 32]; // Initial Key let (mut bob_ratchet, public_key) = Ratchet::init_bob(sk); // Creating Bobs Ratchet (returns Bobs PublicKey) let mut alice_ratchet = Ratchet::init_alice(sk, public_key); // Creating Alice Ratchet with Bobs PublicKey let data = b"Hello World".to_vec(); // Data to be encrypted +let ad = b"Associated Data"; // Associated Data -let (header, encrypted, nonce) = alice_ratchet.ratchet_encrypt(&data); // Encrypting message with Alice Ratchet (Alice always needs to send the first message) -let decrypted = bob_ratchet.ratchet_decrypt(&header, &encrypted, &nonce); // Decrypt message with Bobs Ratchet +let (header, encrypted, nonce) = alice_ratchet.ratchet_encrypt(&data, ad); // Encrypting message with Alice Ratchet (Alice always needs to send the first message) +let decrypted = bob_ratchet.ratchet_decrypt(&header, &encrypted, &nonce, ad); // Decrypt message with Bobs Ratchet assert_eq!(data, decrypted) ``` @@ -32,12 +33,13 @@ let sk = [1; 32]; // Initial Key let (mut bob_ratchet, public_key) = Ratchet::init_bob(sk); // Creating Bobs Ratchet (returns Bobs PublicKey) let mut alice_ratchet = Ratchet::init_alice(sk, public_key); // Creating Alice Ratchet with Bobs PublicKey let data = b"Hello World".to_vec(); // Data to be encrypted +let ad = b"Associated Data"; // Associated Data -let (header1, encrypted1, nonce1) = alice_ratchet.ratchet_encrypt(&data); // Lost message -let (header2, encrypted2, nonce2) = alice_ratchet.ratchet_encrypt(&data); // Successful message +let (header1, encrypted1, nonce1) = alice_ratchet.ratchet_encrypt(&data, ad); // Lost message +let (header2, encrypted2, nonce2) = alice_ratchet.ratchet_encrypt(&data, ad); // Successful message -let decrypted2 = bob_ratchet.ratchet_decrypt(&header2, &encrypted2, &nonce2); // Decrypting second message first -let decrypted1 = bob_ratchet.ratchet_decrypt(&header1, &encrypted1, &nonce1); // Decrypting latter message +let decrypted2 = bob_ratchet.ratchet_decrypt(&header2, &encrypted2, &nonce2, ad); // Decrypting second message first +let decrypted1 = bob_ratchet.ratchet_decrypt(&header1, &encrypted1, &nonce1, ad); // Decrypting latter message let comp = decrypted1 == data && decrypted2 == data; assert!(comp); @@ -48,11 +50,11 @@ assert!(comp); ```rust use double_ratchet_2::ratchet::Ratchet; let sk = [1; 32]; - +let ad = b"Associated Data"; let (mut bob_ratchet, _) = Ratchet::init_bob(sk); let data = b"Hello World".to_vec(); -let (_, _, _) = bob_ratchet.ratchet_encrypt(&data); +let (_, _, _) = bob_ratchet.ratchet_encrypt(&data, ad); ``` ### Encryption after recieving initial message @@ -66,12 +68,13 @@ let (mut bob_ratchet, public_key) = Ratchet::init_bob(sk); let mut alice_ratchet = Ratchet::init_alice(sk, public_key); let data = b"Hello World".to_vec(); +let ad = b"Associated Data"; -let (header1, encrypted1, nonce1) = alice_ratchet.ratchet_encrypt(&data); -let _decrypted1 = bob_ratchet.ratchet_decrypt(&header1, &encrypted1, &nonce1); +let (header1, encrypted1, nonce1) = alice_ratchet.ratchet_encrypt(&data, ad); +let _decrypted1 = bob_ratchet.ratchet_decrypt(&header1, &encrypted1, &nonce1, ad); -let (header2, encrypted2, nonce2) = bob_ratchet.ratchet_encrypt(&data); -let decrypted2 = alice_ratchet.ratchet_decrypt(&header2, &encrypted2, &nonce2); +let (header2, encrypted2, nonce2) = bob_ratchet.ratchet_encrypt(&data, ad); +let decrypted2 = alice_ratchet.ratchet_decrypt(&header2, &encrypted2, &nonce2, ad); assert_eq!(data, decrypted2); ``` @@ -94,9 +97,10 @@ let shared_nhkb = [2; 32]; let (mut bob_ratchet, public_key) = RatchetEncHeader::init_bob(sk, shared_hka, shared_nhkb); let mut alice_ratchet = RatchetEncHeader::init_alice(sk, public_key, shared_hka, shared_nhkb); let data = b"Hello World".to_vec(); +let ad = b"Associated Data"; -let (header, encrypted, nonce) = alice_ratchet.ratchet_encrypt(&data); -let decrypted = bob_ratchet.ratchet_decrypt(&header, &encrypted, &nonce); +let (header, encrypted, nonce) = alice_ratchet.ratchet_encrypt(&data, ad); +let decrypted = bob_ratchet.ratchet_decrypt(&header, &encrypted, &nonce, ad); assert_eq!(data, decrypted) ```