mirrors/rage
1
0
Fork 0
mirror of https://github.com/str4d/rage.git synced 2025-04-03 19:07:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

chacha20poly1305 0.9

Browse source 
We switch from the c2-chacha crate to the chacha20 crate, as the latter
is now close to equivalent performance (equivalent when compiled with
`RUSTFLAGS="-Ctarget-feature=+avx2"`), and is no longer optional
upstream.
This commit is contained in:
Jack Grigg 2021-08-29 16:57:31 +01:00
parent f123517855
commit d332c31437
7 changed files with 81 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

3
age-core/Cargo.toml
View file

@ -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.9", default-features = false, features = ["alloc"] }
# - HKDF from RFC 5869 with SHA-256
hkdf = "0.11"

10
age-core/src/primitives.rs
View file

@ -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)
}