From d0eefdf32a5ee7ba515d468b52fc2ea92d87fb84 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Mon, 4 Sep 2017 19:28:19 -0400 Subject: [PATCH] Use aligned buffer for Poly1305 nonce --- poly1305.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/poly1305.cpp b/poly1305.cpp index 7125b102..416b462a 100644 --- a/poly1305.cpp +++ b/poly1305.cpp @@ -34,7 +34,9 @@ void Poly1305_Base::UncheckedSetKey(const byte *key, unsigned int length, con if (params.GetValue(Name::IV(), t) && t.begin() && t.size()) { // Nonce key is a class member to avoid the zeroizer on a temporary - m_cipher.ProcessBlock(t.begin(), m_nk.begin()); + CRYPTOPP_ASSERT(t.size() == m_nk.size()); + std::memcpy(m_nk.begin(), t.begin(), t.size()); + m_cipher.ProcessBlock(m_nk.begin(), m_nk.begin()); m_n[0] = GetWord(false, LITTLE_ENDIAN_ORDER, m_nk + 0); m_n[1] = GetWord(false, LITTLE_ENDIAN_ORDER, m_nk + 4);