diff options
| -rw-r--r-- | doc/credits.txt | 2 | ||||
| -rw-r--r-- | include/bit_ops.h | 168 | ||||
| -rw-r--r-- | include/loadstor.h | 180 |
3 files changed, 183 insertions, 167 deletions
diff --git a/doc/credits.txt b/doc/credits.txt index 8ce98add3..2805b3ed6 100644 --- a/doc/credits.txt +++ b/doc/credits.txt @@ -19,7 +19,7 @@ D: Windows porting N: Yves Jerschow -D: Optimizations for memory load/store, HMAC +D: Optimizations for memory load/store and HMAC S: Germany N: Matt Johnston diff --git a/include/bit_ops.h b/include/bit_ops.h index 0636cac41..4b8d248d6 100644 --- a/include/bit_ops.h +++ b/include/bit_ops.h @@ -7,11 +7,12 @@ #define BOTAN_BIT_OPS_H__ #include <botan/types.h> +#include <botan/loadstor.h> namespace Botan { /************************************************* -* Rotation Functions * +* Word Rotation Functions * *************************************************/ template<typename T> inline T rotate_left(T input, u32bit rot) { return (T)((input << rot) | (input >> (8*sizeof(T)-rot))); } @@ -20,31 +21,6 @@ template<typename T> inline T rotate_right(T input, u32bit rot) { return (T)((input >> rot) | (input << (8*sizeof(T)-rot))); } /************************************************* -* Byte Extraction Function * -*************************************************/ -template<typename T> inline byte get_byte(u32bit byte_num, T input) - { return (byte)(input >> ((sizeof(T)-1-(byte_num&(sizeof(T)-1))) << 3)); } - -/************************************************* -* Byte to Word Conversions * -*************************************************/ -inline u16bit make_u16bit(byte input0, byte input1) - { return (u16bit)(((u16bit)input0 << 8) | input1); } - -inline u32bit make_u32bit(byte input0, byte input1, byte input2, byte input3) - { return (u32bit)(((u32bit)input0 << 24) | ((u32bit)input1 << 16) | - ((u32bit)input2 << 8) | input3); } - -inline u64bit make_u64bit(byte input0, byte input1, byte input2, byte input3, - byte input4, byte input5, byte input6, byte input7) - { - return (u64bit)(((u64bit)input0 << 56) | ((u64bit)input1 << 48) | - ((u64bit)input2 << 40) | ((u64bit)input3 << 32) | - ((u64bit)input4 << 24) | ((u64bit)input5 << 16) | - ((u64bit)input6 << 8) | input7); - } - -/************************************************* * XOR Functions * *************************************************/ void xor_buf(byte[], const byte[], u32bit); @@ -59,146 +35,6 @@ u32bit low_bit(u64bit); u32bit significant_bytes(u64bit); u32bit hamming_weight(u64bit); -/************************************************* -* Endian-Specific Word Loading Operations * -*************************************************/ -template<typename T> -inline T load_be(const byte in[], u32bit off) - { - in += off * sizeof(T); - T out = 0; - for(u32bit j = 0; j != sizeof(T); j++) - out = (out << 8) | in[j]; - return out; - } - -template<typename T> -inline T load_le(const byte in[], u32bit off) - { - in += off * sizeof(T); - T out = 0; - for(u32bit j = 0; j != sizeof(T); j++) - out = (out << 8) | in[sizeof(T)-1-j]; - return out; - } - -template<> -inline u32bit load_be<u32bit>(const byte in[], u32bit off) - { - in += off * sizeof(u32bit); - return make_u32bit(in[0], in[1], in[2], in[3]); - } - -template<> -inline u32bit load_le<u32bit>(const byte in[], u32bit off) - { - in += off * sizeof(u32bit); - return make_u32bit(in[3], in[2], in[1], in[0]); - } - -template<> -inline u64bit load_be<u64bit>(const byte in[], u32bit off) - { - in += off * sizeof(u64bit); - return make_u64bit(in[0], in[1], in[2], in[3], - in[4], in[5], in[6], in[7]); - } - -template<> -inline u64bit load_le<u64bit>(const byte in[], u32bit off) - { - in += off * sizeof(u64bit); - return make_u64bit(in[7], in[6], in[5], in[4], - in[3], in[2], in[1], in[0]); - } - -/************************************************* -* Endian-Specific Word Storing Operations * -*************************************************/ -inline void store_be(u16bit in, byte out[2]) - { - out[0] = get_byte(0, in); - out[1] = get_byte(1, in); - } - -inline void store_le(u16bit in, byte out[2]) - { - out[0] = get_byte(1, in); - out[1] = get_byte(0, in); - } - -inline void store_be(u32bit in, byte out[4]) - { - out[0] = get_byte(0, in); - out[1] = get_byte(1, in); - out[2] = get_byte(2, in); - out[3] = get_byte(3, in); - } - -inline void store_le(u32bit in, byte out[4]) - { - out[0] = get_byte(3, in); - out[1] = get_byte(2, in); - out[2] = get_byte(1, in); - out[3] = get_byte(0, in); - } - -inline void store_be(u64bit in, byte out[8]) - { - out[0] = get_byte(0, in); - out[1] = get_byte(1, in); - out[2] = get_byte(2, in); - out[3] = get_byte(3, in); - out[4] = get_byte(4, in); - out[5] = get_byte(5, in); - out[6] = get_byte(6, in); - out[7] = get_byte(7, in); - } - -inline void store_le(u64bit in, byte out[8]) - { - out[0] = get_byte(7, in); - out[1] = get_byte(6, in); - out[2] = get_byte(5, in); - out[3] = get_byte(4, in); - out[4] = get_byte(3, in); - out[5] = get_byte(2, in); - out[6] = get_byte(1, in); - out[7] = get_byte(0, in); - } - -template<typename T> -inline void store_le(byte out[], T a, T b) - { - store_le(a, out + (0 * sizeof(T))); - store_le(b, out + (1 * sizeof(T))); - } - -template<typename T> -inline void store_be(byte out[], T a, T b) - { - store_be(a, out + (0 * sizeof(T))); - store_be(b, out + (1 * sizeof(T))); - } - -template<typename T> -inline void store_le(byte out[], T a, T b, T c, T d) - { - store_le(a, out + (0 * sizeof(T))); - store_le(b, out + (1 * sizeof(T))); - store_le(c, out + (2 * sizeof(T))); - store_le(d, out + (3 * sizeof(T))); - } - -template<typename T> -inline void store_be(byte out[], T a, T b, T c, T d) - { - store_be(a, out + (0 * sizeof(T))); - store_be(b, out + (1 * sizeof(T))); - store_be(c, out + (2 * sizeof(T))); - store_be(d, out + (3 * sizeof(T))); - } - } #endif diff --git a/include/loadstor.h b/include/loadstor.h new file mode 100644 index 000000000..f9ce7417f --- /dev/null +++ b/include/loadstor.h @@ -0,0 +1,180 @@ +/************************************************* +* Load/Store Operators Header File * +* (C) 1999-2007 The Botan Project * +*************************************************/ + +#ifndef BOTAN_LOAD_STORE_H__ +#define BOTAN_LOAD_STORE_H__ + +#include <botan/types.h> + +namespace Botan { + +/************************************************* +* Byte Extraction Function * +*************************************************/ +template<typename T> inline byte get_byte(u32bit byte_num, T input) + { return (byte)(input >> ((sizeof(T)-1-(byte_num&(sizeof(T)-1))) << 3)); } + +/************************************************* +* Byte to Word Conversions * +*************************************************/ +inline u16bit make_u16bit(byte input0, byte input1) + { return (u16bit)(((u16bit)input0 << 8) | input1); } + +inline u32bit make_u32bit(byte input0, byte input1, byte input2, byte input3) + { return (u32bit)(((u32bit)input0 << 24) | ((u32bit)input1 << 16) | + ((u32bit)input2 << 8) | input3); } + +inline u64bit make_u64bit(byte input0, byte input1, byte input2, byte input3, + byte input4, byte input5, byte input6, byte input7) + { + return (u64bit)(((u64bit)input0 << 56) | ((u64bit)input1 << 48) | + ((u64bit)input2 << 40) | ((u64bit)input3 << 32) | + ((u64bit)input4 << 24) | ((u64bit)input5 << 16) | + ((u64bit)input6 << 8) | input7); + } + +/************************************************* +* Endian-Specific Word Loading Operations * +*************************************************/ +template<typename T> +inline T load_be(const byte in[], u32bit off) + { + in += off * sizeof(T); + T out = 0; + for(u32bit j = 0; j != sizeof(T); j++) + out = (out << 8) | in[j]; + return out; + } + +template<typename T> +inline T load_le(const byte in[], u32bit off) + { + in += off * sizeof(T); + T out = 0; + for(u32bit j = 0; j != sizeof(T); j++) + out = (out << 8) | in[sizeof(T)-1-j]; + return out; + } + +template<> +inline u32bit load_be<u32bit>(const byte in[], u32bit off) + { + in += off * sizeof(u32bit); + return make_u32bit(in[0], in[1], in[2], in[3]); + } + +template<> +inline u32bit load_le<u32bit>(const byte in[], u32bit off) + { + in += off * sizeof(u32bit); + return make_u32bit(in[3], in[2], in[1], in[0]); + } + +template<> +inline u64bit load_be<u64bit>(const byte in[], u32bit off) + { + in += off * sizeof(u64bit); + return make_u64bit(in[0], in[1], in[2], in[3], + in[4], in[5], in[6], in[7]); + } + +template<> +inline u64bit load_le<u64bit>(const byte in[], u32bit off) + { + in += off * sizeof(u64bit); + return make_u64bit(in[7], in[6], in[5], in[4], + in[3], in[2], in[1], in[0]); + } + +/************************************************* +* Endian-Specific Word Storing Operations * +*************************************************/ +inline void store_be(u16bit in, byte out[2]) + { + out[0] = get_byte(0, in); + out[1] = get_byte(1, in); + } + +inline void store_le(u16bit in, byte out[2]) + { + out[0] = get_byte(1, in); + out[1] = get_byte(0, in); + } + +inline void store_be(u32bit in, byte out[4]) + { + out[0] = get_byte(0, in); + out[1] = get_byte(1, in); + out[2] = get_byte(2, in); + out[3] = get_byte(3, in); + } + +inline void store_le(u32bit in, byte out[4]) + { + out[0] = get_byte(3, in); + out[1] = get_byte(2, in); + out[2] = get_byte(1, in); + out[3] = get_byte(0, in); + } + +inline void store_be(u64bit in, byte out[8]) + { + out[0] = get_byte(0, in); + out[1] = get_byte(1, in); + out[2] = get_byte(2, in); + out[3] = get_byte(3, in); + out[4] = get_byte(4, in); + out[5] = get_byte(5, in); + out[6] = get_byte(6, in); + out[7] = get_byte(7, in); + } + +inline void store_le(u64bit in, byte out[8]) + { + out[0] = get_byte(7, in); + out[1] = get_byte(6, in); + out[2] = get_byte(5, in); + out[3] = get_byte(4, in); + out[4] = get_byte(3, in); + out[5] = get_byte(2, in); + out[6] = get_byte(1, in); + out[7] = get_byte(0, in); + } + +template<typename T> +inline void store_le(byte out[], T a, T b) + { + store_le(a, out + (0 * sizeof(T))); + store_le(b, out + (1 * sizeof(T))); + } + +template<typename T> +inline void store_be(byte out[], T a, T b) + { + store_be(a, out + (0 * sizeof(T))); + store_be(b, out + (1 * sizeof(T))); + } + +template<typename T> +inline void store_le(byte out[], T a, T b, T c, T d) + { + store_le(a, out + (0 * sizeof(T))); + store_le(b, out + (1 * sizeof(T))); + store_le(c, out + (2 * sizeof(T))); + store_le(d, out + (3 * sizeof(T))); + } + +template<typename T> +inline void store_be(byte out[], T a, T b, T c, T d) + { + store_be(a, out + (0 * sizeof(T))); + store_be(b, out + (1 * sizeof(T))); + store_be(c, out + (2 * sizeof(T))); + store_be(d, out + (3 * sizeof(T))); + } + +} + +#endif |