chacha20poly1305 0.8

We switch from the c2-chacha crate to the chacha20 crate for trait compatibility.
str4d · Aug 8, 2021 · e10257f · e10257f
1 parent 8d02ba2
commit e10257f
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 55 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/age-core/Cargo.toml b/age-core/Cargo.toml
@@ -17,8 +17,7 @@ maintenance = { status = "experimental" }
 base64 = "0.13"
 
 # - ChaCha20-Poly1305 from RFC 7539
-c2-chacha = "0.3"
-chacha20poly1305 = { version = "0.7", default-features = false, features = ["alloc"] }
+chacha20poly1305 = { version = "0.8", default-features = false, features = ["alloc", "chacha20"] }
 
 # - HKDF from RFC 5869 with SHA-256
 hkdf = "0.11"

diff --git a/age-core/src/primitives.rs b/age-core/src/primitives.rs
@@ -1,8 +1,8 @@
 //! Primitive cryptographic operations used across various `age` components.
 
 use chacha20poly1305::{
-    aead::{self, generic_array::typenum::Unsigned, Aead, NewAead},
-    ChaChaPoly1305,
+    aead::{self, generic_array::typenum::Unsigned, Aead, AeadCore, NewAead},
+    ChaCha20Poly1305,
 };
 use hkdf::Hkdf;
 use sha2::Sha256;
@@ -13,7 +13,7 @@ use sha2::Sha256;
 ///
 /// [RFC 7539]: https://tools.ietf.org/html/rfc7539
 pub fn aead_encrypt(key: &[u8; 32], plaintext: &[u8]) -> Vec<u8> {
-    let c = ChaChaPoly1305::<c2_chacha::Ietf>::new(key.into());
+    let c = ChaCha20Poly1305::new(key.into());
     c.encrypt(&[0; 12].into(), plaintext)
         .expect("we won't overflow the ChaCha20 block counter")
 }
@@ -32,11 +32,11 @@ pub fn aead_decrypt(
     size: usize,
     ciphertext: &[u8],
 ) -> Result<Vec<u8>, aead::Error> {
-    if ciphertext.len() != size + <ChaChaPoly1305<c2_chacha::Ietf> as Aead>::TagSize::to_usize() {
+    if ciphertext.len() != size + <ChaCha20Poly1305 as AeadCore>::TagSize::to_usize() {
         return Err(aead::Error);
     }
 
-    let c = ChaChaPoly1305::<c2_chacha::Ietf>::new(key.into());
+    let c = ChaCha20Poly1305::new(key.into());
     c.decrypt(&[0; 12].into(), ciphertext)
 }
 

diff --git a/age/Cargo.toml b/age/Cargo.toml
@@ -21,8 +21,7 @@ age-core = { version = "0.6.0", path = "../age-core" }
 base64 = "0.13"
 
 # - ChaCha20-Poly1305 from RFC 7539
-c2-chacha = "0.3"
-chacha20poly1305 = { version = "0.7", default-features = false, features = ["alloc"] }
+chacha20poly1305 = { version = "0.8", default-features = false, features = ["alloc", "chacha20"] }
 
 # - X25519 from RFC 7748
 x25519-dalek = "1"

diff --git a/age/src/primitives/stream.rs b/age/src/primitives/stream.rs
@@ -2,7 +2,7 @@
 
 use chacha20poly1305::{
     aead::{generic_array::GenericArray, Aead, NewAead},
-    ChaChaPoly1305,
+    ChaCha20Poly1305,
 };
 use pin_project::pin_project;
 use secrecy::{ExposeSecret, SecretVec};
@@ -24,9 +24,7 @@ const CHUNK_SIZE: usize = 64 * 1024;
 const TAG_SIZE: usize = 16;
 const ENCRYPTED_CHUNK_SIZE: usize = CHUNK_SIZE + TAG_SIZE;
 
-pub(crate) struct PayloadKey(
-    pub(crate) GenericArray<u8, <ChaChaPoly1305<c2_chacha::Ietf> as NewAead>::KeySize>,
-);
+pub(crate) struct PayloadKey(pub(crate) GenericArray<u8, <ChaCha20Poly1305 as NewAead>::KeySize>);
 
 impl Drop for PayloadKey {
     fn drop(&mut self) {
@@ -89,14 +87,14 @@ struct EncryptedChunk {
 ///
 /// [STREAM]: https://eprint.iacr.org/2015/189.pdf
 pub(crate) struct Stream {
-    aead: ChaChaPoly1305<c2_chacha::Ietf>,
+    aead: ChaCha20Poly1305,
     nonce: Nonce,
 }
 
 impl Stream {
     fn new(key: PayloadKey) -> Self {
         Stream {
-            aead: ChaChaPoly1305::new(&key.0),
+            aead: ChaCha20Poly1305::new(&key.0),
             nonce: Nonce::default(),
         }
     }