diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-16 17:09:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-16 17:09:32 -0400 |
| commit | 57b954293e3880f3b39d2f0f0f7710250e8ffc5f (patch) | |
| tree | 06800a08323c179e6e38292ebba543165b0fb22d /src/common/aes.c | |
| parent | 415caba967b9b470623ab29230b820b3470a91e6 (diff) | |
| parent | 6617822b841e32d6339bac13c79dd5f2b566c3c6 (diff) | |
| download | tor-57b954293e3880f3b39d2f0f0f7710250e8ffc5f.tar.gz tor-57b954293e3880f3b39d2f0f0f7710250e8ffc5f.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Trivial Conflicts in
src/common/crypto.c
src/or/main.h
src/or/or.h
Diffstat (limited to 'src/common/aes.c')
| -rw-r--r-- | src/common/aes.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/common/aes.c b/src/common/aes.c index f03a76b037..81091e9f02 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -100,6 +100,9 @@ /* Figure out which AES optimizations to use. */ #ifdef USE_BUILTIN_AES +/** If this is defined, we take advantage of the fact that AES treats its + * input as a set of 4 32-bit words, so that there is no need to encode and + * decode the 128-bit counter before every block encryption */ # define USE_RIJNDAEL_COUNTER_OPTIMIZATION # if 0 && (defined(__powerpc__) || defined(__powerpc64__)) /* XXXX do more experimentation before concluding this is actually |