diff options
author | Matthias Gierlings <[email protected]> | 2016-02-03 22:38:41 +0100 |
---|---|---|
committer | Matthias Gierlings <[email protected]> | 2016-10-27 19:42:32 +0200 |
commit | 425a2c2497387b7b5804738a77c757b93e630322 (patch) | |
tree | dfe9d327cfcf1bfe3a628b8f007200ff18083daf /src/lib/modes/aead | |
parent | 1b9d13aed71152d61fab7e0ba016d1951909bac5 (diff) |
Added implementation for GMAC
- Added GMAC class
- Integrated GMAC into MAC-Class test bench. Run GMAC tests using
./botan-test mac
Diffstat (limited to 'src/lib/modes/aead')
-rw-r--r-- | src/lib/modes/aead/gcm/gcm.cpp | 4 | ||||
-rw-r--r-- | src/lib/modes/aead/gcm/gcm.h | 99 |
2 files changed, 54 insertions, 49 deletions
diff --git a/src/lib/modes/aead/gcm/gcm.cpp b/src/lib/modes/aead/gcm/gcm.cpp index a73e5ee5b..6e1bd82f7 100644 --- a/src/lib/modes/aead/gcm/gcm.cpp +++ b/src/lib/modes/aead/gcm/gcm.cpp @@ -93,9 +93,9 @@ void GHASH::key_schedule(const byte key[], size_t length) m_text_len = 0; } -void GHASH::start(const byte nonce[], size_t len) +void GHASH::start(const secure_vector<byte>& nonce) { - m_nonce.assign(nonce, nonce + len); + m_nonce = nonce; m_ghash = m_H_ad; } diff --git a/src/lib/modes/aead/gcm/gcm.h b/src/lib/modes/aead/gcm/gcm.h index 6902bc1fa..964bd5062 100644 --- a/src/lib/modes/aead/gcm/gcm.h +++ b/src/lib/modes/aead/gcm/gcm.h @@ -14,7 +14,52 @@ namespace Botan { -class GHASH; +/** +* GCM's GHASH +* Maybe a Transform? +*/ +class BOTAN_DLL GHASH : public SymmetricAlgorithm + { + public: + void set_associated_data(const byte ad[], size_t ad_len); + + secure_vector<byte> nonce_hash(const byte nonce[], size_t len); + + void start(const secure_vector<byte>& nonce); + + /* + * Assumes input len is multiple of 16 + */ + void update(const byte in[], size_t len); + + secure_vector<byte> final(); + + Key_Length_Specification key_spec() const override + { return Key_Length_Specification(16); } + + size_t input_size() const { return m_text_len; } + + void clear() override; + + std::string name() const override { return "GHASH"; } + private: + void key_schedule(const byte key[], size_t key_len) override; + + void gcm_multiply(secure_vector<byte>& x) const; + + void ghash_update(secure_vector<byte>& x, + const byte input[], size_t input_len); + + void add_final_block(secure_vector<byte>& x, + size_t ad_len, size_t pt_len); + + secure_vector<byte> m_H; + secure_vector<byte> m_H_ad; + secure_vector<byte> m_nonce; + secure_vector<byte> m_ghash; + size_t m_ad_len = 0, m_text_len = 0; + }; + /** * GCM Mode @@ -28,6 +73,8 @@ class BOTAN_DLL GCM_Mode : public AEAD_Mode size_t update_granularity() const override; + void update(secure_vector<byte>& blocks, size_t offset = 0) override = 0; + Key_Length_Specification key_spec() const override; // GCM supports arbitrary nonce lengths @@ -35,6 +82,8 @@ class BOTAN_DLL GCM_Mode : public AEAD_Mode size_t tag_size() const override { return m_tag_size; } + size_t input_size() const { return m_ghash->input_size(); } + void clear() override; std::string provider() const override; @@ -51,7 +100,9 @@ class BOTAN_DLL GCM_Mode : public AEAD_Mode private: void start_msg(const byte nonce[], size_t nonce_len) override; + private: void key_schedule(const byte key[], size_t length) override; + secure_vector<byte> start_raw(const byte nonce[], size_t nonce_len) override; }; /** @@ -102,51 +153,5 @@ class BOTAN_DLL GCM_Decryption final : public GCM_Mode void finish(secure_vector<byte>& final_block, size_t offset = 0) override; }; - -/** -* GCM's GHASH -* Maybe a Transform? -*/ -class BOTAN_DLL GHASH : public SymmetricAlgorithm - { - public: - void set_associated_data(const byte ad[], size_t ad_len); - - secure_vector<byte> nonce_hash(const byte nonce[], size_t len); - - void start(const byte nonce[], size_t len); - - /* - * Assumes input len is multiple of 16 - */ - void update(const byte in[], size_t len); - - secure_vector<byte> final(); - - Key_Length_Specification key_spec() const override - { return Key_Length_Specification(16); } - - void clear() override; - - std::string name() const override { return "GHASH"; } - private: - void key_schedule(const byte key[], size_t key_len) override; - - void gcm_multiply(secure_vector<byte>& x) const; - - void ghash_update(secure_vector<byte>& x, - const byte input[], size_t input_len); - - void add_final_block(secure_vector<byte>& x, - size_t ad_len, size_t pt_len); - - secure_vector<byte> m_H; - secure_vector<byte> m_H_ad; - secure_vector<byte> m_nonce; - secure_vector<byte> m_ghash; - size_t m_ad_len = 0, m_text_len = 0; - }; - } - #endif |