Bump cipher to 0.5.0-pre.4#583
Conversation
baloo
force-pushed
the
baloo/bump-cipher
branch
7 times, most recently
from
404fe84 to
fdabf6c
Compare
|
@newpavlov I'd love to get some help to bump |
|
@baloo If you encounter difficulties with fixing the mgm CI jobs, you can exclude it from the common workspace. |
Cargo.toml
Outdated
| [patch.crates-io] | ||
|
|
||
| # https://github.com/RustCrypto/block-ciphers/pull/413 | ||
| aes = { git = "https://github.com/RustCrypto/block-ciphers.git" } | ||
|
|
||
| # https://github.com/RustCrypto/block-modes/pull/56 | ||
| ctr = { git = "https://github.com/RustCrypto/block-modes.git" } | ||
|
|
||
| # pending pre-release | ||
| universal-hash = { git = "https://github.com/RustCrypto/traits.git" } | ||
| # https://github.com/RustCrypto/traits/pull/1531 | ||
| aead = { git = "https://github.com/RustCrypto/traits.git" } | ||
|
|
||
| # https://github.com/RustCrypto/MACs/pull/158 | ||
| cmac = { git = "https://github.com/RustCrypto/MACs.git" } | ||
| pmac = { git = "https://github.com/RustCrypto/MACs.git" } | ||
|
|
||
| # https://github.com/RustCrypto/stream-ciphers/pull/345 | ||
| chacha20 = { git = "https://github.com/RustCrypto/stream-ciphers.git" } | ||
|
|
||
| # https://github.com/RustCrypto/universal-hashes/pull/196 | ||
| ghash = { git = "https://github.com/RustCrypto/universal-hashes.git" } | ||
| polyval = { git = "https://github.com/RustCrypto/universal-hashes.git" } | ||
| poly1305 = { git = "https://github.com/RustCrypto/universal-hashes.git" } |
There was a problem hiding this comment.
Perhaps we could kick out some releases of these so we have a patch-free baseline to work from
There was a problem hiding this comment.
that'd be lovely!
In order, I think I'd need:
- First step:
- traits/aead
- traits/universal-hash
- block-ciphers/aes
- block-ciphers/belt-block
- block-ciphers/des
- block-ciphers/kuznyechik
- block-ciphers/magma
- stream-ciphers/chacha20
- second
- macs/cmac
- macs/pmac
- block-modes/ctr
- universal-hashes/polyval
- universal-hashes/poly1305
- third
- universal-hashes/ghash
There was a problem hiding this comment.
that's a lot of releases! I can throw in the first step of those in a couple PRs if you'd like
baloo
force-pushed
the
baloo/bump-cipher
branch
3 times, most recently
from
15a6e11 to
85cef52
Compare
|
While we wait for the release of belt-block (which is a blocker for macs and ctr bumps), I got this in a state that I think should be merge-able. |
baloo
force-pushed
the
baloo/bump-cipher
branch
from
1ec39b4 to
19ed824
Compare
|
@baloo this needs a rebase now that we've landed |
baloo
force-pushed
the
baloo/bump-cipher
branch
from
19ed824 to
dbf25db
Compare
| debug_assert_eq!(two_blocks.len(), BLOCK_SIZE * 2); | ||
| let (b0, b1) = two_blocks.split_at_mut(BLOCK_SIZE); | ||
| [b0.into(), b1.into()] | ||
| [b0.try_into().unwrap(), b1.try_into().unwrap()] |
There was a problem hiding this comment.
cc @dignifiedquire I think that is okay with the debug_assert on top.
| offset_i[offset_i.len() - 1] = initial_offset(&self.cipher, nonce, TagSize::to_u32()); | ||
| let mut checksum_i = Block::default(); | ||
| for wide_blocks in buffer.chunks_exact_mut(16 * WIDTH) { | ||
| for wide_blocks in buffer.chunks_exact_mut(<Block as AssocArraySize>::Size::USIZE * WIDTH) { |
There was a problem hiding this comment.
This could use an aliased type in hybrid-array
baloo
force-pushed
the
baloo/bump-cipher
branch
from
5ffcca0 to
e8e96a5
Compare
baloo
force-pushed
the
baloo/bump-cipher
branch
from
e8e96a5 to
b4fa6d4
Compare
3 participants
Depends:
cipherdependency to0.5.0-pre.4block-ciphers#413cipherto0.5.0-pre.4block-modes#56digest/cipherto0.11.0-pre.8/0.5.0-pre.4MACs#158hybrid-arraymigration traits#1531universal-hashto0.6.0-preuniversal-hashes#196