diff options
| author | lloyd <[email protected]> | 2009-12-21 13:51:05 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-12-21 13:51:05 +0000 |
| commit | 75f32d61c6a78e4e63cfadd084730f20b5896493 (patch) | |
| tree | 4a52d3009f012ec5761f1c1218e18efbe07eef0b /src/stream/salsa20 | |
| parent | f3f36611db8c3f6c67c818d454973a0165b0fcf2 (diff) | |
Un-internal loadstor.h (and its header deps, rotate.h and
bswap.h); too many external apps rely on loadstor.h existing.
Define 64-bit generic bswap in terms of 32-bit bswap, since it's
not much slower if 32-bit is also generic, and much faster if
it's not. This may be quite helpful on 32-bit x86 in particular.
Change formulation of generic 32-bit bswap. It may be faster or
slower depending on the CPU, especially the latency and throuput
of rotate instructions, but should be faster on an ideally
superscalar processor with rotate instructions (ie, what I expect
future CPUs to look more like).
Diffstat (limited to 'src/stream/salsa20')
| -rw-r--r-- | src/stream/salsa20/salsa20.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/stream/salsa20/salsa20.cpp b/src/stream/salsa20/salsa20.cpp index cc5d3a712..1b97f4421 100644 --- a/src/stream/salsa20/salsa20.cpp +++ b/src/stream/salsa20/salsa20.cpp @@ -6,8 +6,9 @@ */ #include <botan/salsa20.h> +#include <botan/loadstor.h> +#include <botan/rotate.h> #include <botan/internal/xor_buf.h> -#include <botan/internal/loadstor.h> namespace Botan { |