diff options
Diffstat (limited to 'src')
54 files changed, 52 insertions, 30 deletions
diff --git a/src/adler32.cpp b/src/adler32.cpp index 51f6cbea3..e2ee02cb8 100644 --- a/src/adler32.cpp +++ b/src/adler32.cpp @@ -4,7 +4,7 @@ *************************************************/ #include <botan/adler32.h> -#include <botan/bit_ops.h> +#include <botan/loadstor.h> namespace Botan { diff --git a/src/aes.cpp b/src/aes.cpp index b345763cb..09ff81234 100644 --- a/src/aes.cpp +++ b/src/aes.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/aes.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> namespace Botan { diff --git a/src/asn1_ku.cpp b/src/asn1_ku.cpp index 1fa236d9f..5d6711bbc 100644 --- a/src/asn1_ku.cpp +++ b/src/asn1_ku.cpp @@ -6,7 +6,6 @@ #include <botan/asn1_obj.h> #include <botan/der_enc.h> #include <botan/ber_dec.h> -#include <botan/bit_ops.h> namespace Botan { diff --git a/src/ber_dec.cpp b/src/ber_dec.cpp index 5df9a2c35..2537a917b 100644 --- a/src/ber_dec.cpp +++ b/src/ber_dec.cpp @@ -5,7 +5,7 @@ #include <botan/ber_dec.h> #include <botan/bigint.h> -#include <botan/bit_ops.h> +#include <botan/loadstor.h> namespace Botan { diff --git a/src/big_base.cpp b/src/big_base.cpp index 25d0832c6..fce11fe73 100644 --- a/src/big_base.cpp +++ b/src/big_base.cpp @@ -5,7 +5,7 @@ #include <botan/bigint.h> #include <botan/mp_core.h> -#include <botan/bit_ops.h> +#include <botan/loadstor.h> #include <botan/parsing.h> #include <botan/util.h> diff --git a/src/big_ops2.cpp b/src/big_ops2.cpp index 2e6c6df94..d28f343f2 100644 --- a/src/big_ops2.cpp +++ b/src/big_ops2.cpp @@ -4,10 +4,8 @@ *************************************************/ #include <botan/bigint.h> -#include <botan/numthry.h> #include <botan/mp_core.h> #include <botan/bit_ops.h> -#include <botan/util.h> #include <algorithm> namespace Botan { diff --git a/src/bit_ops.cpp b/src/bit_ops.cpp index 1847b5773..22a01c037 100644 --- a/src/bit_ops.cpp +++ b/src/bit_ops.cpp @@ -3,12 +3,12 @@ * (C) 1999-2007 The Botan Project * *************************************************/ -#include <botan/bit_ops.h> +#include <botan/loadstor.h> namespace Botan { /************************************************* -* XOR arrays together * +* Array XOR * *************************************************/ void xor_buf(byte data[], const byte mask[], u32bit length) { @@ -24,6 +24,9 @@ void xor_buf(byte data[], const byte mask[], u32bit length) data[j] ^= mask[j]; } +/************************************************* +* Array XOR * +*************************************************/ void xor_buf(byte out[], const byte in[], const byte mask[], u32bit length) { while(length >= 8) diff --git a/src/blowfish.cpp b/src/blowfish.cpp index 779053266..f6f8213c4 100644 --- a/src/blowfish.cpp +++ b/src/blowfish.cpp @@ -4,7 +4,7 @@ *************************************************/ #include <botan/blowfish.h> -#include <botan/bit_ops.h> +#include <botan/loadstor.h> namespace Botan { diff --git a/src/cast128.cpp b/src/cast128.cpp index 481897810..1d9222460 100644 --- a/src/cast128.cpp +++ b/src/cast128.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/cast128.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> namespace Botan { diff --git a/src/cast256.cpp b/src/cast256.cpp index 1064ed0de..e7e978665 100644 --- a/src/cast256.cpp +++ b/src/cast256.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/cast256.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> namespace Botan { diff --git a/src/crc24.cpp b/src/crc24.cpp index e5576a566..e7df4ea0f 100644 --- a/src/crc24.cpp +++ b/src/crc24.cpp @@ -4,7 +4,7 @@ *************************************************/ #include <botan/crc24.h> -#include <botan/bit_ops.h> +#include <botan/loadstor.h> namespace Botan { diff --git a/src/crc32.cpp b/src/crc32.cpp index e897cbc02..f950b136b 100644 --- a/src/crc32.cpp +++ b/src/crc32.cpp @@ -4,7 +4,7 @@ *************************************************/ #include <botan/crc32.h> -#include <botan/bit_ops.h> +#include <botan/loadstor.h> namespace Botan { diff --git a/src/der_enc.cpp b/src/der_enc.cpp index fa4575858..e418568bc 100644 --- a/src/der_enc.cpp +++ b/src/der_enc.cpp @@ -6,6 +6,7 @@ #include <botan/der_enc.h> #include <botan/asn1_int.h> #include <botan/bigint.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> #include <botan/parsing.h> #include <algorithm> diff --git a/src/des.cpp b/src/des.cpp index de95ed5be..18b183bc9 100644 --- a/src/des.cpp +++ b/src/des.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/des.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> namespace Botan { diff --git a/src/dsa_gen.cpp b/src/dsa_gen.cpp index 28d27c06b..c4e475a49 100644 --- a/src/dsa_gen.cpp +++ b/src/dsa_gen.cpp @@ -7,7 +7,6 @@ #include <botan/numthry.h> #include <botan/libstate.h> #include <botan/lookup.h> -#include <botan/bit_ops.h> #include <botan/parsing.h> #include <botan/rng.h> #include <algorithm> diff --git a/src/fork256.cpp b/src/fork256.cpp index af2d7a756..e0b39c5d7 100644 --- a/src/fork256.cpp +++ b/src/fork256.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/fork256.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> namespace Botan { diff --git a/src/gost.cpp b/src/gost.cpp index d999d0d2d..6e82c57f6 100644 --- a/src/gost.cpp +++ b/src/gost.cpp @@ -4,7 +4,7 @@ *************************************************/ #include <botan/gost.h> -#include <botan/bit_ops.h> +#include <botan/loadstor.h> namespace Botan { diff --git a/src/has160.cpp b/src/has160.cpp index 7c6721903..8e7cb3fe7 100644 --- a/src/has160.cpp +++ b/src/has160.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/has160.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> namespace Botan { diff --git a/src/hex.cpp b/src/hex.cpp index 88ee4b6ae..252c0622b 100644 --- a/src/hex.cpp +++ b/src/hex.cpp @@ -4,7 +4,6 @@ *************************************************/ #include <botan/hex.h> -#include <botan/bit_ops.h> #include <botan/parsing.h> #include <botan/charset.h> #include <algorithm> diff --git a/src/idea.cpp b/src/idea.cpp index c12f7b5b9..267a14504 100644 --- a/src/idea.cpp +++ b/src/idea.cpp @@ -4,7 +4,7 @@ *************************************************/ #include <botan/idea.h> -#include <botan/bit_ops.h> +#include <botan/loadstor.h> namespace Botan { diff --git a/src/kasumi.cpp b/src/kasumi.cpp index 43eff7311..18cc0438e 100644 --- a/src/kasumi.cpp +++ b/src/kasumi.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/kasumi.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> namespace Botan { diff --git a/src/kdf.cpp b/src/kdf.cpp index b35fcd20a..22d8ac7cc 100644 --- a/src/kdf.cpp +++ b/src/kdf.cpp @@ -5,7 +5,7 @@ #include <botan/kdf.h> #include <botan/lookup.h> -#include <botan/bit_ops.h> +#include <botan/loadstor.h> #include <algorithm> #include <memory> diff --git a/src/mars.cpp b/src/mars.cpp index 34327d717..52b5b812c 100644 --- a/src/mars.cpp +++ b/src/mars.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/mars.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> namespace Botan { diff --git a/src/md4.cpp b/src/md4.cpp index b4cc4ce17..91dc3f3c7 100644 --- a/src/md4.cpp +++ b/src/md4.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/md4.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> namespace Botan { diff --git a/src/md5.cpp b/src/md5.cpp index ec3703de5..edde36836 100644 --- a/src/md5.cpp +++ b/src/md5.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/md5.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> namespace Botan { diff --git a/src/mdx_hash.cpp b/src/mdx_hash.cpp index f8020e2dc..312f798d6 100644 --- a/src/mdx_hash.cpp +++ b/src/mdx_hash.cpp @@ -4,7 +4,7 @@ *************************************************/ #include <botan/mdx_hash.h> -#include <botan/bit_ops.h> +#include <botan/loadstor.h> namespace Botan { diff --git a/src/mem_pool.cpp b/src/mem_pool.cpp index 29930b8a1..ec6bb344a 100644 --- a/src/mem_pool.cpp +++ b/src/mem_pool.cpp @@ -6,7 +6,6 @@ #include <botan/mem_pool.h> #include <botan/libstate.h> #include <botan/config.h> -#include <botan/bit_ops.h> #include <botan/util.h> #include <algorithm> diff --git a/src/mgf1.cpp b/src/mgf1.cpp index a0ce95530..dea792251 100644 --- a/src/mgf1.cpp +++ b/src/mgf1.cpp @@ -5,6 +5,7 @@ #include <botan/mgf1.h> #include <botan/lookup.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> #include <algorithm> #include <memory> diff --git a/src/misty1.cpp b/src/misty1.cpp index 6405dc335..44a6a852b 100644 --- a/src/misty1.cpp +++ b/src/misty1.cpp @@ -4,7 +4,7 @@ *************************************************/ #include <botan/misty1.h> -#include <botan/bit_ops.h> +#include <botan/loadstor.h> #include <botan/parsing.h> namespace Botan { diff --git a/src/parsing.cpp b/src/parsing.cpp index cfe7a5563..58be312a2 100644 --- a/src/parsing.cpp +++ b/src/parsing.cpp @@ -6,7 +6,7 @@ #include <botan/parsing.h> #include <botan/exceptn.h> #include <botan/charset.h> -#include <botan/bit_ops.h> +#include <botan/loadstor.h> namespace Botan { diff --git a/src/pkcs5.cpp b/src/pkcs5.cpp index c762ecf31..6ed5ba0a9 100644 --- a/src/pkcs5.cpp +++ b/src/pkcs5.cpp @@ -5,6 +5,7 @@ #include <botan/pkcs5.h> #include <botan/lookup.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> #include <botan/hmac.h> #include <algorithm> diff --git a/src/prf_x942.cpp b/src/prf_x942.cpp index 99f223107..8ede79efa 100644 --- a/src/prf_x942.cpp +++ b/src/prf_x942.cpp @@ -7,7 +7,7 @@ #include <botan/der_enc.h> #include <botan/oids.h> #include <botan/lookup.h> -#include <botan/bit_ops.h> +#include <botan/loadstor.h> #include <algorithm> #include <memory> diff --git a/src/pubkey.cpp b/src/pubkey.cpp index cf9cb927c..dae6ee936 100644 --- a/src/pubkey.cpp +++ b/src/pubkey.cpp @@ -4,12 +4,12 @@ *************************************************/ #include <botan/pubkey.h> +#include <botan/lookup.h> #include <botan/der_enc.h> #include <botan/ber_dec.h> #include <botan/bigint.h> #include <botan/parsing.h> #include <botan/bit_ops.h> -#include <botan/lookup.h> #include <memory> namespace Botan { diff --git a/src/randpool.cpp b/src/randpool.cpp index f51660160..7ee4216ac 100644 --- a/src/randpool.cpp +++ b/src/randpool.cpp @@ -5,6 +5,7 @@ #include <botan/randpool.h> #include <botan/lookup.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> #include <botan/util.h> #include <algorithm> diff --git a/src/rc2.cpp b/src/rc2.cpp index e59e7d669..2462e52ad 100644 --- a/src/rc2.cpp +++ b/src/rc2.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/rc2.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> namespace Botan { diff --git a/src/rc5.cpp b/src/rc5.cpp index 3e87dc8ab..00d72f486 100644 --- a/src/rc5.cpp +++ b/src/rc5.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/rc5.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> #include <botan/parsing.h> #include <algorithm> diff --git a/src/rc6.cpp b/src/rc6.cpp index e7c8a4725..6a22b96ce 100644 --- a/src/rc6.cpp +++ b/src/rc6.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/rc6.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> #include <algorithm> diff --git a/src/reducer.cpp b/src/reducer.cpp index 3e6d11e1c..03748d3af 100644 --- a/src/reducer.cpp +++ b/src/reducer.cpp @@ -4,7 +4,6 @@ *************************************************/ #include <botan/reducer.h> -#include <botan/bit_ops.h> #include <botan/numthry.h> #include <botan/mp_core.h> diff --git a/src/rmd128.cpp b/src/rmd128.cpp index ea7c11342..f0a573db7 100644 --- a/src/rmd128.cpp +++ b/src/rmd128.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/rmd128.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> namespace Botan { diff --git a/src/rmd160.cpp b/src/rmd160.cpp index e092b19a2..fb962813e 100644 --- a/src/rmd160.cpp +++ b/src/rmd160.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/rmd160.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> namespace Botan { diff --git a/src/seed.cpp b/src/seed.cpp index 765466ab6..38eefc147 100644 --- a/src/seed.cpp +++ b/src/seed.cpp @@ -4,7 +4,7 @@ *************************************************/ #include <botan/seed.h> -#include <botan/bit_ops.h> +#include <botan/loadstor.h> namespace Botan { diff --git a/src/serpent.cpp b/src/serpent.cpp index 6bd7132a8..15c1c9b3c 100644 --- a/src/serpent.cpp +++ b/src/serpent.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/serpent.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> namespace Botan { diff --git a/src/sha160.cpp b/src/sha160.cpp index 7581f3ea0..1e5d7c6f9 100644 --- a/src/sha160.cpp +++ b/src/sha160.cpp @@ -4,7 +4,7 @@ *************************************************/ #include <botan/sha160.h> -#include <botan/bit_ops.h> +#include <botan/loadstor.h> namespace Botan { diff --git a/src/sha256.cpp b/src/sha256.cpp index ae9849a57..533d8f775 100644 --- a/src/sha256.cpp +++ b/src/sha256.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/sha256.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> namespace Botan { diff --git a/src/sha_64.cpp b/src/sha_64.cpp index 233071e21..6cdf88433 100644 --- a/src/sha_64.cpp +++ b/src/sha_64.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/sha_64.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> namespace Botan { diff --git a/src/skipjack.cpp b/src/skipjack.cpp index 969841b53..d79c1d13f 100644 --- a/src/skipjack.cpp +++ b/src/skipjack.cpp @@ -4,7 +4,7 @@ *************************************************/ #include <botan/skipjack.h> -#include <botan/bit_ops.h> +#include <botan/loadstor.h> namespace Botan { diff --git a/src/square.cpp b/src/square.cpp index 988e56ef5..919c748c0 100644 --- a/src/square.cpp +++ b/src/square.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/square.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> namespace Botan { diff --git a/src/tea.cpp b/src/tea.cpp index cb1cac79a..432927f7d 100644 --- a/src/tea.cpp +++ b/src/tea.cpp @@ -4,7 +4,7 @@ *************************************************/ #include <botan/tea.h> -#include <botan/bit_ops.h> +#include <botan/loadstor.h> namespace Botan { diff --git a/src/tiger.cpp b/src/tiger.cpp index a4dd657b2..ef2022568 100644 --- a/src/tiger.cpp +++ b/src/tiger.cpp @@ -4,7 +4,7 @@ *************************************************/ #include <botan/tiger.h> -#include <botan/bit_ops.h> +#include <botan/loadstor.h> #include <botan/parsing.h> namespace Botan { diff --git a/src/turing.cpp b/src/turing.cpp index bf539117c..d2a6d9a5a 100644 --- a/src/turing.cpp +++ b/src/turing.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/turing.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> namespace Botan { diff --git a/src/twofish.cpp b/src/twofish.cpp index f25891ebf..779f966cc 100644 --- a/src/twofish.cpp +++ b/src/twofish.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/twofish.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> namespace Botan { diff --git a/src/whrlpool.cpp b/src/whrlpool.cpp index 960095d9b..f0d9da01e 100644 --- a/src/whrlpool.cpp +++ b/src/whrlpool.cpp @@ -4,7 +4,7 @@ *************************************************/ #include <botan/whrlpool.h> -#include <botan/bit_ops.h> +#include <botan/loadstor.h> namespace Botan { diff --git a/src/wid_wake.cpp b/src/wid_wake.cpp index fe3fd8dab..0a9b6f698 100644 --- a/src/wid_wake.cpp +++ b/src/wid_wake.cpp @@ -4,6 +4,7 @@ *************************************************/ #include <botan/wid_wake.h> +#include <botan/loadstor.h> #include <botan/bit_ops.h> namespace Botan { diff --git a/src/xtea.cpp b/src/xtea.cpp index 5ecf3054e..b5d935513 100644 --- a/src/xtea.cpp +++ b/src/xtea.cpp @@ -4,7 +4,7 @@ *************************************************/ #include <botan/xtea.h> -#include <botan/bit_ops.h> +#include <botan/loadstor.h> #include <botan/parsing.h> namespace Botan { |