Commit Graph

895 Commits

Author SHA1 Message Date
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 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
Daira Hopwood 270959b5cd Add make target that makes the PDF unconditionally.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-16 19:45:29 +00:00
Daira Hopwood b3b34c21f0 Add table of contents and version.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-11 18:54:23 +00:00
Daira Hopwood 7f00921967 Change coin commitments in Merkle tree diagram back to cm.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-11 18:37:28 +00:00
Daira Hopwood 63a13665b7 Highlight changes for Faerie Gold fix.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-11 18:21:39 +00:00
Daira Hopwood 8b3f18bbe3 Correct an error in the definition of PRF^rho.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-11 16:29:42 +00:00
Daira Hopwood dd3464441a Proposed fix for Faerie Gold attack -- WIP.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-11 16:28:59 +00:00
Daira Hopwood 0d8ca188fe Formatting cosmetics.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-11 16:27:55 +00:00
Daira Hopwood f169514c65 Highlight changes from original Zerocash.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-11 15:04:56 +00:00
Daira Hopwood 55c631d37f Correct the length of pk_enc in a raw-encoded address.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-09 00:51:25 +00:00
Daira Hopwood e30bd3e555 Clarification of another difference from crypto_box_seal.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-07 21:55:20 +00:00
Daira Hopwood 0329a2e768 Cosmetics.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-07 21:54:57 +00:00
Daira Hopwood eafecf2ad9 Proposed fix to issue raised by Matthew Green about defence in depth.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-07 11:38:10 +00:00
Daira Hopwood c822d433d0 Reorder definitions to avoid a forward reference.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-07 11:26:30 +00:00
Daira Hopwood c3646a4cd4 Fix formatting and warnings.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-07 11:26:13 +00:00
Daira Hopwood d8cf2eae83 Switch from blake2b to SHA-256 for nonce computations.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-07 11:25:51 +00:00
Daira Hopwood 3d56cf291a Memo field fixes.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-07 11:25:51 +00:00
Daira Hopwood 906975de12 More references.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-07 11:25:30 +00:00
Daira Hopwood 93d4303968 Proposed crypto_box encryption.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-07 11:25:30 +00:00
Daira Hopwood d4b5d5eed9 Fix truncation in PRF^sn and PRF^pk. closes #686
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-02 23:40:44 +00:00
Daira Hopwood ce5cff9eeb Add "Differences from the Zerocash paper" section.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-02-01 22:08:13 +00:00
Daira Hopwood 131642e53b Adjust formatting of raw encoding layouts.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-01-29 00:42:16 +00:00
Daira Hopwood 5456ddf2a6 Fix size of r.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-01-29 00:41:41 +00:00
Daira Hopwood c080e5eda2 Merge branch 'nathan-wip' of github.com:Electric-Coin-Company/zips into daira-wip
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-01-29 00:17:04 +00:00
Nathan Wilcox 38290a7a86 Several comments and a few rewrites while pairing with Daira. 2016-01-28 16:10:30 -08:00
Daira Hopwood 9cddba31fc Improve paragraph spacing and remove paragraph indent.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-01-29 00:00:21 +00:00
Daira Hopwood a7d75007fa Clarify what "collision-resistant across all x" means.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-01-28 23:55:17 +00:00
Nathan Wilcox b3da327877 Add a README with some barebones build dependency instructions. 2016-01-28 15:16:08 -08:00
Nathan Wilcox cc97884b1b Add a README with some barebones build dependency instructions. 2016-01-28 15:15:43 -08:00
Daira Hopwood 304dd6be27 Make the order of fields in a coin tuple consistent.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-01-28 22:41:29 +00:00
Daira Hopwood 19fb4e39ef Use Leading and Trailing functions; fix alignment of bit diagrams.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-01-28 22:33:43 +00:00
Daira Hopwood ce6109f730 Define Leading and Trailing functions.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-01-28 22:33:13 +00:00
Daira Hopwood 592c06c263 Fix PRFpk notation, clarify truncation, and answer a question about PRFsn.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-01-27 13:21:11 +00:00
Daira Hopwood aa0087f501 Terminology tweak.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-01-27 00:49:13 +00:00
Daira Hopwood a9ef6f47ab We only use unsigned integers, and there should be no unspecified formats
(except Pour proofs, currently).

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-01-27 00:48:52 +00:00
Daira Hopwood d9fea514aa Formatting stuff.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-01-27 00:34:42 +00:00
Daira Hopwood 74e6963e96 Add question about collision-resistance of PRF^sn.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-01-27 00:33:48 +00:00
Daira Hopwood fe003d4954 Fix references.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-01-27 00:32:57 +00:00
Daira Hopwood 862b201906 preceding -> immediately preceding.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-01-26 23:40:53 +00:00
Daira Hopwood cf46f231e6 Simplify description of anchor constraints.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-01-26 23:36:53 +00:00
Daira Hopwood d2df941912 Add Base58Check reference.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-01-26 23:36:29 +00:00
Daira Hopwood 75eb8a4099 WIP
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2016-01-26 23:15:17 +00:00
Sean Bowe 620c06436c Remove outdated notes. 2016-01-20 13:38:22 -07:00
Daira Hopwood 48ca93a1d5 Be pedantic about what an ECIES public key is, and fix some font issues.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-12-23 02:14:05 +00:00
Daira Hopwood ca1c8fe504 Add 'make clean' target.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-12-23 02:13:11 +00:00
Daira Hopwood 2791823a6a Re-render the PDF. (make lied to me about it being up-to-date.)
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-12-23 00:04:13 +00:00
Daira Hopwood ef9ca8c023 Choose lead bytes.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-12-22 23:58:55 +00:00
Taylor Hornby 84d2cf08bc Render the PDF. 2015-12-22 16:31:11 -07:00
Daira Hopwood 22a38ec7ea Changes to reflect that not all fields in a bucket are encrypted.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-12-22 23:24:24 +00:00
Daira Hopwood edfaaf65cb Fix rho to be upright, not italic.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-12-21 18:46:33 +00:00
Daira Hopwood c94ba4914a Fix spelling of "two's complement".
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2015-12-21 18:11:49 +00:00
Sean Bowe 0279e3bcd6 Fix typo 2015-12-17 15:26:37 -07:00
Sean Bowe fe402e1267 Added Taylor to authors, added colors for more review notes. 2015-12-17 09:51:30 -07:00
Sean Bowe 1b1492ec40 Improvements to low-hanging fruit phrasing issues. 2015-12-17 09:34:46 -07:00
eli.ben.sasson 9fc091760e merge 2015-12-17 00:20:09 +02:00
eli.ben.sasson 4f8a2a8790 intial comments in tex 2015-12-17 00:18:22 +02:00
eli.ben.sasson 08b2b455d7 initial comments in tex file 2015-12-17 00:17:28 +02:00
Taylor Hornby 8cc631a782 Fix some terminology and improve some things. 2015-12-16 14:38:52 -07:00
Taylor Hornby c8665edd14 Add Makefile 2015-12-16 14:02:37 -07:00
Taylor Hornby 116a526835 Remove question and add sections for the cleartext addrs 2015-12-16 14:02:22 -07:00
Taylor Hornby a6f9c10223 Render the PDF 2015-12-16 13:55:23 -07:00
Taylor Hornby ec2a832ca1 Add encoding of public address, private key, buckets 2015-12-16 13:55:16 -07:00
Sean Bowe 506de22ce5 These bits are placed in the middle as per the zerocash paper. 2015-12-14 16:30:40 -07:00
Sean Bowe 8a35b0a57a Initial commit 2015-12-14 10:03:59 -07:00