diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2020-05-27 16:17:58 +0200 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2020-05-28 11:37:05 +0200 |
| commit | adcbb3fd088d3cdfc29cbc5f77755736e30b8130 (patch) | |
| tree | 9cab01e71dba2f0230457d4985f01fcb2ab022d0 /openpgp/src/serialize | |
| parent | 44f677ce10e2af6dbab532f996cf685e8c55afe5 (diff) | |
openpgp: Use u64 for AEAD chunk sizes.
- Use u64 in packet::aed::AED1 and the API.
- Add explicit overflow checks when using chunk sizes as offsets.
Diffstat (limited to 'openpgp/src/serialize')
| -rw-r--r-- | openpgp/src/serialize/stream.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/openpgp/src/serialize/stream.rs b/openpgp/src/serialize/stream.rs index e7e8e412..357fa871 100644 --- a/openpgp/src/serialize/stream.rs +++ b/openpgp/src/serialize/stream.rs @@ -2534,7 +2534,8 @@ impl<'a> Encryptor<'a> { CTB::new(Tag::AED).serialize(&mut inner)?; let mut inner = PartialBodyFilter::new(Message::from(inner), Cookie::new(level)); - let aed = AED1::new(self.sym_algo, aead.algo, aead.chunk_size, aead.nonce)?; + let aed = AED1::new(self.sym_algo, aead.algo, + aead.chunk_size as u64, aead.nonce)?; aed.serialize_headers(&mut inner)?; writer::AEADEncryptor::new( @@ -2542,7 +2543,7 @@ impl<'a> Encryptor<'a> { Cookie::new(level), aed.symmetric_algo(), aed.aead(), - aed.chunk_size(), + aead.chunk_size, aed.iv(), &sk, ) |