Skip to content

Commit 39ef127

Browse files
committed
Rename Blake2bXReader -> Blake2XbReader and add documentation
1 parent a349c39 commit 39ef127

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

blake2/src/blake2x.rs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,22 +63,23 @@ impl Blake2Xb {
6363
}
6464
}
6565

66-
pub struct Blake2bXReader {
66+
/// Finalized XOF instance over Blake2b
67+
pub struct Blake2XbReader {
6768
h0: [u8; 64],
6869
buffer: ReadBuffer<<Self as BlockSizeUser>::BlockSize>,
6970
node_offset: u32,
7071
total_length: u32,
7172
}
7273

73-
impl BlockSizeUser for Blake2bXReader {
74+
impl BlockSizeUser for Blake2XbReader {
7475
type BlockSize = U64;
7576
}
7677

77-
impl BufferKindUser for Blake2bXReader {
78+
impl BufferKindUser for Blake2XbReader {
7879
type BufferKind = <Blake2bVarCore as BufferKindUser>::BufferKind;
7980
}
8081

81-
impl XofReader for Blake2bXReader {
82+
impl XofReader for Blake2XbReader {
8283
fn read(&mut self, buffer: &mut [u8]) {
8384
let Self { buffer: buf, .. } = self;
8485
buf.read(buffer, |block| {
@@ -101,7 +102,7 @@ impl XofReader for Blake2bXReader {
101102
}
102103

103104
#[cfg(feature = "std")]
104-
impl std::io::Read for Blake2bXReader {
105+
impl std::io::Read for Blake2XbReader {
105106
#[inline]
106107
fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
107108
XofReader::read(self, buf);
@@ -129,7 +130,7 @@ impl Update for Blake2Xb {
129130
}
130131

131132
impl ExtendableOutput for Blake2Xb {
132-
type Reader = Blake2bXReader;
133+
type Reader = Blake2XbReader;
133134

134135
fn finalize_xof(self) -> Self::Reader {
135136
let mut m = <_>::default();
@@ -143,7 +144,7 @@ impl ExtendableOutput for Blake2Xb {
143144
let mut h0 = [0; 64];
144145
h0.copy_from_slice(&m);
145146

146-
Blake2bXReader {
147+
Blake2XbReader {
147148
h0,
148149
buffer: <_>::default(),
149150
node_offset: 0,

blake2/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ mod simd;
4242
mod macros;
4343

4444
use as_bytes::AsBytes;
45-
pub use blake2x::Blake2bXReader;
45+
pub use blake2x::Blake2XbReader;
4646
use consts::{BLAKE2B_IV, BLAKE2S_IV};
4747
use simd::{Vector4, u32x4, u64x4};
4848

@@ -98,7 +98,7 @@ pub type Blake2b512 = Blake2b<U64>;
9898
blake2_mac_impl!(Blake2bMac, Blake2bVarCore, U64, "Blake2b MAC function");
9999

100100
/// Create a blake2xb generator with maximum output
101-
pub fn blake2xb(seed: &[u8]) -> Blake2bXReader {
101+
pub fn blake2xb(seed: &[u8]) -> Blake2XbReader {
102102
use digest::ExtendableOutput;
103103
blake2x::Blake2Xb::new(Some(seed), None)
104104
.unwrap()

0 commit comments

Comments
 (0)