diff options
author | lloyd <[email protected]> | 2013-12-10 03:12:21 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2013-12-10 03:12:21 +0000 |
commit | 4874b0727843bba925bcd3b5c0659c5f1cb059d9 (patch) | |
tree | 0e946dde633162201396adb26eea165e74a6d779 /src | |
parent | c6ad94933ec0d718414ba41b3c289b872c04017f (diff) |
Add Threefish-512
Diffstat (limited to 'src')
-rw-r--r-- | src/benchmark/benchmark.cpp | 4 | ||||
-rw-r--r-- | src/benchmark/benchmark.h | 3 | ||||
-rw-r--r-- | src/block/threefish/info.txt | 1 | ||||
-rw-r--r-- | src/block/threefish/threefish.cpp | 160 | ||||
-rw-r--r-- | src/block/threefish/threefish.h | 52 |
5 files changed, 216 insertions, 4 deletions
diff --git a/src/benchmark/benchmark.cpp b/src/benchmark/benchmark.cpp index 83fd87d1b..396670168 100644 --- a/src/benchmark/benchmark.cpp +++ b/src/benchmark/benchmark.cpp @@ -18,8 +18,6 @@ namespace Botan { -namespace { - double time_op(std::chrono::nanoseconds runtime, std::function<void ()> op) { std::chrono::nanoseconds time_used(0); @@ -41,8 +39,6 @@ double time_op(std::chrono::nanoseconds runtime, std::function<void ()> op) return reps / seconds_used; // ie, return ops per second } -} - std::map<std::string, double> time_algorithm_ops(const std::string& name, Algorithm_Factory& af, diff --git a/src/benchmark/benchmark.h b/src/benchmark/benchmark.h index 93224dd2e..40784a767 100644 --- a/src/benchmark/benchmark.h +++ b/src/benchmark/benchmark.h @@ -50,6 +50,9 @@ BOTAN_DLL algorithm_benchmark(const std::string& name, std::chrono::milliseconds milliseconds, size_t buf_size); +double BOTAN_DLL +time_op(std::chrono::nanoseconds runtime, std::function<void ()> op); + } #endif diff --git a/src/block/threefish/info.txt b/src/block/threefish/info.txt new file mode 100644 index 000000000..91fc7bfb1 --- /dev/null +++ b/src/block/threefish/info.txt @@ -0,0 +1 @@ +define THREEFISH 20131209 diff --git a/src/block/threefish/threefish.cpp b/src/block/threefish/threefish.cpp new file mode 100644 index 000000000..5877235ab --- /dev/null +++ b/src/block/threefish/threefish.cpp @@ -0,0 +1,160 @@ +/* +* Threefish +* (C) 2013 Jack Lloyd +* +* Distributed under the terms of the Botan license +*/ + +#include <botan/threefish.h> +#include <botan/rotate.h> +#include <botan/loadstor.h> + +namespace Botan { + +secure_vector<byte> Threefish_512::start(const byte tweak[], size_t tweak_len) + { + if(!valid_nonce_length(tweak_len)) + throw Invalid_IV_Length(name(), tweak_len); + + m_T.resize(3); + + m_T[0] = load_le<u64bit>(tweak, 0); + m_T[1] = load_le<u64bit>(tweak, 1); + m_T[2] = m_T[0] ^ m_T[1]; + + return secure_vector<byte>(); + } + +void Threefish_512::update(secure_vector<byte>& blocks, size_t offset) + { + byte* buf = &blocks[offset]; + size_t sz = blocks.size() - offset; + + BOTAN_ASSERT(sz % update_granularity() == 0, "Block sized input"); + + BOTAN_ASSERT(m_T.size() == 3, "Tweak was set"); + + while(sz) + { +#define THREEFISH_ROUND(I1,I2,I3,I4,I5,I6,I7,I8,ROT1,ROT2,ROT3,ROT4) \ + do { \ + X##I1 += X##I2; X##I2 = rotate_left(X##I2, ROT1) ^ X##I1; \ + X##I3 += X##I4; X##I4 = rotate_left(X##I4, ROT2) ^ X##I3; \ + X##I5 += X##I6; X##I6 = rotate_left(X##I6, ROT3) ^ X##I5; \ + X##I7 += X##I8; X##I8 = rotate_left(X##I8, ROT4) ^ X##I7; \ + } while(0); + +#define THREEFISH_INJECT_KEY(r) \ + do { \ + X0 += m_K[(r ) % 9]; \ + X1 += m_K[(r+1) % 9]; \ + X2 += m_K[(r+2) % 9]; \ + X3 += m_K[(r+3) % 9]; \ + X4 += m_K[(r+4) % 9]; \ + X5 += m_K[(r+5) % 9] + m_T[(r ) % 3]; \ + X6 += m_K[(r+6) % 9] + m_T[(r+1) % 3]; \ + X7 += m_K[(r+7) % 9] + (r); \ + } while(0); + + u64bit X0 = load_le<u64bit>(buf, 0); + u64bit X1 = load_le<u64bit>(buf, 1); + u64bit X2 = load_le<u64bit>(buf, 2); + u64bit X3 = load_le<u64bit>(buf, 3); + u64bit X4 = load_le<u64bit>(buf, 4); + u64bit X5 = load_le<u64bit>(buf, 5); + u64bit X6 = load_le<u64bit>(buf, 6); + u64bit X7 = load_le<u64bit>(buf, 7); + + THREEFISH_INJECT_KEY(0); + +#define THREEFISH_8_ROUNDS(R1,R2) \ + do { \ + THREEFISH_ROUND(0,1,2,3,4,5,6,7, 46,36,19,37); \ + THREEFISH_ROUND(2,1,4,7,6,5,0,3, 33,27,14,42); \ + THREEFISH_ROUND(4,1,6,3,0,5,2,7, 17,49,36,39); \ + THREEFISH_ROUND(6,1,0,7,2,5,4,3, 44, 9,54,56); \ + \ + THREEFISH_INJECT_KEY(R1); \ + \ + THREEFISH_ROUND(0,1,2,3,4,5,6,7, 39,30,34,24); \ + THREEFISH_ROUND(2,1,4,7,6,5,0,3, 13,50,10,17); \ + THREEFISH_ROUND(4,1,6,3,0,5,2,7, 25,29,39,43); \ + THREEFISH_ROUND(6,1,0,7,2,5,4,3, 8,35,56,22); \ + \ + THREEFISH_INJECT_KEY(R2); \ + } while(0); + + THREEFISH_8_ROUNDS(1,2); + THREEFISH_8_ROUNDS(3,4); + THREEFISH_8_ROUNDS(5,6); + THREEFISH_8_ROUNDS(7,8); + THREEFISH_8_ROUNDS(9,10); + THREEFISH_8_ROUNDS(11,12); + THREEFISH_8_ROUNDS(13,14); + THREEFISH_8_ROUNDS(15,16); + THREEFISH_8_ROUNDS(17,18); + + store_le(buf, X0, X1, X2, X3, X4, X5, X6, X7); + + buf += 64; + sz -= 64; + } + } + +Key_Length_Specification Threefish_512::key_spec() const + { + return Key_Length_Specification(64); + } + +void Threefish_512::key_schedule(const byte key[], size_t) + { + // todo: define key schedule for smaller keys + m_K.resize(9); + + for(size_t i = 0; i != 8; ++i) + m_K[i] = load_le<u64bit>(key, i); + + m_K[8] = m_K[0] ^ m_K[1] ^ m_K[2] ^ m_K[3] ^ + m_K[4] ^ m_K[5] ^ m_K[6] ^ m_K[7] ^ 0x1BD11BDAA9FC1A22; + } + +void Threefish_512::finish(secure_vector<byte>& blocks, size_t offset) + { + update(blocks, offset); + m_T.clear(); + } + +size_t Threefish_512::output_length(size_t input_length) const + { + if(input_length % update_granularity() == 0) + throw std::invalid_argument("Threefish - invalid input length " + std::to_string(input_length)); + + return input_length; + } + +size_t Threefish_512::update_granularity() const + { + return 64; // single block + } + +size_t Threefish_512::minimum_final_size() const + { + return 0; + } + +size_t Threefish_512::default_nonce_size() const + { + return 16; + } + +bool Threefish_512::valid_nonce_length(size_t nonce_len) const + { + return default_nonce_size() == nonce_len; + } + +void Threefish_512::clear() + { + zeroise(m_K); + } + +} diff --git a/src/block/threefish/threefish.h b/src/block/threefish/threefish.h new file mode 100644 index 000000000..8fa758b12 --- /dev/null +++ b/src/block/threefish/threefish.h @@ -0,0 +1,52 @@ +/* +* Threefish +* (C) 2013 Jack Lloyd +* +* Distributed under the terms of the Botan license +*/ + +#ifndef BOTAN_THREEFISH_H__ +#define BOTAN_THREEFISH_H__ + +#include <botan/transform.h> + +namespace Botan { + +/** +* Threefish-512 +*/ +class BOTAN_DLL Threefish_512 : public Transformation + { + public: + secure_vector<byte> start(const byte tweak[], size_t tweak_len) override; + + void update(secure_vector<byte>& blocks, size_t offset) override; + + void finish(secure_vector<byte>& final_block, size_t offset) override; + + size_t output_length(size_t input_length) const override; + + size_t update_granularity() const override; + + size_t minimum_final_size() const override; + + size_t default_nonce_size() const override; + + bool valid_nonce_length(size_t nonce_len) const override; + + Key_Length_Specification key_spec() const override; + + std::string name() const { return "Threefish-512"; } + + void clear(); + + private: + void key_schedule(const byte key[], size_t key_len) override; + + secure_vector<u64bit> m_T; + secure_vector<u64bit> m_K; + }; + +} + +#endif |