diff options
Diffstat (limited to 'src/lib')
171 files changed, 575 insertions, 300 deletions
diff --git a/src/lib/asn1/oids.h b/src/lib/asn1/oids.h index 480e4f982..1f8f88905 100644 --- a/src/lib/asn1/oids.h +++ b/src/lib/asn1/oids.h @@ -65,12 +65,18 @@ inline bool BOTAN_DEPRECATED("Use oid == OID::from_string(name)") name_of(const return (oid == str2oid_or_empty(name)); } -inline std::string BOTAN_DEPRECATED("Use oid2str_or_empty") lookup(const OID& oid) +/** +* Prefer oid2str_or_empty +*/ +inline std::string lookup(const OID& oid) { return oid2str_or_empty(oid); } -inline OID BOTAN_DEPRECATED("Use str2oid_or_empty") lookup(const std::string& name) +/** +* Prefer str2oid_or_empty +*/ +inline OID lookup(const std::string& name) { return str2oid_or_empty(name); } diff --git a/src/lib/base/buf_comp.cpp b/src/lib/base/buf_comp.cpp new file mode 100644 index 000000000..e9a33c9d7 --- /dev/null +++ b/src/lib/base/buf_comp.cpp @@ -0,0 +1,54 @@ +/* +* (C) 2019 Jack Lloyd +* +* Botan is released under the Simplified BSD License (see license.txt) +*/ + +#include <botan/buf_comp.h> +#include <botan/loadstor.h> + +namespace Botan { + +void Buffered_Computation::update_be(uint16_t val) + { + uint8_t inb[sizeof(val)]; + store_be(val, inb); + add_data(inb, sizeof(inb)); + } + +void Buffered_Computation::update_be(uint32_t val) + { + uint8_t inb[sizeof(val)]; + store_be(val, inb); + add_data(inb, sizeof(inb)); + } + +void Buffered_Computation::update_be(uint64_t val) + { + uint8_t inb[sizeof(val)]; + store_be(val, inb); + add_data(inb, sizeof(inb)); + } + +void Buffered_Computation::update_le(uint16_t val) + { + uint8_t inb[sizeof(val)]; + store_le(val, inb); + add_data(inb, sizeof(inb)); + } + +void Buffered_Computation::update_le(uint32_t val) + { + uint8_t inb[sizeof(val)]; + store_le(val, inb); + add_data(inb, sizeof(inb)); + } + +void Buffered_Computation::update_le(uint64_t val) + { + uint8_t inb[sizeof(val)]; + store_le(val, inb); + add_data(inb, sizeof(inb)); + } + +} diff --git a/src/lib/base/buf_comp.h b/src/lib/base/buf_comp.h index e1971c458..31bf48529 100644 --- a/src/lib/base/buf_comp.h +++ b/src/lib/base/buf_comp.h @@ -9,7 +9,6 @@ #define BOTAN_BUFFERED_COMPUTATION_H_ #include <botan/secmem.h> -#include <botan/loadstor.h> #include <string> namespace Botan { @@ -51,27 +50,13 @@ class BOTAN_PUBLIC_API(2,0) Buffered_Computation add_data(in.data(), in.size()); } - /** - * Add an integer in big-endian order - * @param in the value - */ - template<typename T> void update_be(const T in) - { - uint8_t inb[sizeof(T)]; - store_be(in, inb); - add_data(inb, sizeof(inb)); - } + void update_be(uint16_t val); + void update_be(uint32_t val); + void update_be(uint64_t val); - /** - * Add an integer in little-endian order - * @param in the value - */ - template<typename T> void update_le(const T in) - { - uint8_t inb[sizeof(T)]; - store_le(in, inb); - add_data(inb, sizeof(inb)); - } + void update_le(uint16_t val); + void update_le(uint32_t val); + void update_le(uint64_t val); /** * Add new input to process. diff --git a/src/lib/base/scan_name.h b/src/lib/base/scan_name.h index 4028ce9ab..069783d1b 100644 --- a/src/lib/base/scan_name.h +++ b/src/lib/base/scan_name.h @@ -12,6 +12,8 @@ #include <string> #include <vector> +BOTAN_FUTURE_INTERNAL_HEADER(scan_name.h) + namespace Botan { /** diff --git a/src/lib/block/aes/aes.h b/src/lib/block/aes/aes.h index 6083467b6..84d997d05 100644 --- a/src/lib/block/aes/aes.h +++ b/src/lib/block/aes/aes.h @@ -10,6 +10,8 @@ #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(aes.h) + namespace Botan { /** diff --git a/src/lib/block/aes/aes_vperm/aes_vperm.cpp b/src/lib/block/aes/aes_vperm/aes_vperm.cpp index b7e82876c..811dc10b5 100644 --- a/src/lib/block/aes/aes_vperm/aes_vperm.cpp +++ b/src/lib/block/aes/aes_vperm/aes_vperm.cpp @@ -41,6 +41,15 @@ inline SIMD_4x32 shuffle(SIMD_4x32 a, SIMD_4x32 b) return SIMD_4x32(vreinterpretq_u32_u8(vqtbl1q_u8(tbl, idx))); #endif +#elif defined(BOTAN_SIMD_USE_ALTIVEC) + __vector unsigned char bv = (__vector unsigned char)b.raw(); + + const auto high_bit = vec_sl(vec_sr(bv, vec_splat_u8(7)), vec_splat_u8(4)); + bv = vec_and(bv, vec_splat_u8(0x0F)); + bv = vec_add(bv, high_bit); + + const __vector unsigned int zero = vec_splat_u32(0); + return SIMD_4x32(vec_perm(a.raw(), zero, bv)); #else #error "No shuffle implementation available" #endif @@ -53,6 +62,16 @@ inline SIMD_4x32 shift_elems_left(SIMD_4x32 x) return SIMD_4x32(_mm_slli_si128(x.raw(), 4*I)); #elif defined(BOTAN_SIMD_USE_NEON) return SIMD_4x32(vreinterpretq_u32_u8(vextq_u8(vdupq_n_u8(0), vreinterpretq_u8_u32(x.raw()), 16 - 4*I))); +#elif defined(BOTAN_SIMD_USE_ALTIVEC) + const __vector unsigned int zero = vec_splat_u32(0); + + const __vector unsigned char shuf[3] = { + { 16, 17, 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }, + { 16, 17, 18, 19, 20, 21, 22, 23, 0, 1, 2, 3, 4, 5, 6, 7 }, + { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 0, 1, 2, 3 }, + }; + + return SIMD_4x32(vec_perm(x.raw(), zero, shuf[I-1])); #else #error "No shift_elems_left implementation available" #endif @@ -64,6 +83,9 @@ inline SIMD_4x32 alignr8(SIMD_4x32 a, SIMD_4x32 b) return SIMD_4x32(_mm_alignr_epi8(a.raw(), b.raw(), 8)); #elif defined(BOTAN_SIMD_USE_NEON) return SIMD_4x32(vreinterpretq_u32_u8(vextq_u8(vreinterpretq_u8_u32(b.raw()), vreinterpretq_u8_u32(a.raw()), 8))); +#elif defined(BOTAN_SIMD_USE_ALTIVEC) + const __vector unsigned char mask = {8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23}; + return SIMD_4x32(vec_perm(b.raw(), a.raw(), mask)); #else #error "No alignr8 implementation available" #endif @@ -105,17 +127,15 @@ const SIMD_4x32 rcon[10] = { SIMD_4x32(0x00000083, 0x00000000, 0x00000000, 0x00000000), }; -const SIMD_4x32 lo_nibs_mask = SIMD_4x32::splat_u8(0x0F); -const SIMD_4x32 hi_nibs_mask = SIMD_4x32::splat_u8(0xF0); -const SIMD_4x32 xor_5B = SIMD_4x32::splat_u8(0x5B); - inline SIMD_4x32 low_nibs(SIMD_4x32 x) { + const SIMD_4x32 lo_nibs_mask = SIMD_4x32::splat_u8(0x0F); return lo_nibs_mask & x; } inline SIMD_4x32 high_nibs(SIMD_4x32 x) { + const SIMD_4x32 hi_nibs_mask = SIMD_4x32::splat_u8(0xF0); return (hi_nibs_mask & x).shr<4>(); } @@ -418,7 +438,7 @@ SIMD_4x32 aes_schedule_mangle(SIMD_4x32 k, uint8_t round_no) const SIMD_4x32 mc_forward0(0x00030201, 0x04070605, 0x080B0A09, 0x0C0F0E0D); const SIMD_4x32 srx(sr[round_no % 4]); - SIMD_4x32 t = shuffle(k ^ xor_5B, mc_forward0); + SIMD_4x32 t = shuffle(k ^ SIMD_4x32::splat_u8(0x5B), mc_forward0); SIMD_4x32 t2 = t; t = shuffle(t, mc_forward0); t2 = t ^ t2 ^ shuffle(t, mc_forward0); @@ -461,7 +481,7 @@ SIMD_4x32 aes_schedule_mangle_last(SIMD_4x32 k, uint8_t round_no) const SIMD_4x32 out_tr2(0x50BCEC00, 0x01EDBD51, 0xB05C0CE0, 0xE10D5DB1); k = shuffle(k, sr[round_no % 4]); - k ^= xor_5B; + k ^= SIMD_4x32::splat_u8(0x5B); return aes_schedule_transform(k, out_tr1, out_tr2); } @@ -470,7 +490,7 @@ SIMD_4x32 aes_schedule_mangle_last_dec(SIMD_4x32 k) const SIMD_4x32 deskew1(0x47A4E300, 0x07E4A340, 0x5DBEF91A, 0x1DFEB95A); const SIMD_4x32 deskew2(0x83EA6900, 0x5F36B5DC, 0xF49D1E77, 0x2841C2AB); - k ^= xor_5B; + k ^= SIMD_4x32::splat_u8(0x5B); return aes_schedule_transform(k, deskew1, deskew2); } @@ -478,20 +498,17 @@ SIMD_4x32 aes_schedule_round(SIMD_4x32 input1, SIMD_4x32 input2) { SIMD_4x32 smeared = input2 ^ shift_elems_left<1>(input2); smeared ^= shift_elems_left<2>(smeared); - smeared ^= xor_5B; - - SIMD_4x32 t = high_nibs(input1); - input1 = low_nibs(input1); + smeared ^= SIMD_4x32::splat_u8(0x5B); - SIMD_4x32 t2 = shuffle(k_inv2, input1); + const SIMD_4x32 Bh = high_nibs(input1); + SIMD_4x32 Bl = low_nibs(input1); - input1 ^= t; + const SIMD_4x32 t2 = shuffle(k_inv2, Bl); - SIMD_4x32 t3 = t2 ^ shuffle(k_inv1, t); - SIMD_4x32 t4 = t2 ^ shuffle(k_inv1, input1); + Bl ^= Bh; - SIMD_4x32 t5 = input1 ^ shuffle(k_inv1, t3); - SIMD_4x32 t6 = t ^ shuffle(k_inv1, t4); + SIMD_4x32 t5 = Bl ^ shuffle(k_inv1, t2 ^ shuffle(k_inv1, Bh)); + SIMD_4x32 t6 = Bh ^ shuffle(k_inv1, t2 ^ shuffle(k_inv1, Bl)); return smeared ^ shuffle(sb1u, t5) ^ shuffle(sb1t, t6); } diff --git a/src/lib/block/aes/aes_vperm/info.txt b/src/lib/block/aes/aes_vperm/info.txt index f771ca2c3..0b7eabaac 100644 --- a/src/lib/block/aes/aes_vperm/info.txt +++ b/src/lib/block/aes/aes_vperm/info.txt @@ -2,6 +2,8 @@ AES_VPERM -> 20190901 </defines> +endian little + <isa> x86_32:sse2 x86_64:sse2 @@ -9,6 +11,8 @@ x86_32:ssse3 x86_64:ssse3 arm32:neon arm64:neon +ppc32:altivec +ppc64:altivec </isa> <arch> @@ -16,6 +20,8 @@ x86_32 x86_64 arm32 arm64 +ppc32 +ppc64 </arch> <requires> diff --git a/src/lib/block/aria/aria.h b/src/lib/block/aria/aria.h index 374277686..507226b7d 100644 --- a/src/lib/block/aria/aria.h +++ b/src/lib/block/aria/aria.h @@ -18,6 +18,8 @@ #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(aria.h) + namespace Botan { /** diff --git a/src/lib/block/blowfish/blowfish.h b/src/lib/block/blowfish/blowfish.h index 97a1b841c..3ba39cbdb 100644 --- a/src/lib/block/blowfish/blowfish.h +++ b/src/lib/block/blowfish/blowfish.h @@ -10,6 +10,8 @@ #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(blowfish.h) + namespace Botan { /** diff --git a/src/lib/block/camellia/camellia.h b/src/lib/block/camellia/camellia.h index 3d639bf77..4995eb0c9 100644 --- a/src/lib/block/camellia/camellia.h +++ b/src/lib/block/camellia/camellia.h @@ -10,6 +10,8 @@ #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(camellia.h) + namespace Botan { /** diff --git a/src/lib/block/cascade/cascade.h b/src/lib/block/cascade/cascade.h index 8a641fc2f..26f513381 100644 --- a/src/lib/block/cascade/cascade.h +++ b/src/lib/block/cascade/cascade.h @@ -10,6 +10,8 @@ #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(cascade.h) + namespace Botan { /** diff --git a/src/lib/block/cast128/cast128.h b/src/lib/block/cast128/cast128.h index 3a1740777..a5f2a6401 100644 --- a/src/lib/block/cast128/cast128.h +++ b/src/lib/block/cast128/cast128.h @@ -10,6 +10,8 @@ #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(cast128.h) + namespace Botan { /** diff --git a/src/lib/block/cast256/cast256.h b/src/lib/block/cast256/cast256.h index 798649ef7..3c3016937 100644 --- a/src/lib/block/cast256/cast256.h +++ b/src/lib/block/cast256/cast256.h @@ -10,6 +10,8 @@ #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(cast256.h) + namespace Botan { /** diff --git a/src/lib/block/des/des.h b/src/lib/block/des/des.h index 7ba563545..d8bbcfdd1 100644 --- a/src/lib/block/des/des.h +++ b/src/lib/block/des/des.h @@ -10,6 +10,8 @@ #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(des.h) + namespace Botan { /** diff --git a/src/lib/block/des/desx.h b/src/lib/block/des/desx.h index fa9a99663..0189a9982 100644 --- a/src/lib/block/des/desx.h +++ b/src/lib/block/des/desx.h @@ -10,6 +10,8 @@ #include <botan/des.h> +BOTAN_FUTURE_INTERNAL_HEADER(desx.h) + namespace Botan { /** diff --git a/src/lib/block/gost_28147/gost_28147.h b/src/lib/block/gost_28147/gost_28147.h index 34e45779b..f71bb28bd 100644 --- a/src/lib/block/gost_28147/gost_28147.h +++ b/src/lib/block/gost_28147/gost_28147.h @@ -10,6 +10,8 @@ #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(gost_28147.h) + namespace Botan { /** diff --git a/src/lib/block/idea/idea.h b/src/lib/block/idea/idea.h index 4c45a3aaa..e5e51606b 100644 --- a/src/lib/block/idea/idea.h +++ b/src/lib/block/idea/idea.h @@ -10,6 +10,8 @@ #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(idea.h) + namespace Botan { /** diff --git a/src/lib/block/kasumi/kasumi.h b/src/lib/block/kasumi/kasumi.h index 4a3712cd2..9ea09a103 100644 --- a/src/lib/block/kasumi/kasumi.h +++ b/src/lib/block/kasumi/kasumi.h @@ -10,6 +10,8 @@ #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(kasumi.h) + namespace Botan { /** diff --git a/src/lib/block/lion/lion.h b/src/lib/block/lion/lion.h index 846c3cd30..fa8e9f414 100644 --- a/src/lib/block/lion/lion.h +++ b/src/lib/block/lion/lion.h @@ -12,6 +12,8 @@ #include <botan/stream_cipher.h> #include <botan/hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(lion.h) + namespace Botan { /** diff --git a/src/lib/block/misty1/misty1.h b/src/lib/block/misty1/misty1.h index c63e3713e..b6c4abbd5 100644 --- a/src/lib/block/misty1/misty1.h +++ b/src/lib/block/misty1/misty1.h @@ -10,6 +10,8 @@ #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(misty1.h) + namespace Botan { /** diff --git a/src/lib/block/noekeon/noekeon.h b/src/lib/block/noekeon/noekeon.h index a93266309..9e7e4a5ff 100644 --- a/src/lib/block/noekeon/noekeon.h +++ b/src/lib/block/noekeon/noekeon.h @@ -10,6 +10,8 @@ #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(noekeon.h) + namespace Botan { /** diff --git a/src/lib/block/seed/seed.h b/src/lib/block/seed/seed.h index e30293645..a61624313 100644 --- a/src/lib/block/seed/seed.h +++ b/src/lib/block/seed/seed.h @@ -10,6 +10,8 @@ #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(seed.h) + namespace Botan { /** diff --git a/src/lib/block/serpent/serpent.h b/src/lib/block/serpent/serpent.h index 641ee0b9c..64eb8a8b0 100644 --- a/src/lib/block/serpent/serpent.h +++ b/src/lib/block/serpent/serpent.h @@ -10,6 +10,8 @@ #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(serpent.h) + namespace Botan { /** diff --git a/src/lib/block/shacal2/shacal2.h b/src/lib/block/shacal2/shacal2.h index c4a8f2073..9a1ccff03 100644 --- a/src/lib/block/shacal2/shacal2.h +++ b/src/lib/block/shacal2/shacal2.h @@ -10,6 +10,8 @@ #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(shacal2.h) + namespace Botan { /** diff --git a/src/lib/block/sm4/sm4.h b/src/lib/block/sm4/sm4.h index 7d1d8ba98..637ffd4be 100644 --- a/src/lib/block/sm4/sm4.h +++ b/src/lib/block/sm4/sm4.h @@ -10,6 +10,8 @@ #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(sm4.h) + namespace Botan { /** diff --git a/src/lib/block/threefish_512/threefish_512.h b/src/lib/block/threefish_512/threefish_512.h index 2e936b25f..f3adf71a9 100644 --- a/src/lib/block/threefish_512/threefish_512.h +++ b/src/lib/block/threefish_512/threefish_512.h @@ -10,6 +10,8 @@ #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(threefish_512.h) + namespace Botan { /** diff --git a/src/lib/block/twofish/twofish.h b/src/lib/block/twofish/twofish.h index 8201ede76..027e2c701 100644 --- a/src/lib/block/twofish/twofish.h +++ b/src/lib/block/twofish/twofish.h @@ -10,6 +10,8 @@ #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(twofish.h) + namespace Botan { /** diff --git a/src/lib/block/xtea/xtea.h b/src/lib/block/xtea/xtea.h index 5ec94fd05..bae0bc7e6 100644 --- a/src/lib/block/xtea/xtea.h +++ b/src/lib/block/xtea/xtea.h @@ -10,6 +10,8 @@ #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(xtea.h) + namespace Botan { /** diff --git a/src/lib/filters/secqueue.h b/src/lib/filters/secqueue.h index 00616f5cf..42d2f09e2 100644 --- a/src/lib/filters/secqueue.h +++ b/src/lib/filters/secqueue.h @@ -12,6 +12,8 @@ #include <botan/data_src.h> #include <botan/filter.h> +BOTAN_FUTURE_INTERNAL_HEADER(secqueue.h) + namespace Botan { /** diff --git a/src/lib/hash/blake2/blake2b.h b/src/lib/hash/blake2/blake2b.h index 1c47e32cc..9b0b655f2 100644 --- a/src/lib/hash/blake2/blake2b.h +++ b/src/lib/hash/blake2/blake2b.h @@ -12,6 +12,8 @@ #include <string> #include <memory> +BOTAN_FUTURE_INTERNAL_HEADER(blake2b.h) + namespace Botan { /** diff --git a/src/lib/hash/checksum/adler32/adler32.h b/src/lib/hash/checksum/adler32/adler32.h index f0aac72b5..cd84a7597 100644 --- a/src/lib/hash/checksum/adler32/adler32.h +++ b/src/lib/hash/checksum/adler32/adler32.h @@ -10,6 +10,8 @@ #include <botan/hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(adler32.h) + namespace Botan { /** diff --git a/src/lib/hash/checksum/crc24/crc24.h b/src/lib/hash/checksum/crc24/crc24.h index cebb171f6..1809740a4 100644 --- a/src/lib/hash/checksum/crc24/crc24.h +++ b/src/lib/hash/checksum/crc24/crc24.h @@ -11,6 +11,8 @@ #include <botan/hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(crc24.h) + namespace Botan { /** diff --git a/src/lib/hash/checksum/crc32/crc32.h b/src/lib/hash/checksum/crc32/crc32.h index 2c24acf04..f712b42ca 100644 --- a/src/lib/hash/checksum/crc32/crc32.h +++ b/src/lib/hash/checksum/crc32/crc32.h @@ -10,6 +10,8 @@ #include <botan/hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(crc32.h) + namespace Botan { /** diff --git a/src/lib/hash/comb4p/comb4p.h b/src/lib/hash/comb4p/comb4p.h index 6e47151bd..518314c17 100644 --- a/src/lib/hash/comb4p/comb4p.h +++ b/src/lib/hash/comb4p/comb4p.h @@ -10,6 +10,8 @@ #include <botan/hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(comb4p.h) + namespace Botan { /** diff --git a/src/lib/hash/gost_3411/gost_3411.cpp b/src/lib/hash/gost_3411/gost_3411.cpp index 27773c795..e3bcd2110 100644 --- a/src/lib/hash/gost_3411/gost_3411.cpp +++ b/src/lib/hash/gost_3411/gost_3411.cpp @@ -6,6 +6,7 @@ */ #include <botan/gost_3411.h> +#include <botan/loadstor.h> namespace Botan { diff --git a/src/lib/hash/gost_3411/gost_3411.h b/src/lib/hash/gost_3411/gost_3411.h index 9bafa6828..51d7aa477 100644 --- a/src/lib/hash/gost_3411/gost_3411.h +++ b/src/lib/hash/gost_3411/gost_3411.h @@ -11,6 +11,8 @@ #include <botan/hash.h> #include <botan/gost_28147.h> +BOTAN_FUTURE_INTERNAL_HEADER(gost_3411.h) + namespace Botan { /** diff --git a/src/lib/hash/keccak/keccak.cpp b/src/lib/hash/keccak/keccak.cpp index f79a7f3ce..b8196495c 100644 --- a/src/lib/hash/keccak/keccak.cpp +++ b/src/lib/hash/keccak/keccak.cpp @@ -8,6 +8,7 @@ #include <botan/keccak.h> #include <botan/sha3.h> #include <botan/exceptn.h> +#include <botan/loadstor.h> namespace Botan { diff --git a/src/lib/hash/keccak/keccak.h b/src/lib/hash/keccak/keccak.h index b6a50fb6d..083d7fc5a 100644 --- a/src/lib/hash/keccak/keccak.h +++ b/src/lib/hash/keccak/keccak.h @@ -14,6 +14,8 @@ namespace Botan { +BOTAN_FUTURE_INTERNAL_HEADER(keccak.h) + /** * Keccak[1600], a SHA-3 candidate */ diff --git a/src/lib/hash/md4/md4.cpp b/src/lib/hash/md4/md4.cpp index c0c3472de..9cc92e1e3 100644 --- a/src/lib/hash/md4/md4.cpp +++ b/src/lib/hash/md4/md4.cpp @@ -6,6 +6,7 @@ */ #include <botan/md4.h> +#include <botan/loadstor.h> #include <botan/rotate.h> namespace Botan { diff --git a/src/lib/hash/md4/md4.h b/src/lib/hash/md4/md4.h index 1dd857bce..0e6f5dc08 100644 --- a/src/lib/hash/md4/md4.h +++ b/src/lib/hash/md4/md4.h @@ -10,6 +10,8 @@ #include <botan/mdx_hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(md4.h) + namespace Botan { /** diff --git a/src/lib/hash/md5/md5.cpp b/src/lib/hash/md5/md5.cpp index 3b9b4d281..590af4641 100644 --- a/src/lib/hash/md5/md5.cpp +++ b/src/lib/hash/md5/md5.cpp @@ -6,6 +6,7 @@ */ #include <botan/md5.h> +#include <botan/loadstor.h> #include <botan/rotate.h> namespace Botan { diff --git a/src/lib/hash/md5/md5.h b/src/lib/hash/md5/md5.h index 07d10fb7a..182145523 100644 --- a/src/lib/hash/md5/md5.h +++ b/src/lib/hash/md5/md5.h @@ -10,6 +10,8 @@ #include <botan/mdx_hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(md5.h) + namespace Botan { /** diff --git a/src/lib/hash/mdx_hash/mdx_hash.h b/src/lib/hash/mdx_hash/mdx_hash.h index b18c2e270..a061e9c8a 100644 --- a/src/lib/hash/mdx_hash/mdx_hash.h +++ b/src/lib/hash/mdx_hash/mdx_hash.h @@ -10,6 +10,8 @@ #include <botan/hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(mdx_hash.h) + namespace Botan { /** diff --git a/src/lib/hash/par_hash/par_hash.h b/src/lib/hash/par_hash/par_hash.h index 78077cc61..8942cfe4d 100644 --- a/src/lib/hash/par_hash/par_hash.h +++ b/src/lib/hash/par_hash/par_hash.h @@ -11,6 +11,8 @@ #include <botan/hash.h> #include <vector> +BOTAN_FUTURE_INTERNAL_HEADER(par_hash.h) + namespace Botan { /** diff --git a/src/lib/hash/rmd160/rmd160.cpp b/src/lib/hash/rmd160/rmd160.cpp index e85feec08..2fa8f84d0 100644 --- a/src/lib/hash/rmd160/rmd160.cpp +++ b/src/lib/hash/rmd160/rmd160.cpp @@ -6,6 +6,7 @@ */ #include <botan/rmd160.h> +#include <botan/loadstor.h> #include <botan/rotate.h> namespace Botan { diff --git a/src/lib/hash/rmd160/rmd160.h b/src/lib/hash/rmd160/rmd160.h index daba812d9..2ee311680 100644 --- a/src/lib/hash/rmd160/rmd160.h +++ b/src/lib/hash/rmd160/rmd160.h @@ -10,6 +10,8 @@ #include <botan/mdx_hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(rmd160.h) + namespace Botan { /** diff --git a/src/lib/hash/sha1/sha160.cpp b/src/lib/hash/sha1/sha160.cpp index 4170722b1..5893c5dc7 100644 --- a/src/lib/hash/sha1/sha160.cpp +++ b/src/lib/hash/sha1/sha160.cpp @@ -6,6 +6,7 @@ */ #include <botan/sha160.h> +#include <botan/loadstor.h> #include <botan/rotate.h> #include <botan/cpuid.h> diff --git a/src/lib/hash/sha1/sha160.h b/src/lib/hash/sha1/sha160.h index 9f7035ee6..bbab2e853 100644 --- a/src/lib/hash/sha1/sha160.h +++ b/src/lib/hash/sha1/sha160.h @@ -10,6 +10,8 @@ #include <botan/mdx_hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(sha160.h) + namespace Botan { /** diff --git a/src/lib/hash/sha2_32/sha2_32.cpp b/src/lib/hash/sha2_32/sha2_32.cpp index 1f1ab69f4..61e98d22f 100644 --- a/src/lib/hash/sha2_32/sha2_32.cpp +++ b/src/lib/hash/sha2_32/sha2_32.cpp @@ -7,6 +7,7 @@ */ #include <botan/sha2_32.h> +#include <botan/loadstor.h> #include <botan/rotate.h> #include <botan/cpuid.h> diff --git a/src/lib/hash/sha2_32/sha2_32.h b/src/lib/hash/sha2_32/sha2_32.h index 7a3fce9d2..90a059721 100644 --- a/src/lib/hash/sha2_32/sha2_32.h +++ b/src/lib/hash/sha2_32/sha2_32.h @@ -11,6 +11,8 @@ #include <botan/mdx_hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(sha2_32.h) + namespace Botan { /** diff --git a/src/lib/hash/sha2_32/sha2_32_bmi2/sha2_32_bmi2.cpp b/src/lib/hash/sha2_32/sha2_32_bmi2/sha2_32_bmi2.cpp index 12ceb11c4..e3194e4af 100644 --- a/src/lib/hash/sha2_32/sha2_32_bmi2/sha2_32_bmi2.cpp +++ b/src/lib/hash/sha2_32/sha2_32_bmi2/sha2_32_bmi2.cpp @@ -5,6 +5,7 @@ */ #include <botan/sha2_32.h> +#include <botan/loadstor.h> #include <botan/rotate.h> namespace Botan { diff --git a/src/lib/hash/sha2_64/sha2_64.cpp b/src/lib/hash/sha2_64/sha2_64.cpp index e554b3aa5..01abb4f00 100644 --- a/src/lib/hash/sha2_64/sha2_64.cpp +++ b/src/lib/hash/sha2_64/sha2_64.cpp @@ -6,6 +6,7 @@ */ #include <botan/sha2_64.h> +#include <botan/loadstor.h> #include <botan/rotate.h> #include <botan/cpuid.h> diff --git a/src/lib/hash/sha2_64/sha2_64.h b/src/lib/hash/sha2_64/sha2_64.h index ec3512dfc..dc5f0dd18 100644 --- a/src/lib/hash/sha2_64/sha2_64.h +++ b/src/lib/hash/sha2_64/sha2_64.h @@ -10,6 +10,8 @@ #include <botan/mdx_hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(sha2_64.h) + namespace Botan { /** diff --git a/src/lib/hash/sha2_64/sha2_64_bmi2/sha2_64_bmi2.cpp b/src/lib/hash/sha2_64/sha2_64_bmi2/sha2_64_bmi2.cpp index 202dadbbe..1ef0ecc56 100644 --- a/src/lib/hash/sha2_64/sha2_64_bmi2/sha2_64_bmi2.cpp +++ b/src/lib/hash/sha2_64/sha2_64_bmi2/sha2_64_bmi2.cpp @@ -5,6 +5,7 @@ */ #include <botan/sha2_64.h> +#include <botan/loadstor.h> #include <botan/rotate.h> namespace Botan { diff --git a/src/lib/hash/sha3/sha3.cpp b/src/lib/hash/sha3/sha3.cpp index d01d33635..690c2b264 100644 --- a/src/lib/hash/sha3/sha3.cpp +++ b/src/lib/hash/sha3/sha3.cpp @@ -6,6 +6,7 @@ */ #include <botan/sha3.h> +#include <botan/loadstor.h> #include <botan/rotate.h> #include <botan/exceptn.h> #include <botan/cpuid.h> diff --git a/src/lib/hash/sha3/sha3.h b/src/lib/hash/sha3/sha3.h index 310468599..e290e60a2 100644 --- a/src/lib/hash/sha3/sha3.h +++ b/src/lib/hash/sha3/sha3.h @@ -12,6 +12,8 @@ #include <botan/secmem.h> #include <string> +BOTAN_FUTURE_INTERNAL_HEADER(sha3.h) + namespace Botan { /** diff --git a/src/lib/hash/shake/shake.h b/src/lib/hash/shake/shake.h index 72b8e123e..c52df136b 100644 --- a/src/lib/hash/shake/shake.h +++ b/src/lib/hash/shake/shake.h @@ -12,6 +12,8 @@ #include <botan/secmem.h> #include <string> +BOTAN_FUTURE_INTERNAL_HEADER(shake.h) + namespace Botan { /** diff --git a/src/lib/hash/skein/skein_512.cpp b/src/lib/hash/skein/skein_512.cpp index 67b02e5c1..edf95d596 100644 --- a/src/lib/hash/skein/skein_512.cpp +++ b/src/lib/hash/skein/skein_512.cpp @@ -6,6 +6,7 @@ */ #include <botan/skein_512.h> +#include <botan/loadstor.h> #include <botan/exceptn.h> #include <algorithm> diff --git a/src/lib/hash/skein/skein_512.h b/src/lib/hash/skein/skein_512.h index 8bf6e3e7a..0bf173ceb 100644 --- a/src/lib/hash/skein/skein_512.h +++ b/src/lib/hash/skein/skein_512.h @@ -13,6 +13,8 @@ #include <string> #include <memory> +BOTAN_FUTURE_INTERNAL_HEADER(skin_512.h) + namespace Botan { /** diff --git a/src/lib/hash/sm3/sm3.cpp b/src/lib/hash/sm3/sm3.cpp index 4c746ce2f..cfd1409cd 100644 --- a/src/lib/hash/sm3/sm3.cpp +++ b/src/lib/hash/sm3/sm3.cpp @@ -6,6 +6,7 @@ */ #include <botan/sm3.h> +#include <botan/loadstor.h> #include <botan/rotate.h> namespace Botan { diff --git a/src/lib/hash/sm3/sm3.h b/src/lib/hash/sm3/sm3.h index 56471e7d1..268bd87fb 100644 --- a/src/lib/hash/sm3/sm3.h +++ b/src/lib/hash/sm3/sm3.h @@ -10,6 +10,8 @@ #include <botan/mdx_hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(sm3.h) + namespace Botan { enum { diff --git a/src/lib/hash/streebog/streebog.cpp b/src/lib/hash/streebog/streebog.cpp index 0e2a43b78..0134daded 100644 --- a/src/lib/hash/streebog/streebog.cpp +++ b/src/lib/hash/streebog/streebog.cpp @@ -7,6 +7,7 @@ */ #include <botan/streebog.h> +#include <botan/loadstor.h> #include <botan/exceptn.h> namespace Botan { diff --git a/src/lib/hash/streebog/streebog.h b/src/lib/hash/streebog/streebog.h index 2a98beb4e..a573964d8 100644 --- a/src/lib/hash/streebog/streebog.h +++ b/src/lib/hash/streebog/streebog.h @@ -10,6 +10,8 @@ #include <botan/hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(streebog.h) + namespace Botan { /** diff --git a/src/lib/hash/tiger/tiger.cpp b/src/lib/hash/tiger/tiger.cpp index 13ae4a792..ac2038a0f 100644 --- a/src/lib/hash/tiger/tiger.cpp +++ b/src/lib/hash/tiger/tiger.cpp @@ -6,6 +6,7 @@ */ #include <botan/tiger.h> +#include <botan/loadstor.h> #include <botan/exceptn.h> namespace Botan { diff --git a/src/lib/hash/tiger/tiger.h b/src/lib/hash/tiger/tiger.h index ef15fb16e..6e17ce83c 100644 --- a/src/lib/hash/tiger/tiger.h +++ b/src/lib/hash/tiger/tiger.h @@ -10,6 +10,8 @@ #include <botan/mdx_hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(tiger.h) + namespace Botan { /** diff --git a/src/lib/hash/whirlpool/whirlpool.cpp b/src/lib/hash/whirlpool/whirlpool.cpp index f78cc7572..e1ffa4f20 100644 --- a/src/lib/hash/whirlpool/whirlpool.cpp +++ b/src/lib/hash/whirlpool/whirlpool.cpp @@ -6,6 +6,7 @@ */ #include <botan/whrlpool.h> +#include <botan/loadstor.h> namespace Botan { diff --git a/src/lib/hash/whirlpool/whrlpool.h b/src/lib/hash/whirlpool/whrlpool.h index 3a07ea5c5..26ee7f775 100644 --- a/src/lib/hash/whirlpool/whrlpool.h +++ b/src/lib/hash/whirlpool/whrlpool.h @@ -10,6 +10,8 @@ #include <botan/mdx_hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(whrlpool.h) + namespace Botan { /** diff --git a/src/lib/kdf/hkdf/hkdf.cpp b/src/lib/kdf/hkdf/hkdf.cpp index 4b2ee1b3d..679a2ed42 100644 --- a/src/lib/kdf/hkdf/hkdf.cpp +++ b/src/lib/kdf/hkdf/hkdf.cpp @@ -7,6 +7,7 @@ */ #include <botan/hkdf.h> +#include <botan/loadstor.h> namespace Botan { diff --git a/src/lib/kdf/hkdf/hkdf.h b/src/lib/kdf/hkdf/hkdf.h index cd2b13dd8..4b1ed2922 100644 --- a/src/lib/kdf/hkdf/hkdf.h +++ b/src/lib/kdf/hkdf/hkdf.h @@ -12,6 +12,12 @@ #include <botan/mac.h> #include <botan/kdf.h> +/* +* The definitions of HKDF, HKDF_Extract, HKDF_Expand will be made internal +* in the future. However the function hkdf_expand_label will still be defined. +*/ +//BOTAN_FUTURE_INTERNAL_HEADER(hkdf.h) + namespace Botan { /** diff --git a/src/lib/kdf/kdf1/kdf1.h b/src/lib/kdf/kdf1/kdf1.h index 803aae300..388b55251 100644 --- a/src/lib/kdf/kdf1/kdf1.h +++ b/src/lib/kdf/kdf1/kdf1.h @@ -11,6 +11,8 @@ #include <botan/kdf.h> #include <botan/hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(kdf1.h) + namespace Botan { /** diff --git a/src/lib/kdf/kdf1_iso18033/kdf1_iso18033.h b/src/lib/kdf/kdf1_iso18033/kdf1_iso18033.h index 7a95a093b..5f913057e 100644 --- a/src/lib/kdf/kdf1_iso18033/kdf1_iso18033.h +++ b/src/lib/kdf/kdf1_iso18033/kdf1_iso18033.h @@ -11,6 +11,8 @@ #include <botan/kdf.h> #include <botan/hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(kdf1_iso18033.h) + namespace Botan { /** diff --git a/src/lib/kdf/kdf2/kdf2.h b/src/lib/kdf/kdf2/kdf2.h index 2fd40e736..43abbf087 100644 --- a/src/lib/kdf/kdf2/kdf2.h +++ b/src/lib/kdf/kdf2/kdf2.h @@ -11,6 +11,8 @@ #include <botan/kdf.h> #include <botan/hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(kdf2.h) + namespace Botan { /** diff --git a/src/lib/kdf/prf_tls/prf_tls.h b/src/lib/kdf/prf_tls/prf_tls.h index 3ed8db247..a8a30ee2c 100644 --- a/src/lib/kdf/prf_tls/prf_tls.h +++ b/src/lib/kdf/prf_tls/prf_tls.h @@ -11,6 +11,8 @@ #include <botan/kdf.h> #include <botan/mac.h> +BOTAN_FUTURE_INTERNAL_HEADER(prf_tls.h) + namespace Botan { /** diff --git a/src/lib/kdf/prf_x942/prf_x942.h b/src/lib/kdf/prf_x942/prf_x942.h index 4b93d5966..1987b9bc3 100644 --- a/src/lib/kdf/prf_x942/prf_x942.h +++ b/src/lib/kdf/prf_x942/prf_x942.h @@ -11,6 +11,8 @@ #include <botan/kdf.h> #include <botan/asn1_oid.h> +BOTAN_FUTURE_INTERNAL_HEADER(prf_x942.h) + namespace Botan { /** diff --git a/src/lib/kdf/sp800_108/sp800_108.cpp b/src/lib/kdf/sp800_108/sp800_108.cpp index 990e10386..fbeae23cd 100644 --- a/src/lib/kdf/sp800_108/sp800_108.cpp +++ b/src/lib/kdf/sp800_108/sp800_108.cpp @@ -6,6 +6,7 @@ */ #include <botan/sp800_108.h> +#include <botan/loadstor.h> #include <botan/exceptn.h> #include <iterator> diff --git a/src/lib/kdf/sp800_108/sp800_108.h b/src/lib/kdf/sp800_108/sp800_108.h index 25802f69e..46f734e8e 100644 --- a/src/lib/kdf/sp800_108/sp800_108.h +++ b/src/lib/kdf/sp800_108/sp800_108.h @@ -11,6 +11,8 @@ #include <botan/kdf.h> #include <botan/mac.h> +BOTAN_FUTURE_INTERNAL_HEADER(sp800_108.h) + namespace Botan { /** diff --git a/src/lib/kdf/sp800_56a/sp800_56a.h b/src/lib/kdf/sp800_56a/sp800_56a.h index 17fd3a84b..e83f117e2 100644 --- a/src/lib/kdf/sp800_56a/sp800_56a.h +++ b/src/lib/kdf/sp800_56a/sp800_56a.h @@ -13,6 +13,8 @@ #include <botan/hash.h> #include <botan/mac.h> +BOTAN_FUTURE_INTERNAL_HEADER(sp800_56a.h) + namespace Botan { /** diff --git a/src/lib/kdf/sp800_56c/sp800_56c.h b/src/lib/kdf/sp800_56c/sp800_56c.h index a6db91658..bdbdfcd9e 100644 --- a/src/lib/kdf/sp800_56c/sp800_56c.h +++ b/src/lib/kdf/sp800_56c/sp800_56c.h @@ -11,6 +11,8 @@ #include <botan/kdf.h> #include <botan/mac.h> +BOTAN_FUTURE_INTERNAL_HEADER(sp800_56c.h) + namespace Botan { /** diff --git a/src/lib/mac/cbc_mac/cbc_mac.h b/src/lib/mac/cbc_mac/cbc_mac.h index aed3a8caf..ed4eb2bd1 100644 --- a/src/lib/mac/cbc_mac/cbc_mac.h +++ b/src/lib/mac/cbc_mac/cbc_mac.h @@ -11,6 +11,8 @@ #include <botan/mac.h> #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(cbc_mac.h) + namespace Botan { /** diff --git a/src/lib/mac/cmac/cmac.h b/src/lib/mac/cmac/cmac.h index 7f155c6bf..f73167590 100644 --- a/src/lib/mac/cmac/cmac.h +++ b/src/lib/mac/cmac/cmac.h @@ -11,6 +11,8 @@ #include <botan/mac.h> #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(cmac.h) + namespace Botan { /** diff --git a/src/lib/mac/gmac/gmac.h b/src/lib/mac/gmac/gmac.h index 4b02ebf85..b78aeec6f 100644 --- a/src/lib/mac/gmac/gmac.h +++ b/src/lib/mac/gmac/gmac.h @@ -11,6 +11,8 @@ #include <botan/mac.h> +BOTAN_FUTURE_INTERNAL_HEADER(gmac.h) + namespace Botan { class BlockCipher; diff --git a/src/lib/mac/hmac/hmac.h b/src/lib/mac/hmac/hmac.h index 1a6bcd6a0..1f2f4227d 100644 --- a/src/lib/mac/hmac/hmac.h +++ b/src/lib/mac/hmac/hmac.h @@ -11,6 +11,8 @@ #include <botan/mac.h> #include <botan/hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(hmac.h) + namespace Botan { /** diff --git a/src/lib/mac/poly1305/poly1305.h b/src/lib/mac/poly1305/poly1305.h index aa94b5807..fdd01ecd1 100644 --- a/src/lib/mac/poly1305/poly1305.h +++ b/src/lib/mac/poly1305/poly1305.h @@ -11,6 +11,8 @@ #include <botan/mac.h> #include <memory> +BOTAN_FUTURE_INTERNAL_HEADER(poly1305.h) + namespace Botan { /** diff --git a/src/lib/mac/siphash/siphash.cpp b/src/lib/mac/siphash/siphash.cpp index 30fe354b7..566d5d5de 100644 --- a/src/lib/mac/siphash/siphash.cpp +++ b/src/lib/mac/siphash/siphash.cpp @@ -6,6 +6,7 @@ */ #include <botan/siphash.h> +#include <botan/loadstor.h> #include <botan/rotate.h> namespace Botan { diff --git a/src/lib/mac/siphash/siphash.h b/src/lib/mac/siphash/siphash.h index 0e05c8407..d60df8dfc 100644 --- a/src/lib/mac/siphash/siphash.h +++ b/src/lib/mac/siphash/siphash.h @@ -10,6 +10,8 @@ #include <botan/mac.h> +BOTAN_FUTURE_INTERNAL_HEADER(siphash.h) + namespace Botan { class BOTAN_PUBLIC_API(2,0) SipHash final : public MessageAuthenticationCode diff --git a/src/lib/mac/x919_mac/x919_mac.h b/src/lib/mac/x919_mac/x919_mac.h index 3da8048e4..3df38b9aa 100644 --- a/src/lib/mac/x919_mac/x919_mac.h +++ b/src/lib/mac/x919_mac/x919_mac.h @@ -11,6 +11,8 @@ #include <botan/mac.h> #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(x919_mac.h) + namespace Botan { /** diff --git a/src/lib/math/bigint/bigint.cpp b/src/lib/math/bigint/bigint.cpp index 6f5f1f473..bdb0f4214 100644 --- a/src/lib/math/bigint/bigint.cpp +++ b/src/lib/math/bigint/bigint.cpp @@ -10,6 +10,7 @@ #include <botan/internal/rounding.h> #include <botan/internal/bit_ops.h> #include <botan/internal/ct_utils.h> +#include <botan/loadstor.h> namespace Botan { @@ -106,6 +107,12 @@ BigInt::BigInt(RandomNumberGenerator& rng, size_t bits, bool set_high_bit) randomize(rng, bits, set_high_bit); } +uint8_t BigInt::byte_at(size_t n) const + { + return get_byte(sizeof(word) - (n % sizeof(word)) - 1, + word_at(n / sizeof(word))); + } + int32_t BigInt::cmp_word(word other) const { if(is_negative()) diff --git a/src/lib/math/bigint/bigint.h b/src/lib/math/bigint/bigint.h index 505bacde0..ac0a57038 100644 --- a/src/lib/math/bigint/bigint.h +++ b/src/lib/math/bigint/bigint.h @@ -12,7 +12,6 @@ #include <botan/types.h> #include <botan/secmem.h> #include <botan/exceptn.h> -#include <botan/loadstor.h> #include <iosfwd> namespace Botan { @@ -497,11 +496,7 @@ class BOTAN_PUBLIC_API(2,0) BigInt final * @param n the offset to get a byte from * @result byte at offset n */ - uint8_t byte_at(size_t n) const - { - return get_byte(sizeof(word) - (n % sizeof(word)) - 1, - word_at(n / sizeof(word))); - } + uint8_t byte_at(size_t n) const; /** * Return the word at a specified position of the internal register diff --git a/src/lib/math/bigint/divide.h b/src/lib/math/bigint/divide.h index e365dabb3..deb6ffdbb 100644 --- a/src/lib/math/bigint/divide.h +++ b/src/lib/math/bigint/divide.h @@ -10,6 +10,8 @@ #include <botan/bigint.h> +BOTAN_FUTURE_INTERNAL_HEADER(divide.h) + namespace Botan { /** diff --git a/src/lib/math/numbertheory/curve_nistp.h b/src/lib/math/numbertheory/curve_nistp.h index 963526d5a..19d1bd256 100644 --- a/src/lib/math/numbertheory/curve_nistp.h +++ b/src/lib/math/numbertheory/curve_nistp.h @@ -10,6 +10,8 @@ #include <botan/bigint.h> +BOTAN_FUTURE_INTERNAL_HEADER(curve_nistp.h) + namespace Botan { /** diff --git a/src/lib/math/numbertheory/make_prm.cpp b/src/lib/math/numbertheory/make_prm.cpp index 7455a0049..67bdcd678 100644 --- a/src/lib/math/numbertheory/make_prm.cpp +++ b/src/lib/math/numbertheory/make_prm.cpp @@ -8,6 +8,7 @@ #include <botan/numthry.h> #include <botan/rng.h> #include <botan/internal/bit_ops.h> +#include <botan/loadstor.h> #include <algorithm> namespace Botan { diff --git a/src/lib/math/numbertheory/pow_mod.h b/src/lib/math/numbertheory/pow_mod.h index d179d8c85..b465013e5 100644 --- a/src/lib/math/numbertheory/pow_mod.h +++ b/src/lib/math/numbertheory/pow_mod.h @@ -10,6 +10,8 @@ #include <botan/bigint.h> +BOTAN_FUTURE_INTERNAL_HEADER(pow_mod.h) + namespace Botan { class Modular_Exponentiator; diff --git a/src/lib/misc/fpe_fe1/fpe_fe1.cpp b/src/lib/misc/fpe_fe1/fpe_fe1.cpp index 98ada495a..7e3dac502 100644 --- a/src/lib/misc/fpe_fe1/fpe_fe1.cpp +++ b/src/lib/misc/fpe_fe1/fpe_fe1.cpp @@ -6,6 +6,7 @@ */ #include <botan/fpe_fe1.h> +#include <botan/loadstor.h> #include <botan/numthry.h> #include <botan/divide.h> #include <botan/reducer.h> diff --git a/src/lib/misc/hotp/hotp.cpp b/src/lib/misc/hotp/hotp.cpp index 9ca37c101..b92528492 100644 --- a/src/lib/misc/hotp/hotp.cpp +++ b/src/lib/misc/hotp/hotp.cpp @@ -6,6 +6,7 @@ */ #include <botan/hotp.h> +#include <botan/loadstor.h> #include <botan/exceptn.h> namespace Botan { diff --git a/src/lib/modes/aead/ccm/ccm.h b/src/lib/modes/aead/ccm/ccm.h index 37d3c0c04..9b4bcecbf 100644 --- a/src/lib/modes/aead/ccm/ccm.h +++ b/src/lib/modes/aead/ccm/ccm.h @@ -12,6 +12,8 @@ #include <botan/aead.h> #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(ccm.h) + namespace Botan { /** diff --git a/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.cpp b/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.cpp index ca0c55184..2e1d913ef 100644 --- a/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.cpp +++ b/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.cpp @@ -7,6 +7,7 @@ */ #include <botan/chacha20poly1305.h> +#include <botan/loadstor.h> namespace Botan { diff --git a/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.h b/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.h index c7ed615d6..dbba58cc9 100644 --- a/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.h +++ b/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.h @@ -13,6 +13,8 @@ #include <botan/stream_cipher.h> #include <botan/mac.h> +BOTAN_FUTURE_INTERNAL_HEADER(chacha20poly1305.h) + namespace Botan { /** diff --git a/src/lib/modes/aead/eax/eax.h b/src/lib/modes/aead/eax/eax.h index 84a4f3f92..b9b02c192 100644 --- a/src/lib/modes/aead/eax/eax.h +++ b/src/lib/modes/aead/eax/eax.h @@ -14,6 +14,8 @@ #include <botan/stream_cipher.h> #include <botan/mac.h> +BOTAN_FUTURE_INTERNAL_HEADER(eax.h) + namespace Botan { /** diff --git a/src/lib/modes/aead/gcm/gcm.h b/src/lib/modes/aead/gcm/gcm.h index 8f27c3679..fe3c40572 100644 --- a/src/lib/modes/aead/gcm/gcm.h +++ b/src/lib/modes/aead/gcm/gcm.h @@ -12,6 +12,8 @@ #include <botan/aead.h> #include <botan/sym_algo.h> +BOTAN_FUTURE_INTERNAL_HEADER(gcm.h) + namespace Botan { class BlockCipher; diff --git a/src/lib/modes/aead/gcm/ghash.h b/src/lib/modes/aead/gcm/ghash.h index fb7565134..db4500133 100644 --- a/src/lib/modes/aead/gcm/ghash.h +++ b/src/lib/modes/aead/gcm/ghash.h @@ -10,6 +10,8 @@ #include <botan/sym_algo.h> +BOTAN_FUTURE_INTERNAL_HEADER(ghash.h) + namespace Botan { /** diff --git a/src/lib/modes/aead/ocb/ocb.h b/src/lib/modes/aead/ocb/ocb.h index 173af3704..d38122593 100644 --- a/src/lib/modes/aead/ocb/ocb.h +++ b/src/lib/modes/aead/ocb/ocb.h @@ -11,6 +11,8 @@ #include <botan/aead.h> +BOTAN_FUTURE_INTERNAL_HEADER(ocb.h) + namespace Botan { class BlockCipher; diff --git a/src/lib/modes/aead/siv/siv.h b/src/lib/modes/aead/siv/siv.h index 4d9a30222..44e0a6bf9 100644 --- a/src/lib/modes/aead/siv/siv.h +++ b/src/lib/modes/aead/siv/siv.h @@ -12,6 +12,8 @@ #include <botan/aead.h> #include <botan/stream_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(siv.h) + namespace Botan { class BlockCipher; diff --git a/src/lib/modes/cbc/cbc.h b/src/lib/modes/cbc/cbc.h index aaa425712..7a488dbd5 100644 --- a/src/lib/modes/cbc/cbc.h +++ b/src/lib/modes/cbc/cbc.h @@ -13,6 +13,8 @@ #include <botan/block_cipher.h> #include <botan/mode_pad.h> +BOTAN_FUTURE_INTERNAL_HEADER(cbc.h) + namespace Botan { /** diff --git a/src/lib/modes/cfb/cfb.h b/src/lib/modes/cfb/cfb.h index eddc2a121..1f9e55487 100644 --- a/src/lib/modes/cfb/cfb.h +++ b/src/lib/modes/cfb/cfb.h @@ -12,6 +12,8 @@ #include <botan/cipher_mode.h> #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(cfb.h) + namespace Botan { /** diff --git a/src/lib/modes/mode_pad/mode_pad.h b/src/lib/modes/mode_pad/mode_pad.h index 25e4221af..b0e4a3cfa 100644 --- a/src/lib/modes/mode_pad/mode_pad.h +++ b/src/lib/modes/mode_pad/mode_pad.h @@ -12,6 +12,8 @@ #include <botan/secmem.h> #include <string> +BOTAN_FUTURE_INTERNAL_HEADER(mode_pad.h) + namespace Botan { /** diff --git a/src/lib/modes/stream_mode.h b/src/lib/modes/stream_mode.h index 3bce01731..da3fc38cf 100644 --- a/src/lib/modes/stream_mode.h +++ b/src/lib/modes/stream_mode.h @@ -14,6 +14,8 @@ #include <botan/stream_cipher.h> #endif +BOTAN_FUTURE_INTERNAL_HEADER(stream_mode.h) + namespace Botan { #if defined(BOTAN_HAS_STREAM_CIPHER) diff --git a/src/lib/modes/xts/xts.h b/src/lib/modes/xts/xts.h index 1fd86b2f4..e64a6de9f 100644 --- a/src/lib/modes/xts/xts.h +++ b/src/lib/modes/xts/xts.h @@ -12,6 +12,8 @@ #include <botan/cipher_mode.h> #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(xts.h) + namespace Botan { /** diff --git a/src/lib/pbkdf/argon2/argon2.cpp b/src/lib/pbkdf/argon2/argon2.cpp index 05b1e9c48..0d767e04e 100644 --- a/src/lib/pbkdf/argon2/argon2.cpp +++ b/src/lib/pbkdf/argon2/argon2.cpp @@ -5,6 +5,7 @@ */ #include <botan/argon2.h> +#include <botan/loadstor.h> #include <botan/hash.h> #include <botan/mem_ops.h> #include <botan/rotate.h> @@ -26,23 +27,23 @@ secure_vector<uint8_t> argon2_H0(HashFunction& blake2b, { const uint8_t v = 19; // Argon2 version code - blake2b.update_le<uint32_t>(static_cast<uint32_t>(p)); - blake2b.update_le<uint32_t>(static_cast<uint32_t>(output_len)); - blake2b.update_le<uint32_t>(static_cast<uint32_t>(M)); - blake2b.update_le<uint32_t>(static_cast<uint32_t>(t)); - blake2b.update_le<uint32_t>(static_cast<uint32_t>(v)); - blake2b.update_le<uint32_t>(static_cast<uint32_t>(y)); + blake2b.update_le(static_cast<uint32_t>(p)); + blake2b.update_le(static_cast<uint32_t>(output_len)); + blake2b.update_le(static_cast<uint32_t>(M)); + blake2b.update_le(static_cast<uint32_t>(t)); + blake2b.update_le(static_cast<uint32_t>(v)); + blake2b.update_le(static_cast<uint32_t>(y)); - blake2b.update_le<uint32_t>(static_cast<uint32_t>(password_len)); + blake2b.update_le(static_cast<uint32_t>(password_len)); blake2b.update(cast_char_ptr_to_uint8(password), password_len); - blake2b.update_le<uint32_t>(static_cast<uint32_t>(salt_len)); + blake2b.update_le(static_cast<uint32_t>(salt_len)); blake2b.update(salt, salt_len); - blake2b.update_le<uint32_t>(static_cast<uint32_t>(key_len)); + blake2b.update_le(static_cast<uint32_t>(key_len)); blake2b.update(key, key_len); - blake2b.update_le<uint32_t>(static_cast<uint32_t>(ad_len)); + blake2b.update_le(static_cast<uint32_t>(ad_len)); blake2b.update(ad, ad_len); return blake2b.final(); @@ -57,10 +58,10 @@ void Htick(secure_vector<uint8_t>& T, { BOTAN_ASSERT_NOMSG(output_len % 64 == 0); - blake2b.update_le<uint32_t>(static_cast<uint32_t>(output_len)); + blake2b.update_le(static_cast<uint32_t>(output_len)); blake2b.update(H0); - blake2b.update_le<uint32_t>(static_cast<uint32_t>(p0)); - blake2b.update_le<uint32_t>(static_cast<uint32_t>(p1)); + blake2b.update_le(static_cast<uint32_t>(p0)); + blake2b.update_le(static_cast<uint32_t>(p1)); blake2b.final(&T[0]); diff --git a/src/lib/pbkdf/argon2/argon2.h b/src/lib/pbkdf/argon2/argon2.h index a6fa03314..468a44f94 100644 --- a/src/lib/pbkdf/argon2/argon2.h +++ b/src/lib/pbkdf/argon2/argon2.h @@ -11,6 +11,8 @@ namespace Botan { +BOTAN_FUTURE_INTERNAL_HEADER(argon2.h) + class RandomNumberGenerator; /** diff --git a/src/lib/pbkdf/bcrypt_pbkdf/bcrypt_pbkdf.cpp b/src/lib/pbkdf/bcrypt_pbkdf/bcrypt_pbkdf.cpp index 36501b4cb..2f2c77025 100644 --- a/src/lib/pbkdf/bcrypt_pbkdf/bcrypt_pbkdf.cpp +++ b/src/lib/pbkdf/bcrypt_pbkdf/bcrypt_pbkdf.cpp @@ -5,6 +5,7 @@ */ #include <botan/bcrypt_pbkdf.h> +#include <botan/loadstor.h> #include <botan/blowfish.h> #include <botan/hash.h> #include <botan/internal/timer.h> diff --git a/src/lib/pbkdf/bcrypt_pbkdf/bcrypt_pbkdf.h b/src/lib/pbkdf/bcrypt_pbkdf/bcrypt_pbkdf.h index 5f0f9e80f..0d459e8db 100644 --- a/src/lib/pbkdf/bcrypt_pbkdf/bcrypt_pbkdf.h +++ b/src/lib/pbkdf/bcrypt_pbkdf/bcrypt_pbkdf.h @@ -9,6 +9,8 @@ #include <botan/pwdhash.h> +BOTAN_FUTURE_INTERNAL_HEADER(bcrypt_pbkdf.h) + namespace Botan { /** diff --git a/src/lib/pbkdf/pbkdf1/pbkdf1.h b/src/lib/pbkdf/pbkdf1/pbkdf1.h index 74b2644f6..f5e95b836 100644 --- a/src/lib/pbkdf/pbkdf1/pbkdf1.h +++ b/src/lib/pbkdf/pbkdf1/pbkdf1.h @@ -11,6 +11,8 @@ #include <botan/pbkdf.h> #include <botan/hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(pbkdf1.h) + namespace Botan { /** diff --git a/src/lib/pbkdf/pbkdf2/pbkdf2.h b/src/lib/pbkdf/pbkdf2/pbkdf2.h index 65955eb28..9f90799c4 100644 --- a/src/lib/pbkdf/pbkdf2/pbkdf2.h +++ b/src/lib/pbkdf/pbkdf2/pbkdf2.h @@ -13,6 +13,8 @@ #include <botan/pwdhash.h> #include <botan/mac.h> +BOTAN_FUTURE_INTERNAL_HEADER(pbkdf2.h) + namespace Botan { BOTAN_PUBLIC_API(2,0) size_t pbkdf2(MessageAuthenticationCode& prf, diff --git a/src/lib/pbkdf/pgp_s2k/pgp_s2k.h b/src/lib/pbkdf/pgp_s2k/pgp_s2k.h index 4ce934a2b..7fda724c2 100644 --- a/src/lib/pbkdf/pgp_s2k/pgp_s2k.h +++ b/src/lib/pbkdf/pgp_s2k/pgp_s2k.h @@ -13,6 +13,14 @@ #include <botan/pwdhash.h> #include <botan/hash.h> +/* +This header will not be fully internal - the RFC4880 count +encoding functions will remain here. But the definition of +OpenPGP_S2K will be made internal +*/ + +//BOTAN_FUTURE_INTERNAL_HEADER(pgp_s2k.h) + namespace Botan { /** diff --git a/src/lib/pbkdf/scrypt/scrypt.h b/src/lib/pbkdf/scrypt/scrypt.h index 83a3b0cca..1af59b6a5 100644 --- a/src/lib/pbkdf/scrypt/scrypt.h +++ b/src/lib/pbkdf/scrypt/scrypt.h @@ -10,6 +10,8 @@ #include <botan/pwdhash.h> +BOTAN_FUTURE_INTERNAL_HEADER(scrypt.h) + namespace Botan { /** diff --git a/src/lib/pk_pad/eme.h b/src/lib/pk_pad/eme.h index 659d2ecc9..38cce4b09 100644 --- a/src/lib/pk_pad/eme.h +++ b/src/lib/pk_pad/eme.h @@ -11,6 +11,8 @@ #include <botan/secmem.h> #include <string> +BOTAN_FUTURE_INTERNAL_HEADER(eme.h) + namespace Botan { class RandomNumberGenerator; diff --git a/src/lib/pk_pad/eme_oaep/oaep.h b/src/lib/pk_pad/eme_oaep/oaep.h index 4bb12d27e..383617b82 100644 --- a/src/lib/pk_pad/eme_oaep/oaep.h +++ b/src/lib/pk_pad/eme_oaep/oaep.h @@ -11,6 +11,8 @@ #include <botan/eme.h> #include <botan/hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(oaep.h) + namespace Botan { /** diff --git a/src/lib/pk_pad/eme_pkcs1/eme_pkcs.h b/src/lib/pk_pad/eme_pkcs1/eme_pkcs.h index 26b03e47a..fb7cf1419 100644 --- a/src/lib/pk_pad/eme_pkcs1/eme_pkcs.h +++ b/src/lib/pk_pad/eme_pkcs1/eme_pkcs.h @@ -10,6 +10,8 @@ #include <botan/eme.h> +BOTAN_FUTURE_INTERNAL_HEADER(eme_pkcs.h) + namespace Botan { /** diff --git a/src/lib/pk_pad/eme_raw/eme_raw.h b/src/lib/pk_pad/eme_raw/eme_raw.h index d736a80bb..840448c55 100644 --- a/src/lib/pk_pad/eme_raw/eme_raw.h +++ b/src/lib/pk_pad/eme_raw/eme_raw.h @@ -9,6 +9,8 @@ #include <botan/eme.h> +BOTAN_FUTURE_INTERNAL_HEADER(eme_raw.h) + namespace Botan { class BOTAN_PUBLIC_API(2,0) EME_Raw final : public EME diff --git a/src/lib/pk_pad/emsa.h b/src/lib/pk_pad/emsa.h index 019047045..06c18a488 100644 --- a/src/lib/pk_pad/emsa.h +++ b/src/lib/pk_pad/emsa.h @@ -12,6 +12,8 @@ #include <botan/alg_id.h> #include <string> +BOTAN_FUTURE_INTERNAL_HEADER(emsa.h) + namespace Botan { class Private_Key; diff --git a/src/lib/pk_pad/emsa1/emsa1.h b/src/lib/pk_pad/emsa1/emsa1.h index 7b4d027da..76736bc27 100644 --- a/src/lib/pk_pad/emsa1/emsa1.h +++ b/src/lib/pk_pad/emsa1/emsa1.h @@ -11,6 +11,8 @@ #include <botan/emsa.h> #include <botan/hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(emsa1.h) + namespace Botan { /** diff --git a/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.h b/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.h index 31032320e..5b9cf7aea 100644 --- a/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.h +++ b/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.h @@ -11,6 +11,8 @@ #include <botan/emsa.h> #include <botan/hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(emsa_pkcs1.h) + namespace Botan { /** diff --git a/src/lib/pk_pad/emsa_pssr/pssr.h b/src/lib/pk_pad/emsa_pssr/pssr.h index fa0ae1228..47efacb51 100644 --- a/src/lib/pk_pad/emsa_pssr/pssr.h +++ b/src/lib/pk_pad/emsa_pssr/pssr.h @@ -11,6 +11,8 @@ #include <botan/emsa.h> #include <botan/hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(pssr.h) + namespace Botan { /** diff --git a/src/lib/pk_pad/emsa_raw/emsa_raw.h b/src/lib/pk_pad/emsa_raw/emsa_raw.h index 3bac4ef67..dc01b94a2 100644 --- a/src/lib/pk_pad/emsa_raw/emsa_raw.h +++ b/src/lib/pk_pad/emsa_raw/emsa_raw.h @@ -10,6 +10,8 @@ #include <botan/emsa.h> +BOTAN_FUTURE_INTERNAL_HEADER(emsa_raw.h) + namespace Botan { /** diff --git a/src/lib/pk_pad/emsa_x931/emsa_x931.h b/src/lib/pk_pad/emsa_x931/emsa_x931.h index e20d303b6..a2fef0468 100644 --- a/src/lib/pk_pad/emsa_x931/emsa_x931.h +++ b/src/lib/pk_pad/emsa_x931/emsa_x931.h @@ -11,6 +11,8 @@ #include <botan/emsa.h> #include <botan/hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(emsa_x931.h) + namespace Botan { /** diff --git a/src/lib/pk_pad/hash_id/hash_id.h b/src/lib/pk_pad/hash_id/hash_id.h index 75c86c0c6..3c2eba791 100644 --- a/src/lib/pk_pad/hash_id/hash_id.h +++ b/src/lib/pk_pad/hash_id/hash_id.h @@ -11,6 +11,8 @@ #include <botan/secmem.h> #include <string> +BOTAN_FUTURE_INTERNAL_HEADER(hash_id) + namespace Botan { /** diff --git a/src/lib/pk_pad/iso9796/iso9796.h b/src/lib/pk_pad/iso9796/iso9796.h index 7af9a269b..9782e53b2 100644 --- a/src/lib/pk_pad/iso9796/iso9796.h +++ b/src/lib/pk_pad/iso9796/iso9796.h @@ -11,6 +11,8 @@ #include <botan/emsa.h> #include <botan/hash.h> +BOTAN_FUTURE_INTERNAL_HEADER(iso9796.h) + namespace Botan { /** diff --git a/src/lib/pubkey/blinding.h b/src/lib/pubkey/blinding.h index 1bdd235f0..988a41a35 100644 --- a/src/lib/pubkey/blinding.h +++ b/src/lib/pubkey/blinding.h @@ -12,6 +12,8 @@ #include <botan/reducer.h> #include <functional> +BOTAN_FUTURE_INTERNAL_HEADER(blinding.h) + namespace Botan { class RandomNumberGenerator; diff --git a/src/lib/pubkey/ec_group/curve_gfp.h b/src/lib/pubkey/ec_group/curve_gfp.h index fe7a0a54d..158f7f8c8 100644 --- a/src/lib/pubkey/ec_group/curve_gfp.h +++ b/src/lib/pubkey/ec_group/curve_gfp.h @@ -13,6 +13,9 @@ #include <botan/bigint.h> #include <memory> +// Currently exposed in PointGFp +//BOTAN_FUTURE_INTERNAL_HEADER(curve_gfp.h) + namespace Botan { class BOTAN_UNSTABLE_API CurveGFp_Repr diff --git a/src/lib/pubkey/keypair/keypair.h b/src/lib/pubkey/keypair/keypair.h index 4f28f325f..6900faa35 100644 --- a/src/lib/pubkey/keypair/keypair.h +++ b/src/lib/pubkey/keypair/keypair.h @@ -10,6 +10,8 @@ #include <botan/pk_keys.h> +BOTAN_FUTURE_INTERNAL_HEADER(keypair.h) + namespace Botan { namespace KeyPair { diff --git a/src/lib/pubkey/mce/gf2m_small_m.h b/src/lib/pubkey/mce/gf2m_small_m.h index a74094930..9acc50c72 100644 --- a/src/lib/pubkey/mce/gf2m_small_m.h +++ b/src/lib/pubkey/mce/gf2m_small_m.h @@ -12,8 +12,11 @@ #ifndef BOTAN_GF2M_SMALL_M_H_ #define BOTAN_GF2M_SMALL_M_H_ -#include <vector> #include <botan/types.h> +#include <vector> + +// fixme - still used in mceliece.h +//BOTAN_FUTURE_INTERNAL_HEADER(gf2m_small_m.h) namespace Botan { diff --git a/src/lib/pubkey/mce/polyn_gf2m.h b/src/lib/pubkey/mce/polyn_gf2m.h index f2d3ac53c..e4d3d4d1c 100644 --- a/src/lib/pubkey/mce/polyn_gf2m.h +++ b/src/lib/pubkey/mce/polyn_gf2m.h @@ -17,6 +17,8 @@ #include <utility> #include <string> +//BOTAN_FUTURE_INTERNAL_HEADER(polyn_gf2m.h) + namespace Botan { class RandomNumberGenerator; diff --git a/src/lib/pubkey/pbes2/pbes2.h b/src/lib/pubkey/pbes2/pbes2.h index bc56abd97..daa9ac580 100644 --- a/src/lib/pubkey/pbes2/pbes2.h +++ b/src/lib/pubkey/pbes2/pbes2.h @@ -11,6 +11,8 @@ #include <botan/alg_id.h> #include <chrono> +BOTAN_FUTURE_INTERNAL_HEADER(pbes2.h) + namespace Botan { class RandomNumberGenerator; diff --git a/src/lib/pubkey/rfc6979/rfc6979.h b/src/lib/pubkey/rfc6979/rfc6979.h index d78effc26..54134a682 100644 --- a/src/lib/pubkey/rfc6979/rfc6979.h +++ b/src/lib/pubkey/rfc6979/rfc6979.h @@ -12,6 +12,8 @@ #include <string> #include <memory> +BOTAN_FUTURE_INTERNAL_HEADER(rfc6979.h) + namespace Botan { class HMAC_DRBG; diff --git a/src/lib/pubkey/sm2/sm2.cpp b/src/lib/pubkey/sm2/sm2.cpp index 5ffd547cf..a976c097b 100644 --- a/src/lib/pubkey/sm2/sm2.cpp +++ b/src/lib/pubkey/sm2/sm2.cpp @@ -9,6 +9,7 @@ #include <botan/sm2.h> #include <botan/internal/pk_ops_impl.h> #include <botan/internal/point_mul.h> +#include <botan/loadstor.h> #include <botan/numthry.h> #include <botan/keypair.h> #include <botan/hash.h> diff --git a/src/lib/pubkey/xmss/atomic.h b/src/lib/pubkey/xmss/atomic.h index d2e65c104..a542d4c00 100644 --- a/src/lib/pubkey/xmss/atomic.h +++ b/src/lib/pubkey/xmss/atomic.h @@ -8,9 +8,12 @@ #ifndef BOTAN_ATOMIC_H_ #define BOTAN_ATOMIC_H_ +#include <botan/types.h> #include <atomic> #include <memory> +//BOTAN_FUTURE_INTERNAL_HEADER(atomic.h) + namespace Botan { template <typename T> diff --git a/src/lib/pubkey/xmss/xmss_common_ops.h b/src/lib/pubkey/xmss/xmss_common_ops.h index 065a727d9..f3c59f85f 100644 --- a/src/lib/pubkey/xmss/xmss_common_ops.h +++ b/src/lib/pubkey/xmss/xmss_common_ops.h @@ -14,6 +14,8 @@ #include <botan/xmss_address.h> #include <botan/xmss_hash.h> +//BOTAN_FUTURE_INTERNAL_HEADER(xmss_common_ops.h) + namespace Botan { typedef std::vector<secure_vector<uint8_t>> wots_keysig_t; diff --git a/src/lib/pubkey/xmss/xmss_hash.h b/src/lib/pubkey/xmss/xmss_hash.h index f45432d59..5d8cbab53 100644 --- a/src/lib/pubkey/xmss/xmss_hash.h +++ b/src/lib/pubkey/xmss/xmss_hash.h @@ -10,6 +10,8 @@ #include <botan/hash.h> +//BOTAN_FUTURE_INTERNAL_HEADER(xmss_hash.h) + namespace Botan { /** diff --git a/src/lib/pubkey/xmss/xmss_index_registry.h b/src/lib/pubkey/xmss/xmss_index_registry.h index 27a68631a..6ec9137d3 100644 --- a/src/lib/pubkey/xmss/xmss_index_registry.h +++ b/src/lib/pubkey/xmss/xmss_index_registry.h @@ -12,6 +12,8 @@ #include <botan/atomic.h> #include <botan/mutex.h> +//BOTAN_FUTURE_INTERNAL_HEADER(xmss_index_registry.h) + namespace Botan { /** diff --git a/src/lib/pubkey/xmss/xmss_key_pair.h b/src/lib/pubkey/xmss/xmss_key_pair.h index 2e7cc06da..3b586cfd4 100644 --- a/src/lib/pubkey/xmss/xmss_key_pair.h +++ b/src/lib/pubkey/xmss/xmss_key_pair.h @@ -8,12 +8,13 @@ #ifndef BOTAN_XMSS_KEY_PAIR_H_ #define BOTAN_XMSS_KEY_PAIR_H_ -#include <botan/botan.h> #include <botan/xmss_parameters.h> #include <botan/xmss_wots_parameters.h> #include <botan/xmss_publickey.h> #include <botan/xmss_privatekey.h> +BOTAN_DEPRECATED_HEADER(xmss_key_pair.h) + namespace Botan { /** diff --git a/src/lib/pubkey/xmss/xmss_tools.h b/src/lib/pubkey/xmss/xmss_tools.h index bbd31fd9f..81d17f5bf 100644 --- a/src/lib/pubkey/xmss/xmss_tools.h +++ b/src/lib/pubkey/xmss/xmss_tools.h @@ -13,6 +13,8 @@ #include <iterator> #include <type_traits> +//BOTAN_FUTURE_INTERNAL_HEADER(xmss_tools.h) + namespace Botan { /** diff --git a/src/lib/stream/chacha/chacha.h b/src/lib/stream/chacha/chacha.h index 261d950bd..1749127f2 100644 --- a/src/lib/stream/chacha/chacha.h +++ b/src/lib/stream/chacha/chacha.h @@ -10,6 +10,8 @@ #include <botan/stream_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(chacha.h) + namespace Botan { /** diff --git a/src/lib/stream/ctr/ctr.cpp b/src/lib/stream/ctr/ctr.cpp index f1d8d97b8..ca187ea47 100644 --- a/src/lib/stream/ctr/ctr.cpp +++ b/src/lib/stream/ctr/ctr.cpp @@ -141,31 +141,27 @@ void CTR_BE::add_counter(const uint64_t counter) if(ctr_size == 4) { - size_t off = (BS - 4); - uint32_t low32 = static_cast<uint32_t>(counter + load_be<uint32_t>(&m_counter[off], 0)); + const size_t off = (BS - 4); + const uint32_t low32 = static_cast<uint32_t>(counter + load_be<uint32_t>(&m_counter[off], 0)); for(size_t i = 0; i != ctr_blocks; ++i) { - store_be(low32, &m_counter[off]); - off += BS; - low32 += 1; + store_be(uint32_t(low32 + i), &m_counter[i*BS+off]); } } else if(ctr_size == 8) { - size_t off = (BS - 8); - uint64_t low64 = counter + load_be<uint64_t>(&m_counter[off], 0); + const size_t off = (BS - 8); + const uint64_t low64 = counter + load_be<uint64_t>(&m_counter[off], 0); for(size_t i = 0; i != ctr_blocks; ++i) { - store_be(low64, &m_counter[off]); - off += BS; - low64 += 1; + store_be(uint64_t(low64 + i), &m_counter[i*BS+off]); } } else if(ctr_size == 16) { - size_t off = (BS - 16); + const size_t off = (BS - 16); uint64_t b0 = load_be<uint64_t>(&m_counter[off], 0); uint64_t b1 = load_be<uint64_t>(&m_counter[off], 1); b1 += counter; @@ -173,9 +169,8 @@ void CTR_BE::add_counter(const uint64_t counter) for(size_t i = 0; i != ctr_blocks; ++i) { - store_be(b0, &m_counter[off]); - store_be(b1, &m_counter[off+8]); - off += BS; + store_be(b0, &m_counter[i*BS+off]); + store_be(b1, &m_counter[i*BS+off+8]); b1 += 1; b0 += (b1 == 0); // carry } diff --git a/src/lib/stream/ctr/ctr.h b/src/lib/stream/ctr/ctr.h index 79911b2fe..0687c606e 100644 --- a/src/lib/stream/ctr/ctr.h +++ b/src/lib/stream/ctr/ctr.h @@ -11,6 +11,8 @@ #include <botan/block_cipher.h> #include <botan/stream_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(ctr.h) + namespace Botan { /** diff --git a/src/lib/stream/ofb/ofb.h b/src/lib/stream/ofb/ofb.h index 1e9866c64..994d3d198 100644 --- a/src/lib/stream/ofb/ofb.h +++ b/src/lib/stream/ofb/ofb.h @@ -11,6 +11,8 @@ #include <botan/stream_cipher.h> #include <botan/block_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(ofb.h) + namespace Botan { /** diff --git a/src/lib/stream/rc4/rc4.h b/src/lib/stream/rc4/rc4.h index d59ce01f0..eff3c568d 100644 --- a/src/lib/stream/rc4/rc4.h +++ b/src/lib/stream/rc4/rc4.h @@ -11,6 +11,8 @@ #include <botan/stream_cipher.h> #include <botan/types.h> +BOTAN_FUTURE_INTERNAL_HEADER(rc4.h) + namespace Botan { /** diff --git a/src/lib/stream/salsa20/salsa20.h b/src/lib/stream/salsa20/salsa20.h index 0870c9fd2..6ad0da770 100644 --- a/src/lib/stream/salsa20/salsa20.h +++ b/src/lib/stream/salsa20/salsa20.h @@ -10,6 +10,8 @@ #include <botan/stream_cipher.h> +BOTAN_FUTURE_INTERNAL_HEADER(salsa20.h) + namespace Botan { /** diff --git a/src/lib/stream/shake_cipher/shake_cipher.h b/src/lib/stream/shake_cipher/shake_cipher.h index 492341a7c..85eaec2a8 100644 --- a/src/lib/stream/shake_cipher/shake_cipher.h +++ b/src/lib/stream/shake_cipher/shake_cipher.h @@ -11,6 +11,8 @@ #include <botan/stream_cipher.h> #include <botan/secmem.h> +BOTAN_FUTURE_INTERNAL_HEADER(shake_cipher.h) + namespace Botan { /** diff --git a/src/lib/tls/tls_algos.h b/src/lib/tls/tls_algos.h index 4852a4349..3b0be8128 100644 --- a/src/lib/tls/tls_algos.h +++ b/src/lib/tls/tls_algos.h @@ -11,6 +11,8 @@ #include <string> #include <vector> +//BOTAN_FUTURE_INTERNAL_HEADER(tls_algos.h) + namespace Botan { namespace TLS { diff --git a/src/lib/tls/tls_cbc/tls_cbc.cpp b/src/lib/tls/tls_cbc/tls_cbc.cpp index b23718d89..a23fa8595 100644 --- a/src/lib/tls/tls_cbc/tls_cbc.cpp +++ b/src/lib/tls/tls_cbc/tls_cbc.cpp @@ -13,6 +13,7 @@ #include <botan/internal/rounding.h> #include <botan/internal/ct_utils.h> +#include <botan/loadstor.h> #include <botan/tls_alert.h> #include <botan/tls_exceptn.h> diff --git a/src/lib/tls/tls_handshake_io.cpp b/src/lib/tls/tls_handshake_io.cpp index 6e2bf0284..7f9e2c86c 100644 --- a/src/lib/tls/tls_handshake_io.cpp +++ b/src/lib/tls/tls_handshake_io.cpp @@ -10,6 +10,7 @@ #include <botan/internal/tls_seq_numbers.h> #include <botan/tls_messages.h> #include <botan/exceptn.h> +#include <botan/loadstor.h> #include <chrono> namespace Botan { diff --git a/src/lib/tls/tls_magic.h b/src/lib/tls/tls_magic.h index 48bb34f4a..49d69c7d8 100644 --- a/src/lib/tls/tls_magic.h +++ b/src/lib/tls/tls_magic.h @@ -8,6 +8,10 @@ #ifndef BOTAN_TLS_PROTOCOL_MAGIC_H_ #define BOTAN_TLS_PROTOCOL_MAGIC_H_ +#include <botan/types.h> + +//BOTAN_FUTURE_INTERNAL_HEADER(tls_magic.h) + namespace Botan { namespace TLS { diff --git a/src/lib/tls/tls_version.h b/src/lib/tls/tls_version.h index 4d56f94ca..18e2c0f65 100644 --- a/src/lib/tls/tls_version.h +++ b/src/lib/tls/tls_version.h @@ -8,7 +8,7 @@ #ifndef BOTAN_TLS_PROTOCOL_VERSION_H_ #define BOTAN_TLS_PROTOCOL_VERSION_H_ -#include <botan/loadstor.h> +#include <botan/types.h> #include <string> namespace Botan { @@ -76,12 +76,12 @@ class BOTAN_PUBLIC_API(2,0) Protocol_Version final /** * @return major version of the protocol version */ - uint8_t major_version() const { return get_byte(0, m_version); } + uint8_t major_version() const { return static_cast<uint8_t>(m_version >> 8); } /** * @return minor version of the protocol version */ - uint8_t minor_version() const { return get_byte(1, m_version); } + uint8_t minor_version() const { return static_cast<uint8_t>(m_version & 0xFF); } /** * @return the version code diff --git a/src/lib/utils/bswap.h b/src/lib/utils/bswap.h index 02f63c64e..584fa3323 100644 --- a/src/lib/utils/bswap.h +++ b/src/lib/utils/bswap.h @@ -15,6 +15,8 @@ #include <stdlib.h> #endif +BOTAN_FUTURE_INTERNAL_HEADER(bswap.h) + namespace Botan { /** diff --git a/src/lib/utils/charset.h b/src/lib/utils/charset.h index 4913f0a5a..6e7ce30c9 100644 --- a/src/lib/utils/charset.h +++ b/src/lib/utils/charset.h @@ -11,6 +11,8 @@ #include <botan/types.h> #include <string> +BOTAN_FUTURE_INTERNAL_HEADER(charset.h) + namespace Botan { /** diff --git a/src/lib/utils/compiler.h b/src/lib/utils/compiler.h index 2da40b665..a38bffb5d 100644 --- a/src/lib/utils/compiler.h +++ b/src/lib/utils/compiler.h @@ -103,14 +103,26 @@ #define BOTAN_DEPRECATED(msg) __attribute__ ((deprecated)) #define BOTAN_DEPRECATED_HEADER(hdr) _Pragma("message \"this header is deprecated\"") + #if !defined(BOTAN_IS_BEING_BUILT) + #define BOTAN_FUTURE_INTERNAL_HEADER(hdr) _Pragma("message \"this header will be made internal in the future\"") + #endif + #elif defined(_MSC_VER) #define BOTAN_DEPRECATED(msg) __declspec(deprecated(msg)) #define BOTAN_DEPRECATED_HEADER(hdr) __pragma("message \"this header is deprecated\"") + #if !defined(BOTAN_IS_BEING_BUILT) + #define BOTAN_FUTURE_INTERNAL_HEADER(hdr) __pragma("message \"this header will be made internal in the future\"") + #endif + #elif defined(__GNUC__) /* msg supported since GCC 4.5, earliest we support is 4.8 */ #define BOTAN_DEPRECATED(msg) __attribute__ ((deprecated(msg))) #define BOTAN_DEPRECATED_HEADER(hdr) _Pragma("GCC warning \"this header is deprecated\"") + + #if !defined(BOTAN_IS_BEING_BUILT) + #define BOTAN_FUTURE_INTERNAL_HEADER(hdr) _Pragma("GCC warning \"this header will be made internal in the future\"") + #endif #endif #endif @@ -123,6 +135,10 @@ #define BOTAN_DEPRECATED_HEADER(hdr) #endif +#if !defined(BOTAN_FUTURE_INTERNAL_HEADER) + #define BOTAN_FUTURE_INTERNAL_HEADER(hdr) +#endif + /* * Define BOTAN_NORETURN */ diff --git a/src/lib/utils/cpuid/cpuid.h b/src/lib/utils/cpuid/cpuid.h index d998d5364..bd8c8d95f 100644 --- a/src/lib/utils/cpuid/cpuid.h +++ b/src/lib/utils/cpuid/cpuid.h @@ -13,6 +13,8 @@ #include <string> #include <iosfwd> +BOTAN_FUTURE_INTERNAL_HEADER(cpuid.h) + namespace Botan { /** @@ -325,6 +327,8 @@ class BOTAN_PUBLIC_API(2,1) CPUID final return has_ssse3(); #elif defined(BOTAN_TARGET_CPU_IS_ARM_FAMILY) return has_neon(); +#elif defined(BOTAN_TARGET_CPU_IS_PPC_FAMILY) + return has_altivec(); #else return false; #endif diff --git a/src/lib/utils/http_util/http_util.h b/src/lib/utils/http_util/http_util.h index 92a67e42b..0eeda60f1 100644 --- a/src/lib/utils/http_util/http_util.h +++ b/src/lib/utils/http_util/http_util.h @@ -16,6 +16,8 @@ #include <functional> #include <chrono> +BOTAN_FUTURE_INTERNAL_HEADER(http_util.h) + namespace Botan { namespace HTTP { diff --git a/src/lib/utils/loadstor.h b/src/lib/utils/loadstor.h index 0b1cebdb4..9a8e9d4be 100644 --- a/src/lib/utils/loadstor.h +++ b/src/lib/utils/loadstor.h @@ -14,6 +14,8 @@ #include <botan/mem_ops.h> #include <vector> +BOTAN_FUTURE_INTERNAL_HEADER(loadstor.h) + #if defined(BOTAN_TARGET_CPU_IS_BIG_ENDIAN) #define BOTAN_ENDIAN_N2L(x) reverse_bytes(x) #define BOTAN_ENDIAN_L2N(x) reverse_bytes(x) diff --git a/src/lib/utils/locking_allocator/locking_allocator.h b/src/lib/utils/locking_allocator/locking_allocator.h index 21baa8ec2..8d1d24980 100644 --- a/src/lib/utils/locking_allocator/locking_allocator.h +++ b/src/lib/utils/locking_allocator/locking_allocator.h @@ -12,6 +12,8 @@ #include <vector> #include <memory> +BOTAN_FUTURE_INTERNAL_HEADER(locking_allocator.h) + namespace Botan { class Memory_Pool; diff --git a/src/lib/utils/mem_ops.h b/src/lib/utils/mem_ops.h index 31a1efcc9..569cb409b 100644 --- a/src/lib/utils/mem_ops.h +++ b/src/lib/utils/mem_ops.h @@ -127,19 +127,24 @@ template<typename T> inline void copy_mem(T* out, const T* in, size_t n) } } -template<typename T> inline void typecast_copy(uint8_t out[], T in) +template<typename T> inline void typecast_copy(uint8_t out[], T in[], size_t N) { - std::memcpy(out, &in, sizeof(T)); + std::memcpy(out, in, sizeof(T)*N); } -template<typename T> inline void typecast_copy(T& out, const uint8_t in[]) +template<typename T> inline void typecast_copy(T out[], const uint8_t in[], size_t N) { - std::memcpy(&out, in, sizeof(T)); + std::memcpy(out, in, sizeof(T)*N); } -template<typename T> inline void typecast_copy(T out[], const uint8_t in[], size_t N) +template<typename T> inline void typecast_copy(uint8_t out[], T in) { - std::memcpy(out, in, sizeof(T)*N); + typecast_copy(out, &in, 1); + } + +template<typename T> inline void typecast_copy(T& out, const uint8_t in[]) + { + typecast_copy(&out, in, 1); } /** @@ -203,28 +208,27 @@ inline void xor_buf(uint8_t out[], const uint8_t in[], size_t length) { - while(length >= 16) + const size_t blocks = length - (length % 32); + + for(size_t i = 0; i != blocks; i += 32) { - uint64_t x0, x1, y0, y1; - - typecast_copy(x0, in); - typecast_copy(x1, in + 8); - typecast_copy(y0, out); - typecast_copy(y1, out + 8); - - y0 ^= x0; - y1 ^= x1; - typecast_copy(out, y0); - typecast_copy(out + 8, y1); - out += 16; in += 16; length -= 16; + uint64_t x[4]; + uint64_t y[4]; + + typecast_copy(x, out + i, 4); + typecast_copy(y, in + i, 4); + + x[0] ^= y[0]; + x[1] ^= y[1]; + x[2] ^= y[2]; + x[3] ^= y[3]; + + typecast_copy(out + i, x, 4); } - while(length > 0) + for(size_t i = blocks; i != length; ++i) { - out[0] ^= in[0]; - out += 1; - in += 1; - length -= 1; + out[i] ^= in[i]; } } @@ -240,23 +244,28 @@ inline void xor_buf(uint8_t out[], const uint8_t in2[], size_t length) { - while(length >= 16) + const size_t blocks = length - (length % 32); + + for(size_t i = 0; i != blocks; i += 32) { - uint64_t x0, x1, y0, y1; - typecast_copy(x0, in); - typecast_copy(x1, in + 8); - typecast_copy(y0, in2); - typecast_copy(y1, in2 + 8); - - x0 ^= y0; - x1 ^= y1; - typecast_copy(out, x0); - typecast_copy(out + 8, x1); - out += 16; in += 16; in2 += 16; length -= 16; + uint64_t x[4]; + uint64_t y[4]; + + typecast_copy(x, in + i, 4); + typecast_copy(y, in2 + i, 4); + + x[0] ^= y[0]; + x[1] ^= y[1]; + x[2] ^= y[2]; + x[3] ^= y[3]; + + typecast_copy(out + i, x, 4); } - for(size_t i = 0; i != length; ++i) + for(size_t i = blocks; i != length; ++i) + { out[i] = in[i] ^ in2[i]; + } } template<typename Alloc, typename Alloc2> diff --git a/src/lib/utils/mul128.h b/src/lib/utils/mul128.h index ce1ef693b..8cdaae21e 100644 --- a/src/lib/utils/mul128.h +++ b/src/lib/utils/mul128.h @@ -10,6 +10,8 @@ #include <botan/types.h> +BOTAN_FUTURE_INTERNAL_HEADER(mul128.h) + namespace Botan { #if defined(__SIZEOF_INT128__) && defined(BOTAN_TARGET_CPU_HAS_NATIVE_64BIT) diff --git a/src/lib/utils/os_utils.cpp b/src/lib/utils/os_utils.cpp index 843e68638..a27e9117f 100644 --- a/src/lib/utils/os_utils.cpp +++ b/src/lib/utils/os_utils.cpp @@ -60,30 +60,6 @@ #endif namespace Botan { -namespace { -int get_locked_fd() - { -#if defined(BOTAN_TARGET_OS_IS_IOS) || defined(BOTAN_TARGET_OS_IS_MACOS) -// On Darwin, tagging anonymous pages allows vmmap to track these. -// Allowed from 240 to 255 for userland applications, taken an hardcoded -// value for now even though it can possibly intersect. - static constexpr int default_locked_fd = 255; - int locked_fd = default_locked_fd; - - if (size_t locked_fdl = OS::read_env_variable_sz("BOTAN_LOCKED_FD", default_locked_fd)) - { - if (locked_fdl < 240 || locked_fdl > 255) - { - locked_fdl = default_locked_fd; - } - locked_fd = static_cast<int>(locked_fdl); - } - return VM_MAKE_TAG(locked_fd); -#else - return -1; -#endif - } -} // Not defined in OS namespace for historical reasons void secure_scrub_memory(void* ptr, size_t n) @@ -429,8 +405,42 @@ size_t OS::read_env_variable_sz(const std::string& name, size_t def) return def; } +#if defined(BOTAN_TARGET_OS_HAS_POSIX1) && defined(BOTAN_TARGET_OS_HAS_POSIX_MLOCK) + +namespace { + +int get_locked_fd() + { +#if defined(BOTAN_TARGET_OS_IS_IOS) || defined(BOTAN_TARGET_OS_IS_MACOS) + // On Darwin, tagging anonymous pages allows vmmap to track these. + // Allowed from 240 to 255 for userland applications + static constexpr int default_locked_fd = 255; + int locked_fd = default_locked_fd; + + if(size_t locked_fdl = OS::read_env_variable_sz("BOTAN_LOCKED_FD", default_locked_fd)) + { + if(locked_fdl < 240 || locked_fdl > 255) + { + locked_fdl = default_locked_fd; + } + locked_fd = static_cast<int>(locked_fdl); + } + return VM_MAKE_TAG(locked_fd); +#else + return -1; +#endif + } + +} + +#endif + std::vector<void*> OS::allocate_locked_pages(size_t count) { +#if defined(BOTAN_TARGET_OS_HAS_POSIX1) && defined(BOTAN_TARGET_OS_HAS_POSIX_MLOCK) + static const int locked_fd = get_locked_fd(); +#endif + std::vector<void*> result; result.reserve(count); @@ -458,7 +468,6 @@ std::vector<void*> OS::allocate_locked_pages(size_t count) #define PROT_MAX(p) 0 #endif const int pflags = PROT_READ | PROT_WRITE; - static const int locked_fd = get_locked_fd(); ptr = ::mmap(nullptr, 2*page_size, pflags | PROT_MAX(pflags), diff --git a/src/lib/utils/parsing.h b/src/lib/utils/parsing.h index ed42ea8f5..216dbc822 100644 --- a/src/lib/utils/parsing.h +++ b/src/lib/utils/parsing.h @@ -17,6 +17,8 @@ #include <functional> #include <map> +BOTAN_FUTURE_INTERNAL_HEADER(parsing.h) + namespace Botan { /** diff --git a/src/lib/utils/rotate.h b/src/lib/utils/rotate.h index 16a44c71e..15c78ac26 100644 --- a/src/lib/utils/rotate.h +++ b/src/lib/utils/rotate.h @@ -10,6 +10,8 @@ #include <botan/types.h> +BOTAN_FUTURE_INTERNAL_HEADER(rotate.h) + namespace Botan { /** diff --git a/src/lib/utils/simd/info.txt b/src/lib/utils/simd/info.txt index 7784902a6..4a7044afc 100644 --- a/src/lib/utils/simd/info.txt +++ b/src/lib/utils/simd/info.txt @@ -5,3 +5,23 @@ SIMD_32 -> 20131128 <header:internal> simd_32.h </header:internal> + +<isa> +x86_32:sse2 +x86_64:sse2 +x32:sse2 +arm32:neon +arm64:neon +ppc32:altivec +ppc64:altivec +</isa> + +<arch> +x86_32 +x86_64 +x32 +arm32 +arm64 +ppc32 +ppc64 +</arch> diff --git a/src/lib/utils/simd/simd_32.h b/src/lib/utils/simd/simd_32.h index de02e84f1..4c1599842 100644 --- a/src/lib/utils/simd/simd_32.h +++ b/src/lib/utils/simd/simd_32.h @@ -1,6 +1,6 @@ /* * Lightweight wrappers for SIMD operations -* (C) 2009,2011,2016,2017 Jack Lloyd +* (C) 2009,2011,2016,2017,2019 Jack Lloyd * * Botan is released under the Simplified BSD License (see license.txt) */ @@ -9,26 +9,26 @@ #define BOTAN_SIMD_32_H_ #include <botan/types.h> -#include <botan/loadstor.h> -#include <botan/bswap.h> -#include <botan/cpuid.h> #if defined(BOTAN_TARGET_SUPPORTS_SSE2) #include <emmintrin.h> #define BOTAN_SIMD_USE_SSE2 #elif defined(BOTAN_TARGET_SUPPORTS_ALTIVEC) + #include <botan/bswap.h> + #include <botan/loadstor.h> #include <altivec.h> #undef vector #undef bool #define BOTAN_SIMD_USE_ALTIVEC #elif defined(BOTAN_TARGET_SUPPORTS_NEON) + #include <botan/cpuid.h> #include <arm_neon.h> #define BOTAN_SIMD_USE_NEON #else - #include <botan/rotate.h> + #error "No SIMD instruction set enabled" #endif namespace Botan { @@ -39,8 +39,6 @@ namespace Botan { typedef __vector unsigned int native_simd_type; #elif defined(BOTAN_SIMD_USE_NEON) typedef uint32x4_t native_simd_type; -#else - typedef struct { uint32_t val[4]; } native_simd_type; #endif /** @@ -74,11 +72,6 @@ class SIMD_4x32 final m_simd = vec_splat_u32(0); #elif defined(BOTAN_SIMD_USE_NEON) m_simd = vdupq_n_u32(0); -#else - m_simd.val[0] = 0; - m_simd.val[1] = 0; - m_simd.val[2] = 0; - m_simd.val[3] = 0; #endif } @@ -94,11 +87,6 @@ class SIMD_4x32 final m_simd = val; #elif defined(BOTAN_SIMD_USE_NEON) m_simd = vld1q_u32(B); -#else - m_simd.val[0] = B[0]; - m_simd.val[1] = B[1]; - m_simd.val[2] = B[2]; - m_simd.val[3] = B[3]; #endif } @@ -116,11 +104,6 @@ class SIMD_4x32 final // Better way to do this? const uint32_t B[4] = { B0, B1, B2, B3 }; m_simd = vld1q_u32(B); -#else - m_simd.val[0] = B0; - m_simd.val[1] = B1; - m_simd.val[2] = B2; - m_simd.val[3] = B3; #endif } @@ -131,7 +114,7 @@ class SIMD_4x32 final { #if defined(BOTAN_SIMD_USE_SSE2) return SIMD_4x32(_mm_set1_epi32(B)); -#elif defined(BOTAN_SIMD_USE_ARM) +#elif defined(BOTAN_SIMD_USE_NEON) return SIMD_4x32(vdupq_n_u32(B)); #else return SIMD_4x32(B, B, B, B); @@ -145,8 +128,8 @@ class SIMD_4x32 final { #if defined(BOTAN_SIMD_USE_SSE2) return SIMD_4x32(_mm_set1_epi8(B)); -#elif defined(BOTAN_SIMD_USE_ARM) - return SIMD_4x32(vdupq_n_u8(B)); +#elif defined(BOTAN_SIMD_USE_NEON) + return SIMD_4x32(vreinterpretq_u32_u8(vdupq_n_u8(B))); #else const uint32_t B4 = make_uint32(B, B, B, B); return SIMD_4x32(B4, B4, B4, B4); @@ -161,28 +144,13 @@ class SIMD_4x32 final #if defined(BOTAN_SIMD_USE_SSE2) return SIMD_4x32(_mm_loadu_si128(reinterpret_cast<const __m128i*>(in))); #elif defined(BOTAN_SIMD_USE_ALTIVEC) - uint32_t R[4]; Botan::load_le(R, static_cast<const uint8_t*>(in), 4); return SIMD_4x32(R); - #elif defined(BOTAN_SIMD_USE_NEON) - SIMD_4x32 l(vld1q_u32(static_cast<const uint32_t*>(in))); - -#if defined(BOTAN_TARGET_CPU_IS_BIG_ENDIAN) - return l.bswap(); -#elif defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) - return l; -#else return CPUID::is_big_endian() ? l.bswap() : l; #endif - -#else - SIMD_4x32 out; - Botan::load_le(out.m_simd.val, static_cast<const uint8_t*>(in), 4); - return out; -#endif } /** @@ -199,22 +167,9 @@ class SIMD_4x32 final return SIMD_4x32(R); #elif defined(BOTAN_SIMD_USE_NEON) - SIMD_4x32 l(vld1q_u32(static_cast<const uint32_t*>(in))); - -#if defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) - return l.bswap(); -#elif defined(BOTAN_TARGET_CPU_IS_BIG_ENDIAN) - return l; -#else return CPUID::is_little_endian() ? l.bswap() : l; #endif - -#else - SIMD_4x32 out; - Botan::load_be(out.m_simd.val, static_cast<const uint8_t*>(in), 4); - return out; -#endif } void store_le(uint32_t out[]) const @@ -241,12 +196,6 @@ class SIMD_4x32 final Botan::store_le(out, vec.R[0], vec.R[1], vec.R[2], vec.R[3]); #elif defined(BOTAN_SIMD_USE_NEON) - -#if defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) - vst1q_u8(out, vreinterpretq_u8_u32(m_simd)); -#elif defined(BOTAN_TARGET_CPU_IS_BIG_ENDIAN) - vst1q_u8(out, vreinterpretq_u8_u32(bswap().m_simd)); -#else if(CPUID::is_little_endian()) { vst1q_u8(out, vreinterpretq_u8_u32(m_simd)); @@ -256,10 +205,6 @@ class SIMD_4x32 final vst1q_u8(out, vreinterpretq_u8_u32(bswap().m_simd)); } #endif - -#else - Botan::store_le(out, m_simd.val[0], m_simd.val[1], m_simd.val[2], m_simd.val[3]); -#endif } /** @@ -281,12 +226,6 @@ class SIMD_4x32 final Botan::store_be(out, vec.R[0], vec.R[1], vec.R[2], vec.R[3]); #elif defined(BOTAN_SIMD_USE_NEON) - -#if defined(BOTAN_TARGET_CPU_IS_BIG_ENDIAN) - vst1q_u8(out, vreinterpretq_u8_u32(m_simd); -#elif defined(BOTAN_TARGET_CPU_IS_LITTLE_ENDIAN) - vst1q_u8(out, vreinterpretq_u8_u32(bswap().m_simd)); -#else if(CPUID::is_little_endian()) { vst1q_u8(out, vreinterpretq_u8_u32(bswap().m_simd)); @@ -296,10 +235,6 @@ class SIMD_4x32 final vst1q_u8(out, vreinterpretq_u8_u32(m_simd)); } #endif - -#else - Botan::store_be(out, m_simd.val[0], m_simd.val[1], m_simd.val[2], m_simd.val[3]); -#endif } /* @@ -336,12 +271,7 @@ class SIMD_4x32 final #elif defined(BOTAN_SIMD_USE_NEON) - #if defined(BOTAN_TARGET_ARCH_IS_ARM32) - - return SIMD_4x32(vorrq_u32(vshlq_n_u32(m_simd, static_cast<int>(ROT)), - vshrq_n_u32(m_simd, static_cast<int>(32-ROT)))); - - #else +#if defined(BOTAN_TARGET_ARCH_IS_ARM64) BOTAN_IF_CONSTEXPR(ROT == 8) { @@ -353,19 +283,9 @@ class SIMD_4x32 final { return SIMD_4x32(vreinterpretq_u32_u16(vrev32q_u16(vreinterpretq_u16_u32(m_simd)))); } - else - { - return SIMD_4x32(vorrq_u32(vshlq_n_u32(m_simd, static_cast<int>(ROT)), - vshrq_n_u32(m_simd, static_cast<int>(32-ROT)))); - } - - #endif - -#else - return SIMD_4x32(Botan::rotl<ROT>(m_simd.val[0]), - Botan::rotl<ROT>(m_simd.val[1]), - Botan::rotl<ROT>(m_simd.val[2]), - Botan::rotl<ROT>(m_simd.val[3])); +#endif + return SIMD_4x32(vorrq_u32(vshlq_n_u32(m_simd, static_cast<int>(ROT)), + vshrq_n_u32(m_simd, static_cast<int>(32-ROT)))); #endif } @@ -436,11 +356,6 @@ class SIMD_4x32 final m_simd = vec_add(m_simd, other.m_simd); #elif defined(BOTAN_SIMD_USE_NEON) m_simd = vaddq_u32(m_simd, other.m_simd); -#else - m_simd.val[0] += other.m_simd.val[0]; - m_simd.val[1] += other.m_simd.val[1]; - m_simd.val[2] += other.m_simd.val[2]; - m_simd.val[3] += other.m_simd.val[3]; #endif } @@ -452,11 +367,6 @@ class SIMD_4x32 final m_simd = vec_sub(m_simd, other.m_simd); #elif defined(BOTAN_SIMD_USE_NEON) m_simd = vsubq_u32(m_simd, other.m_simd); -#else - m_simd.val[0] -= other.m_simd.val[0]; - m_simd.val[1] -= other.m_simd.val[1]; - m_simd.val[2] -= other.m_simd.val[2]; - m_simd.val[3] -= other.m_simd.val[3]; #endif } @@ -469,11 +379,6 @@ class SIMD_4x32 final m_simd = vec_xor(m_simd, other.m_simd); #elif defined(BOTAN_SIMD_USE_NEON) m_simd = veorq_u32(m_simd, other.m_simd); -#else - m_simd.val[0] ^= other.m_simd.val[0]; - m_simd.val[1] ^= other.m_simd.val[1]; - m_simd.val[2] ^= other.m_simd.val[2]; - m_simd.val[3] ^= other.m_simd.val[3]; #endif } @@ -485,11 +390,6 @@ class SIMD_4x32 final m_simd = vec_or(m_simd, other.m_simd); #elif defined(BOTAN_SIMD_USE_NEON) m_simd = vorrq_u32(m_simd, other.m_simd); -#else - m_simd.val[0] |= other.m_simd.val[0]; - m_simd.val[1] |= other.m_simd.val[1]; - m_simd.val[2] |= other.m_simd.val[2]; - m_simd.val[3] |= other.m_simd.val[3]; #endif } @@ -501,11 +401,6 @@ class SIMD_4x32 final m_simd = vec_and(m_simd, other.m_simd); #elif defined(BOTAN_SIMD_USE_NEON) m_simd = vandq_u32(m_simd, other.m_simd); -#else - m_simd.val[0] &= other.m_simd.val[0]; - m_simd.val[1] &= other.m_simd.val[1]; - m_simd.val[2] &= other.m_simd.val[2]; - m_simd.val[3] &= other.m_simd.val[3]; #endif } @@ -521,11 +416,6 @@ class SIMD_4x32 final return SIMD_4x32(vec_sl(m_simd, shifts)); #elif defined(BOTAN_SIMD_USE_NEON) return SIMD_4x32(vshlq_n_u32(m_simd, SHIFT)); -#else - return SIMD_4x32(m_simd.val[0] << SHIFT, - m_simd.val[1] << SHIFT, - m_simd.val[2] << SHIFT, - m_simd.val[3] << SHIFT); #endif } @@ -540,10 +430,6 @@ class SIMD_4x32 final return SIMD_4x32(vec_sr(m_simd, shifts)); #elif defined(BOTAN_SIMD_USE_NEON) return SIMD_4x32(vshrq_n_u32(m_simd, SHIFT)); -#else - return SIMD_4x32(m_simd.val[0] >> SHIFT, m_simd.val[1] >> SHIFT, - m_simd.val[2] >> SHIFT, m_simd.val[3] >> SHIFT); - #endif } @@ -555,8 +441,6 @@ class SIMD_4x32 final return SIMD_4x32(vec_nor(m_simd, m_simd)); #elif defined(BOTAN_SIMD_USE_NEON) return SIMD_4x32(vmvnq_u32(m_simd)); -#else - return SIMD_4x32(~m_simd.val[0], ~m_simd.val[1], ~m_simd.val[2], ~m_simd.val[3]); #endif } @@ -574,11 +458,6 @@ class SIMD_4x32 final #elif defined(BOTAN_SIMD_USE_NEON) // NEON is also a & ~b return SIMD_4x32(vbicq_u32(other.m_simd, m_simd)); -#else - return SIMD_4x32((~m_simd.val[0]) & other.m_simd.val[0], - (~m_simd.val[1]) & other.m_simd.val[1], - (~m_simd.val[2]) & other.m_simd.val[2], - (~m_simd.val[3]) & other.m_simd.val[3]); #endif } @@ -606,15 +485,7 @@ class SIMD_4x32 final return SIMD_4x32(vec.R[0], vec.R[1], vec.R[2], vec.R[3]); #elif defined(BOTAN_SIMD_USE_NEON) - return SIMD_4x32(vreinterpretq_u32_u8(vrev32q_u8(vreinterpretq_u8_u32(m_simd)))); - -#else - // scalar - return SIMD_4x32(reverse_bytes(m_simd.val[0]), - reverse_bytes(m_simd.val[1]), - reverse_bytes(m_simd.val[2]), - reverse_bytes(m_simd.val[3])); #endif } @@ -644,10 +515,8 @@ class SIMD_4x32 final B1.m_simd = vec_mergel(T0, T1); B2.m_simd = vec_mergeh(T2, T3); B3.m_simd = vec_mergel(T2, T3); -#elif defined(BOTAN_SIMD_USE_NEON) - -#if defined(BOTAN_TARGET_ARCH_IS_ARM32) +#elif defined(BOTAN_SIMD_USE_NEON) && defined(BOTAN_TARGET_ARCH_IS_ARM32) const uint32x4x2_t T0 = vzipq_u32(B0.m_simd, B2.m_simd); const uint32x4x2_t T1 = vzipq_u32(B1.m_simd, B3.m_simd); const uint32x4x2_t O0 = vzipq_u32(T0.val[0], T1.val[0]); @@ -658,32 +527,17 @@ class SIMD_4x32 final B2.m_simd = O1.val[0]; B3.m_simd = O1.val[1]; -#elif defined(BOTAN_TARGET_ARCH_IS_ARM64) +#elif defined(BOTAN_SIMD_USE_NEON) && defined(BOTAN_TARGET_ARCH_IS_ARM64) const uint32x4_t T0 = vzip1q_u32(B0.m_simd, B2.m_simd); const uint32x4_t T2 = vzip2q_u32(B0.m_simd, B2.m_simd); - const uint32x4_t T1 = vzip1q_u32(B1.m_simd, B3.m_simd); const uint32x4_t T3 = vzip2q_u32(B1.m_simd, B3.m_simd); B0.m_simd = vzip1q_u32(T0, T1); B1.m_simd = vzip2q_u32(T0, T1); - B2.m_simd = vzip1q_u32(T2, T3); B3.m_simd = vzip2q_u32(T2, T3); #endif - -#else - // scalar - SIMD_4x32 T0(B0.m_simd.val[0], B1.m_simd.val[0], B2.m_simd.val[0], B3.m_simd.val[0]); - SIMD_4x32 T1(B0.m_simd.val[1], B1.m_simd.val[1], B2.m_simd.val[1], B3.m_simd.val[1]); - SIMD_4x32 T2(B0.m_simd.val[2], B1.m_simd.val[2], B2.m_simd.val[2], B3.m_simd.val[2]); - SIMD_4x32 T3(B0.m_simd.val[3], B1.m_simd.val[3], B2.m_simd.val[3], B3.m_simd.val[3]); - - B0 = T0; - B1 = T1; - B2 = T2; - B3 = T3; -#endif } native_simd_type raw() const { return m_simd; } diff --git a/src/lib/utils/stl_compatibility.h b/src/lib/utils/stl_compatibility.h index 099af83b3..03bd5c8ac 100644 --- a/src/lib/utils/stl_compatibility.h +++ b/src/lib/utils/stl_compatibility.h @@ -8,6 +8,7 @@ #ifndef BOTAN_STL_COMPATIBILITY_H_ #define BOTAN_STL_COMPATIBILITY_H_ +#include <botan/types.h> #include <memory> #if __cplusplus < 201402L @@ -16,6 +17,8 @@ #include <utility> #endif +BOTAN_FUTURE_INTERNAL_HEADER(stl_compatability.h) + namespace Botan { /* diff --git a/src/lib/utils/uuid/uuid.h b/src/lib/utils/uuid/uuid.h index 38b5aab1b..8f95f4d67 100644 --- a/src/lib/utils/uuid/uuid.h +++ b/src/lib/utils/uuid/uuid.h @@ -12,6 +12,8 @@ #include <vector> #include <string> +BOTAN_FUTURE_INTERNAL_HEADER(uuid.h) + namespace Botan { class RandomNumberGenerator; diff --git a/src/lib/x509/datastor.h b/src/lib/x509/datastor.h index ec3c5189b..e849c3d89 100644 --- a/src/lib/x509/datastor.h +++ b/src/lib/x509/datastor.h @@ -15,6 +15,8 @@ #include <vector> #include <map> +BOTAN_FUTURE_INTERNAL_HEADER(datastor.h) + namespace Botan { /** diff --git a/src/lib/x509/x509_ext.cpp b/src/lib/x509/x509_ext.cpp index 0bfc337c4..55e3c434e 100644 --- a/src/lib/x509/x509_ext.cpp +++ b/src/lib/x509/x509_ext.cpp @@ -13,6 +13,7 @@ #include <botan/der_enc.h> #include <botan/ber_dec.h> #include <botan/hash.h> +#include <botan/loadstor.h> #include <botan/internal/bit_ops.h> #include <algorithm> #include <set> |