diff options
Diffstat (limited to 'src/pubkey/dlies/dlies.cpp')
| -rw-r--r-- | src/pubkey/dlies/dlies.cpp | 57 |
1 files changed, 32 insertions, 25 deletions
diff --git a/src/pubkey/dlies/dlies.cpp b/src/pubkey/dlies/dlies.cpp index 2a2f33925..06a08f7f9 100644 --- a/src/pubkey/dlies/dlies.cpp +++ b/src/pubkey/dlies/dlies.cpp @@ -4,7 +4,6 @@ *************************************************/ #include <botan/dlies.h> -#include <botan/lookup.h> #include <botan/look_pk.h> #include <botan/xor_buf.h> #include <memory> @@ -15,12 +14,19 @@ namespace Botan { * DLIES_Encryptor Constructor * *************************************************/ DLIES_Encryptor::DLIES_Encryptor(const PK_Key_Agreement_Key& k, - const std::string& kdf, - const std::string& mac, u32bit mk_len) : - key(k), kdf_algo(kdf), mac_algo(mac), MAC_KEYLEN(mk_len) + KDF* kdf_obj, + MessageAuthenticationCode* mac_obj, + u32bit mac_kl) : + key(k), kdf(kdf_obj), mac(mac_obj), mac_keylen(mac_kl) { } +DLIES_Encryptor::~DLIES_Encryptor() + { + delete kdf; + delete mac; + } + /************************************************* * DLIES Encryption * *************************************************/ @@ -32,9 +38,6 @@ SecureVector<byte> DLIES_Encryptor::enc(const byte in[], u32bit length, if(other_key.is_empty()) throw Invalid_State("DLIES: The other key was never set"); - std::auto_ptr<KDF> kdf(get_kdf(kdf_algo)); - std::auto_ptr<MessageAuthenticationCode> mac(get_mac(mac_algo)); - MemoryVector<byte> v = key.public_value(); SecureVector<byte> out(v.size() + length + mac->OUTPUT_LENGTH); @@ -43,14 +46,14 @@ SecureVector<byte> DLIES_Encryptor::enc(const byte in[], u32bit length, SecureVector<byte> vz(v, key.derive_key(other_key, other_key.size())); - const u32bit K_LENGTH = length + MAC_KEYLEN; + const u32bit K_LENGTH = length + mac_keylen; OctetString K = kdf->derive_key(K_LENGTH, vz, vz.size()); if(K.length() != K_LENGTH) throw Encoding_Error("DLIES: KDF did not provide sufficient output"); byte* C = out + v.size(); - xor_buf(C, K.begin() + MAC_KEYLEN, length); - mac->set_key(K.begin(), MAC_KEYLEN); + xor_buf(C, K.begin() + mac_keylen, length); + mac->set_key(K.begin(), mac_keylen); mac->update(C, length); for(u32bit j = 0; j != 8; ++j) @@ -81,39 +84,43 @@ u32bit DLIES_Encryptor::maximum_input_size() const * DLIES_Decryptor Constructor * *************************************************/ DLIES_Decryptor::DLIES_Decryptor(const PK_Key_Agreement_Key& k, - const std::string& kdf, - const std::string& mac, u32bit mk_len) : - key(k), kdf_algo(kdf), mac_algo(mac), - MAC_KEYLEN(mk_len), PUBLIC_LEN(key.public_value().size()) + KDF* kdf_obj, + MessageAuthenticationCode* mac_obj, + u32bit mac_kl) : + key(k), kdf(kdf_obj), mac(mac_obj), mac_keylen(mac_kl) { } +DLIES_Decryptor::~DLIES_Decryptor() + { + delete kdf; + delete mac; + } + /************************************************* * DLIES Decryption * *************************************************/ SecureVector<byte> DLIES_Decryptor::dec(const byte msg[], u32bit length) const { - std::auto_ptr<MessageAuthenticationCode> mac(get_mac(mac_algo)); + const u32bit public_len = key.public_value().size(); - if(length < PUBLIC_LEN + mac->OUTPUT_LENGTH) + if(length < public_len + mac->OUTPUT_LENGTH) throw Decoding_Error("DLIES decryption: ciphertext is too short"); - std::auto_ptr<KDF> kdf(get_kdf(kdf_algo)); - - const u32bit CIPHER_LEN = length - PUBLIC_LEN - mac->OUTPUT_LENGTH; + const u32bit CIPHER_LEN = length - public_len - mac->OUTPUT_LENGTH; - SecureVector<byte> v(msg, PUBLIC_LEN); - SecureVector<byte> C(msg + PUBLIC_LEN, CIPHER_LEN); - SecureVector<byte> T(msg + PUBLIC_LEN + CIPHER_LEN, mac->OUTPUT_LENGTH); + SecureVector<byte> v(msg, public_len); + SecureVector<byte> C(msg + public_len, CIPHER_LEN); + SecureVector<byte> T(msg + public_len + CIPHER_LEN, mac->OUTPUT_LENGTH); SecureVector<byte> vz(v, key.derive_key(v, v.size())); - const u32bit K_LENGTH = C.size() + MAC_KEYLEN; + const u32bit K_LENGTH = C.size() + mac_keylen; OctetString K = kdf->derive_key(K_LENGTH, vz, vz.size()); if(K.length() != K_LENGTH) throw Encoding_Error("DLIES: KDF did not provide sufficient output"); - mac->set_key(K.begin(), MAC_KEYLEN); + mac->set_key(K.begin(), mac_keylen); mac->update(C); for(u32bit j = 0; j != 8; ++j) mac->update(0); @@ -121,7 +128,7 @@ SecureVector<byte> DLIES_Decryptor::dec(const byte msg[], u32bit length) const if(T != T2) throw Integrity_Failure("DLIES: message authentication failed"); - xor_buf(C, K.begin() + MAC_KEYLEN, C.size()); + xor_buf(C, K.begin() + mac_keylen, C.size()); return C; } |