From ef465af87d61c0cfbba17b86a3e1cc48b90ab391 Mon Sep 17 00:00:00 2001 From: lloyd Date: Sat, 18 Jan 2014 19:45:16 +0000 Subject: Use unique_ptr instead of bare pointers and explicit delete in block, mac, hash. m_ namespaced everything while I'm in there. Changed CMAC poly_double signature. --- src/lib/modes/aead/siv/siv.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/modes/aead/siv') diff --git a/src/lib/modes/aead/siv/siv.cpp b/src/lib/modes/aead/siv/siv.cpp index a89c3dd08..be998cdb0 100644 --- a/src/lib/modes/aead/siv/siv.cpp +++ b/src/lib/modes/aead/siv/siv.cpp @@ -104,19 +104,19 @@ secure_vector SIV_Mode::S2V(const byte* text, size_t text_len) for(size_t i = 0; i != m_ad_macs.size(); ++i) { - V = CMAC::poly_double(V, 0x87); + V = CMAC::poly_double(V); V ^= m_ad_macs[i]; } if(m_nonce.size()) { - V = CMAC::poly_double(V, 0x87); + V = CMAC::poly_double(V); V ^= m_nonce; } if(text_len < 16) { - V = CMAC::poly_double(V, 0x87); + V = CMAC::poly_double(V); xor_buf(&V[0], text, text_len); V[text_len] ^= 0x80; return cmac().process(V); -- cgit v1.2.3