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.

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

Upgrade dependencies #94

Merged
merged 7 commits into from
Aug 14, 2019
Merged

Upgrade dependencies #94

merged 7 commits into from
Aug 14, 2019

Conversation

str4d
Copy link
Contributor

@str4d str4d commented Jul 30, 2019

No description provided.

@str4d str4d requested review from daira, ebfull and defuse July 30, 2019 20:07
.ok()?,
CHACHA20_BLOCK_SIZE + COMPACT_NOTE_SIZE
);
// Start from block 1 to skip over Poly1305 keying output

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything else LGTM but I'm curious what prompted this change?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also there is no longer an assert, that's fine yes?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #69 (comment) for the context.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And yes, there's no longer an assert because ChaCha20Ietf::xor mutates in-place and doesn't return anything.

// Start from block 1 to skip over Poly1305 keying output
let mut plaintext = [0; COMPACT_NOTE_SIZE];
plaintext.copy_from_slice(&enc_ciphertext);
ChaCha20Ietf::xor(key.as_bytes(), &[0u8; 12], 1, &mut plaintext);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm assuming the 3rd argument is the signifier of which block to start from instead of prefixing with a 'block' of zero bytes?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct. See RFC 7539 section 2.8 for details.

@ebfull
Copy link
Collaborator

ebfull commented Aug 6, 2019

LGTM, will re-review once #92 is merged.

Copy link

@dconnolly dconnolly left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@str4d
Copy link
Contributor Author

str4d commented Aug 14, 2019

Rebased on master to fix merge conflicts after #92 was merged.

@str4d str4d merged commit f931562 into zcash:master Aug 14, 2019
@str4d str4d deleted the upgrade-deps branch August 14, 2019 09:39
@str4d str4d added this to the v0.1.0 milestone Aug 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants