Commit Graph

215 Commits

Author SHA1 Message Date
Daira Hopwood b0f06c6589 Correct a misstatement in the 'Decryption by a Viewing Key Holder' section.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-03-04 00:29:30 +00:00
Daira Hopwood b6f8ab3f9b Formatting; fix key derivation diagram.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-03-03 18:51:33 +00:00
Daira Hopwood 70dede1507 Unified spec with or without viewing keys.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-03-03 18:43:10 +00:00
Daira Hopwood 605d6ef5b1 Cosmetics. 2016-03-03 15:25:25 +00:00
Daira Hopwood 1875e0d389 Fix size of r in Coin Plaintexts section.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-03-03 15:25:15 +00:00
Daira Hopwood b2ef4732af Don't mention s in Coins section; it's confusing given that COMM^s no longer exists.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-03-03 15:24:45 +00:00
Daira Hopwood d3b2bfe5fb Improve presentation of decryption by viewing key holder; define \bot.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-03-03 14:01:39 +00:00
Daira Hopwood 9ad8d7ee50 Improve presentation of P^disclose, fix a use-before-definition,
and correct an N^new -> N^old.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-03-03 14:00:52 +00:00
Daira Hopwood e634b9ceb1 Viewing key optimizations.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-03-02 16:09:52 +00:00
Daira Hopwood d3b0cfd649 Correct confusion between N^new and N^old in decryption by a viewing key holder,
and add a clarification about a viewing key holder acting as a recipient.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-03-02 15:29:37 +00:00
Daira Hopwood 9ba83513bb Fix length of r.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-03-02 00:15:43 +00:00
Daira Hopwood f5ab4ef51d Ensure that a viewing key holder can decrypt the value of the old coin.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-29 14:19:35 +00:00
Daira Hopwood 80dcdeef4f "additional data" -> "associated data".
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-28 11:25:41 +00:00
Daira Hopwood d7dd20d281 Wording improvement.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-27 23:40:01 +00:00
Daira Hopwood 65ebefd7e8 Merge "Raw Encoding" subsubsections into their parent, and correct a section title.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-27 23:39:12 +00:00
Daira Hopwood f3041d4e07 The viewing key holder should check epk.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-27 21:14:39 +00:00
Daira Hopwood 9611e0b35b The arguments to Curve25519 multiplication were consistently the wrong way round.
Also, add the base point argument to the computation of pk_enc from sk_enc.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-27 21:12:50 +00:00
Daira Hopwood c6ec1e0e07 Note about some fields not being constrained in the circuit.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-27 20:58:39 +00:00
Daira Hopwood a816d1fd18 Correct an obsolete paragraph relating a_sk and a_pk.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-27 20:38:58 +00:00
Daira Hopwood 32963392a8 Merge branch 'master' into 406.viewing-keys.1 2016-02-27 17:32:54 +00:00
Daira Hopwood 8c537c300b Add MIT license. fixes #15
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-27 17:29:48 +00:00
Daira Hopwood 0770ff87dc Acknowledgements.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-27 00:54:33 +00:00
Daira Hopwood 0545c5b9ca Work in progress on "Differences from Zerocash" section.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-27 00:54:06 +00:00
Daira Hopwood 98398f0385 Update Pour statement for viewing keys.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-27 00:52:14 +00:00
Daira Hopwood a2d625f1b2 Merge branch '738.fix-internalh-collision.0' into 406.viewing-keys.1
Includes other fixes.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-26 17:22:59 +00:00
Daira Hopwood ce18d51650 Proposed fix for domain separation and truncation.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-26 16:36:59 +00:00
Daira Hopwood e7ad03ac52 The nonce input to the AEAD isn't long enough, so derive K^disclose_i using a PRF instead.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-26 01:56:04 +00:00
Daira Hopwood abb9da9937 Fix a long line.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-26 00:21:25 +00:00
Daira Hopwood f0c24c113e Merge branch '738.fix-internalh-collision.0' into 406.viewing-keys.1
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-26 00:17:19 +00:00
Daira Hopwood e20d0dd437 Fix for InternalH collision attack.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-26 00:02:11 +00:00
Daira Hopwood 1d03b32575 Fix order of arguments to nonce in Pour statement.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-25 23:44:44 +00:00
Daira Hopwood 14e2428c66 Include security@z.cash address.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-25 23:41:47 +00:00
Daira Hopwood e2d08d1073 Fix the definition of P^shared.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-25 23:39:20 +00:00
Daira Hopwood 91ecf4ff93 Fix keystream reuse bug found by Taylor.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-25 23:38:31 +00:00
Daira Hopwood 7719e708c7 Fixes to Pour statement.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-25 21:42:28 +00:00
Daira Hopwood 19eb032dac Fixes to encryption section.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-25 21:42:00 +00:00
Daira Hopwood dc4e99389e Add back some information that was lost in a previous refactoring.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-25 19:43:03 +00:00
Daira Hopwood 0e3aee41ac Fix encodings to take into account viewing keys.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-25 19:41:06 +00:00
Daira Hopwood 36340df6c2 Rearrange sections; macro cleanups.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-25 18:32:18 +00:00
Daira Hopwood 3576398cfb WIP: encryption and key derivation changes for viewing keys.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-25 17:13:31 +00:00
Daira Hopwood d33c441c91 Makefile: protocol.pdf depends on key_components.pdf.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-25 17:12:56 +00:00
Daira Hopwood 50dcb686f0 Define 1..N notation.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-25 17:12:28 +00:00
Daira Hopwood 0db3ecc2ad Add comments about changes in coin validity due to blockchain evolution.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-25 17:10:26 +00:00
Daira Hopwood a8468efb58 More WIP.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-17 02:03:50 +00:00
Daira Hopwood 6a2713ec02 WIP toward changing the disclosure ciphertext to symmetric encryption.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-17 01:57:21 +00:00
Daira Hopwood 0e43170229 New key_components diagram.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-17 00:58:02 +00:00
Daira Hopwood 2d924b2fbc Add key_components diagram. 2016-02-16 20:08:52 +00:00
Daira Hopwood a7e10012f7 Work in progress for viewing key support.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-16 20:07:31 +00:00
Daira Hopwood 9ed6ece058 Add conformance definitions and Caution section.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-16 19:49:37 +00:00
Daira Hopwood e58b268d5d Correct i to i-1 in the PRF inputs.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-16 19:47:27 +00:00