[tor-commits] [tor/master] Merge remote-tracking branch 'yawning/feature16467_9663'

[nickm at torproject.org]

commit a6a0759e3a34a3c78850ee2a73dbc0124ba7aa4a
Merge: 327efe9 840e68d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 9 12:53:55 2015 -0400

    Merge remote-tracking branch 'yawning/feature16467_9663'

 .gitignore                                         |    2 +
 changes/feature16467                               |    4 +
 changes/feature9663                                |    5 +
 src/common/crypto.c                                |    5 +
 src/common/crypto_curve25519.c                     |  119 +-
 src/common/crypto_curve25519.h                     |    5 +
 src/common/crypto_ed25519.c                        |  211 +-
 src/common/crypto_ed25519.h                        |    3 +
 src/common/include.am                              |    1 +
 src/ext/README                                     |    5 +
 src/ext/ed25519/donna/README.md                    |  183 +
 src/ext/ed25519/donna/README.tor                   |   39 +
 src/ext/ed25519/donna/curve25519-donna-32bit.h     |  579 +++
 src/ext/ed25519/donna/curve25519-donna-64bit.h     |  413 ++
 src/ext/ed25519/donna/curve25519-donna-helpers.h   |   67 +
 src/ext/ed25519/donna/curve25519-donna-sse2.h      | 1112 +++++
 src/ext/ed25519/donna/ed25519-donna-32bit-sse2.h   |  513 +++
 src/ext/ed25519/donna/ed25519-donna-32bit-tables.h |   61 +
 src/ext/ed25519/donna/ed25519-donna-64bit-sse2.h   |  436 ++
 src/ext/ed25519/donna/ed25519-donna-64bit-tables.h |   53 +
 .../ed25519/donna/ed25519-donna-64bit-x86-32bit.h  |  435 ++
 src/ext/ed25519/donna/ed25519-donna-64bit-x86.h    |  351 ++
 .../ed25519/donna/ed25519-donna-basepoint-table.h  |  259 ++
 src/ext/ed25519/donna/ed25519-donna-batchverify.h  |  275 ++
 src/ext/ed25519/donna/ed25519-donna-impl-base.h    |  364 ++
 src/ext/ed25519/donna/ed25519-donna-impl-sse2.h    |  390 ++
 .../donna/ed25519-donna-portable-identify.h        |  103 +
 src/ext/ed25519/donna/ed25519-donna-portable.h     |  150 +
 src/ext/ed25519/donna/ed25519-donna.h              |  115 +
 src/ext/ed25519/donna/ed25519-hash-custom.h        |   11 +
 src/ext/ed25519/donna/ed25519-hash.h               |  219 +
 src/ext/ed25519/donna/ed25519-randombytes-custom.h |   17 +
 src/ext/ed25519/donna/ed25519-randombytes.h        |   91 +
 src/ext/ed25519/donna/ed25519.c                    |  150 +
 src/ext/ed25519/donna/ed25519.h                    |   30 +
 src/ext/ed25519/donna/ed25519_donna_tor.h          |   33 +
 src/ext/ed25519/donna/ed25519_tor.c                |  344 ++
 src/ext/ed25519/donna/fuzz/README.md               |  173 +
 src/ext/ed25519/donna/fuzz/build-nix.php           |  134 +
 src/ext/ed25519/donna/fuzz/curve25519-ref10.c      | 1272 ++++++
 src/ext/ed25519/donna/fuzz/curve25519-ref10.h      |    8 +
 src/ext/ed25519/donna/fuzz/ed25519-donna-sse2.c    |    3 +
 src/ext/ed25519/donna/fuzz/ed25519-donna.c         |    1 +
 src/ext/ed25519/donna/fuzz/ed25519-donna.h         |   34 +
 src/ext/ed25519/donna/fuzz/ed25519-ref10.c         | 4647 ++++++++++++++++++++
 src/ext/ed25519/donna/fuzz/ed25519-ref10.h         |    9 +
 src/ext/ed25519/donna/fuzz/fuzz-curve25519.c       |  172 +
 src/ext/ed25519/donna/fuzz/fuzz-ed25519.c          |  219 +
 src/ext/ed25519/donna/modm-donna-32bit.h           |  469 ++
 src/ext/ed25519/donna/modm-donna-64bit.h           |  361 ++
 src/ext/ed25519/donna/regression.h                 | 1024 +++++
 src/ext/ed25519/donna/test-internals.c             |  190 +
 src/ext/ed25519/donna/test-ticks.h                 |   50 +
 src/ext/ed25519/donna/test.c                       |  260 ++
 src/ext/include.am                                 |   41 +
 src/test/bench.c                                   |   30 +-
 src/test/test_crypto.c                             |   97 +
 57 files changed, 16328 insertions(+), 19 deletions(-)