From d0cd32f405244b28c4a78fc11fe5eb87a7397af1 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Thu, 27 Jul 2017 20:28:23 -0400 Subject: [PATCH] Make SecBlock data members protected Also see http://github.com/weidai11/cryptopp/issues/448 --- secblock.h | 2 +- sosemanuk.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/secblock.h b/secblock.h index 1a57c5cb..6eb3b5cf 100644 --- a/secblock.h +++ b/secblock.h @@ -796,7 +796,7 @@ public: std::swap(m_ptr, b.m_ptr); } -// protected: +protected: A m_alloc; size_type m_mark, m_size; T *m_ptr; diff --git a/sosemanuk.cpp b/sosemanuk.cpp index b96192b8..7aa1bff1 100644 --- a/sosemanuk.cpp +++ b/sosemanuk.cpp @@ -601,9 +601,9 @@ void SosemanukPolicy::OperateKeystream(KeystreamOperation operation, byte *outpu AS_POP_IF86( bx) ATT_PREFIX : - : "a" (m_state.m_ptr), "c" (iterationCount), "S" (s_sosemanukMulTables), "D" (output), "d" (input) + : "a" (m_state.data()), "c" (iterationCount), "S" (s_sosemanukMulTables), "D" (output), "d" (input) #if CRYPTOPP_BOOL_X64 - , "r" (workspace.m_ptr) + , "r" (workspace.data()) : "memory", "cc", "%r9", "%r10", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7" #else : "memory", "cc"