arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove NULL_CHANNEL and CW8 workaround (Issue 382)

pull/354/merge
Jeffrey Walton 2017-03-01 03:54:02 -05:00
parent 0dc97f1d3a
commit 5fb2f5d45b
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cryptlib.cpp
View File

@ -46,19 +46,16 @@ CRYPTOPP_COMPILE_ASSERT(sizeof(dword) == 2*sizeof(word));
CRYPTOPP_COMPILE_ASSERT(CRYPTOPP_INIT_PRIORITY >= 101); CRYPTOPP_COMPILE_ASSERT(CRYPTOPP_INIT_PRIORITY >= 101);
const std::string DEFAULT_CHANNEL __attribute__ ((init_priority (CRYPTOPP_INIT_PRIORITY + 25))) = ""; const std::string DEFAULT_CHANNEL __attribute__ ((init_priority (CRYPTOPP_INIT_PRIORITY + 25))) = "";
const std::string AAD_CHANNEL __attribute__ ((init_priority (CRYPTOPP_INIT_PRIORITY + 26))) = "AAD"; const std::string AAD_CHANNEL __attribute__ ((init_priority (CRYPTOPP_INIT_PRIORITY + 26))) = "AAD";
const std::string &BufferedTransformation::NULL_CHANNEL = DEFAULT_CHANNEL;
#elif HAVE_MSC_INIT_PRIORITY #elif HAVE_MSC_INIT_PRIORITY
#pragma warning(disable: 4073) #pragma warning(disable: 4073)
#pragma init_seg(lib) #pragma init_seg(lib)
const std::string DEFAULT_CHANNEL = ""; const std::string DEFAULT_CHANNEL = "";
const std::string AAD_CHANNEL = "AAD"; const std::string AAD_CHANNEL = "AAD";
const std::string &BufferedTransformation::NULL_CHANNEL = DEFAULT_CHANNEL;
#pragma warning(default: 4073) #pragma warning(default: 4073)
#else #else
static const std::string s1(""), s2("AAD"); static const std::string s1(""), s2("AAD");
const std::string DEFAULT_CHANNEL = s1; const std::string DEFAULT_CHANNEL = s1;
const std::string AAD_CHANNEL = s2; const std::string AAD_CHANNEL = s2;
const std::string &BufferedTransformation::NULL_CHANNEL = DEFAULT_CHANNEL;
#endif #endif
class NullNameValuePairs : public NameValuePairs class NullNameValuePairs : public NameValuePairs

3
cryptlib.h
View File

@ -1335,9 +1335,6 @@ extern CRYPTOPP_DLL const std::string AAD_CHANNEL;
class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE BufferedTransformation : public Algorithm, public Waitable class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE BufferedTransformation : public Algorithm, public Waitable
{ {
public: public:
// placed up here for CW8
static const std::string &NULL_CHANNEL; // same as DEFAULT_CHANNEL, for backwards compatibility
virtual ~BufferedTransformation() {} virtual ~BufferedTransformation() {}
//! \brief Construct a BufferedTransformation //! \brief Construct a BufferedTransformation