Avoid memcpy in AdditiveCipherTemplate<S>::ProcessData (GH #683, GH #1010, PR #1019)

We found we can avoid the memcpy in the previous workaround by using a volatile pointer. The pointer appears to tame the optimizer so the compiler does not short-circuit some calls when outString == inString.

1 files changed, 4 insertions, 1 deletions

diff --git a/strciphr.h b/strciphr.h
index 23cfbca9..7a71159a 100644
--- a/strciphr.h
+++ b/strciphr.h
@@ -702,13 +702,16 @@ public:
 

 NAMESPACE_END

 

+// Used by dll.cpp to ensure objects are in dll.o, and not strciphr.o.

 #ifdef CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES

-#include "strciphr.cpp"

+# include "strciphr.cpp"

 #endif

 

 NAMESPACE_BEGIN(CryptoPP)

+

 CRYPTOPP_DLL_TEMPLATE_CLASS AbstractPolicyHolder<AdditiveCipherAbstractPolicy, SymmetricCipher>;

 CRYPTOPP_DLL_TEMPLATE_CLASS AdditiveCipherTemplate<AbstractPolicyHolder<AdditiveCipherAbstractPolicy, SymmetricCipher> >;

+

 CRYPTOPP_DLL_TEMPLATE_CLASS CFB_CipherTemplate<AbstractPolicyHolder<CFB_CipherAbstractPolicy, SymmetricCipher> >;

 CRYPTOPP_DLL_TEMPLATE_CLASS CFB_EncryptionTemplate<AbstractPolicyHolder<CFB_CipherAbstractPolicy, SymmetricCipher> >;

 CRYPTOPP_DLL_TEMPLATE_CLASS CFB_DecryptionTemplate<AbstractPolicyHolder<CFB_CipherAbstractPolicy, SymmetricCipher> >;