Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ChaCha20Poly1305 AEAD #3

Merged
merged 2 commits into from
Aug 21, 2019
Merged

ChaCha20Poly1305 AEAD #3

merged 2 commits into from
Aug 21, 2019

Conversation

tarcieri
Copy link
Member

Implements the ChaCha20Poly1305 AEAD described in RFC 8439 using the chacha20 and poly1305 crates.

@tarcieri tarcieri requested a review from newpavlov August 19, 2019 17:19
@tarcieri tarcieri force-pushed the chacha20poly1305 branch 2 times, most recently from 98ec721 to 7925b28 Compare August 19, 2019 18:45
@tarcieri tarcieri marked this pull request as ready for review August 19, 2019 18:54
@tarcieri
Copy link
Member Author

Removed the draft PR status on this as it's functionally complete and passing tests, but leaving [WIP] on since it depends on RustCrypto/traits#40 being merged first.

cc @jcape

@tarcieri tarcieri force-pushed the chacha20poly1305 branch 2 times, most recently from 602b190 to 013035a Compare August 19, 2019 20:11
Cargo.toml Outdated Show resolved Hide resolved
chacha20poly1305/Cargo.toml Outdated Show resolved Hide resolved
Implements the ChaCha20Poly1305 AEAD described in RFC 8439 using the
`chacha20` and `poly1305` crates.
@tarcieri tarcieri changed the title [WIP] ChaCha20Poly1305 AEAD ChaCha20Poly1305 AEAD Aug 21, 2019
Cargo.toml Outdated Show resolved Hide resolved
@tarcieri
Copy link
Member Author

Note: I'd like to do XChaCha20Poly1305 as well, which is a simple extension of this, but I figured I'd start with this as a first pass.

aead = "0.1"
chacha20 = { version = "0.2.1", features = ["zeroize"] }
poly1305 = "0.2"
zeroize = { version = "0.9", default-features = false }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought in other crates zeroize was optional?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Happy to keep it that way if you want. The other crates have a lower MSRV than zeroize, so it had to be optional there. Could always be optional but on-by-default as well.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, I guess making it optional and enabling it by default will not make substantial difference compared to the non-optional approach, so we can leave it as-is.

BTW I wonder how zeroize will work in case like this:

struct Foo { .. }

struct Bar { foo: Foo, baz: Baz }

if both Foo and Bar implement Zeroize. Will it zeroize Foo space twice?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@newpavlov I've been using explicit Drop handlers, and generally trying to push those down to the "leaf" data owner. If there are two Drop handlers like in your example, they will zero foo twice. I'd suggest only Foo impl Drop in the example above.

chacha20poly1305/src/lib.rs Outdated Show resolved Hide resolved
struct CipherInstance {
chacha20: ChaCha20,
poly1305: Poly1305,
}
Copy link
Member

@newpavlov newpavlov Aug 21, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like it can be made generic over the StreamCipher trait? I wonder if it should not go to the poly1305 crate... Or do you plan to make it even more generic?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a first cut 😉But yeah, good point.

It would definitely be nice to reuse the same generic "Poly1305 plus a Salsa20 family stream cipher" core to implement Salsa20Poly1305, ChaCha20Poly1305, and XChaCha20Poly1305.

The poly1305 crate might make sense as it's the eponymous algorithm's primary use case. I could also see this further justifying the existence of salsa20-core versus trying to abstract it away into a more generic ctr.

@newpavlov
Copy link
Member

BTW I wonder if we should not modify the AEAD trait constructors to new(key, nonce).

@jcape
Copy link

jcape commented Aug 21, 2019

BTW I wonder if we should not modify the AEAD trait constructors to new(key, nonce).

That would break things like STREAM that need to pass specific nonce values, wouldn't it?

@tarcieri
Copy link
Member Author

tarcieri commented Aug 21, 2019

@jcape correct.

Particularly for AES-GCM(-SIV) it'd be nice to do key expansion once for a particular key, and reuse that across nonces, especially when encrypting several AEAD messages in a row as in STREAM (or a transport encryption protocol like TLS or Noise).

It helps less for Salsa20 family ciphers, where you do want to buffer/cache the initial block state (RustCrypto/stream-ciphers#50), but particularly for ChaCha20 w\ 96-bit nonce much of the complexity of computing it comes from the nonce.

The internal `CipherInstance` type is the actual holder of mutable
state, allowing the `ChaCha20Poly1305` type to be a `StatelessAead`.
@tarcieri
Copy link
Member Author

@newpavlov aside from making the implementation generic, look good for a first cut?

@newpavlov
Copy link
Member

Yeap, you can merge it at will.

@tarcieri tarcieri merged commit bfee786 into master Aug 21, 2019
@tarcieri tarcieri deleted the chacha20poly1305 branch August 21, 2019 17:06
@tarcieri
Copy link
Member Author

Alright! Now I guess we just gotta figure out what to do about AAD in the aead crate 😉

@newpavlov
Copy link
Member

BTW another idea which I had is to introduce a trait for AEAD based on stream ciphers, it would allow us to simplify detached interface. maybe we could even add an associated constant of type enum AdPlace { Beginning, End }, which will be used to assemble message. But I guess it will be better to discuss it in a dedicated issue/PR. :)

@tarcieri
Copy link
Member Author

@newpavlov yeah definitely, almost every AEAD is based on a stream cipher, so it'd be nice to simplify the common case for those

@tarcieri
Copy link
Member Author

tarcieri commented Aug 25, 2019

Opened an issue to discuss stream cipher-based AEADs: #45

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants