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.

Sign up for GitHub

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

chacha20 v0.2.2 #65

Merged
merged 1 commit into from
Oct 22, 2019
Merged

chacha20 v0.2.2 #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions chacha20/CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 0.2.2 (2019-10-22)
### Added
- SSE2 accelerated implementation ([#61])

[#61]: https://github.com/RustCrypto/stream-ciphers/pull/61

## 0.2.1 (2019-08-19)
### Added
- Add `MAX_BLOCKS` and `BLOCK_SIZE` constants ([#47])
Expand Down
4 changes: 2 additions & 2 deletions chacha20/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
name = "chacha20"
version = "0.2.1"
version = "0.2.2"
authors = ["RustCrypto Developers"]
license = "MIT OR Apache-2.0"
license = "Apache-2.0 OR MIT"
description = """
The ChaCha20 stream cipher (RFC 8439) implemented using traits from the
RustCrypto stream-cipher crate.
Expand Down
4 changes: 2 additions & 2 deletions chacha20/src/block/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! The ChaCha20 block function. Defined in RFC 7539 Section 2.3.
//! The ChaCha20 block function. Defined in RFC 8439 Section 2.3.
//!
//! <https://tools.ietf.org/html/rfc7539#section-2.3>
//! <https://tools.ietf.org/html/rfc8439#section-2.3>

use salsa20_core::{CONSTANTS, IV_WORDS, KEY_WORDS, STATE_WORDS};

Expand Down
2 changes: 1 addition & 1 deletion chacha20/src/cipher.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub(crate) struct Cipher {
iv: [u32; IV_WORDS],

/// Offset of the initial counter in the keystream. This is derived from
/// the extra 4 bytes in the 96-byte nonce RFC 7539 version (or is always
/// the extra 4 bytes in the 96-byte nonce RFC 8439 version (or is always
/// 0 in the legacy version)
counter_offset: u64,
}
Expand Down
6 changes: 3 additions & 3 deletions chacha20/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//! The ChaCha20 stream cipher ([RFC 7539])
//! The ChaCha20 stream cipher ([RFC 8439])
//!
//! ChaCha20 is a lightweight stream cipher which is amenable to fast,
//! constant-time implementations in software. It improves upon the previous
Expand Down Expand Up @@ -46,7 +46,7 @@
//! assert_eq!(data, [1, 2, 3, 4, 5, 6, 7]);
//! ```
//!
//! [RFC 7539]: https://tools.ietf.org/html/rfc7539
//! [RFC 8439]: https://tools.ietf.org/html/rfc8439
//! [Salsa20]: https://docs.rs/salsa20

#![no_std]
Expand Down Expand Up @@ -88,7 +88,7 @@ pub const MAX_BLOCKS: usize = core::u32::MAX as usize;
/// Size of a ChaCha20 block in bytes
pub const BLOCK_SIZE: usize = 64;

/// The ChaCha20 stream cipher (RFC 7539 version with 96-bit nonce)
/// The ChaCha20 stream cipher (RFC 8439 version with 96-bit nonce)
///
/// Use `ChaCha20Legacy` for the legacy (a.k.a. "djb") construction with a
/// 64-bit nonce.
Expand Down