[tor-commits] [tor/master] Merge branch 'openssl101_aes_ctr_rebased'

[nickm at torproject.org]

commit 86f1630b36ec58ffd3a193ac4333ac572d4a8dca
Merge: fc35674 01905a6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 27 22:41:10 2012 -0400

    Merge branch 'openssl101_aes_ctr_rebased'

 changes/crypto_api     |    3 +
 changes/openssl101_aes |    6 ++
 changes/pad_rsa_always |    3 +
 src/common/aes.c       |  103 ++++++++++++++++++++++++++--
 src/common/aes.h       |    4 +-
 src/common/crypto.c    |  174 ++++++++++-------------------------------------
 src/common/crypto.h    |   23 ++-----
 src/or/circuitbuild.c  |    4 +-
 src/or/rendcommon.c    |   13 ++--
 src/or/routerparse.c   |   15 ++--
 src/test/bench.c       |   17 ++---
 src/test/test_crypto.c |  142 +++++++++++++++------------------------
 12 files changed, 226 insertions(+), 281 deletions(-)