Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions eax/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,22 @@ 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.5.0 (2022-07-30)
### Added
- `getrandom` feature ([#446])

### Changed
- Relax `subtle` and `zeroize` requirements ([#360])
- Rust 2021 edition upgrade; MSRV 1.56+ ([#435])
- Bump `aead` crate dependency to v0.5 ([#444])
- Bump `cipher` to v0.4 ([#451])

[#360]: https://github.com/RustCrypto/AEADs/pull/360
[#435]: https://github.com/RustCrypto/AEADs/pull/435
[#444]: https://github.com/RustCrypto/AEADs/pull/444
[#446]: https://github.com/RustCrypto/AEADs/pull/446
[#451]: https://github.com/RustCrypto/AEADs/pull/451

## 0.4.1 (2021-07-20)
### Changed
- Pin `subtle` dependency to v2.4 ([#349])
Expand Down
2 changes: 1 addition & 1 deletion eax/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "eax"
version = "0.5.0-pre.1"
version = "0.5.0"
description = """
Pure Rust implementation of the EAX
Authenticated Encryption with Associated Data (AEAD) Cipher
Expand Down
5 changes: 2 additions & 3 deletions eax/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,10 @@ pub use cipher;

use cipher::{
consts::{U0, U16},
crypto_common::OutputSizeUser,
generic_array::{functional::FunctionalSequence, GenericArray},
BlockCipher, BlockEncrypt, InnerIvInit, StreamCipherCore,
};
use cmac::{Cmac, Mac};
use cmac::{digest::Output, Cmac, Mac};
use core::marker::PhantomData;

mod traits;
Expand Down Expand Up @@ -299,7 +298,7 @@ where
key: &GenericArray<u8, Cipher::KeySize>,
iv: u8,
data: &[u8],
) -> GenericArray<u8, <Cmac<Cipher> as OutputSizeUser>::OutputSize> {
) -> Output<Cmac<Cipher>> {
let mut mac = <Cmac<Cipher> as Mac>::new(key);
mac.update(&[0; 15]);
mac.update(&[iv]);
Expand Down