database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

WL#2286 - Compile MySQL w/YASSL support

Browse Source 
Merge with latest yaSSL, fix compilation error for SSE2 processors.


extra/yassl/include/yassl_int.hpp:
  Merge with latest yaSSL.
extra/yassl/src/log.cpp:
  Merge with latest yaSSL.
extra/yassl/src/yassl_int.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/integer.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/integer.cpp:
  Fix compilation error for SSE2 processors.
This commit is contained in:
unknown
2005-05-25 19:11:36 +05:00
parent d9d47c6a6f
commit f0f9b5959e
5 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extra/yassl/include/yassl_int.hpp
View File

@ -122,7 +122,8 @@ public:
friend sslFactory& GetSSL_Factory(); // singleton creator friend sslFactory& GetSSL_Factory(); // singleton creator
private: private:
static sslFactory instance; static sslFactory instance_;
sslFactory(const sslFactory&); // hide copy sslFactory(const sslFactory&); // hide copy
sslFactory& operator=(const sslFactory&); // and assign sslFactory& operator=(const sslFactory&); // and assign
}; };
@ -207,9 +208,10 @@ public:
friend Sessions& GetSessions(); // singleton creator friend Sessions& GetSessions(); // singleton creator
private: private:
static Sessions instance_;
Sessions(const Sessions&); // hide copy Sessions(const Sessions&); // hide copy
Sessions& operator=(const Sessions&); // and assign Sessions& operator=(const Sessions&); // and assign
static Sessions instance;
}; };

6
extra/yassl/src/log.cpp
View File

@ -26,9 +26,9 @@
#include "log.hpp" #include "log.hpp"
#ifdef YASSL_LOG #ifdef YASSL_LOG
#include <ctime> #include <time.h>
#include <cstdio> #include <stdio.h>
#include <cstring> #include <string.h>
#endif #endif

9
extra/yassl/src/yassl_int.cpp
View File

@ -1324,18 +1324,19 @@ SSL_SESSION::~SSL_SESSION()
} }
Sessions Sessions::instance; // simple singleton Sessions Sessions::instance_; // simple singleton
Sessions& GetSessions() Sessions& GetSessions()
{ {
return Sessions::instance; return Sessions::instance_;
} }
sslFactory sslFactory::instance;
sslFactory sslFactory::instance_; // simple singleton
sslFactory& GetSSL_Factory() sslFactory& GetSSL_Factory()
{ {
return sslFactory::instance; return sslFactory::instance_;
} }

2
extra/yassl/taocrypt/include/integer.hpp
View File

@ -251,11 +251,11 @@ public:
private: private:
friend class ModularArithmetic; friend class ModularArithmetic;
friend class MontgomeryRepresentation; friend class MontgomeryRepresentation;
Integer(word value, unsigned int length);
static const Integer zero; static const Integer zero;
static const Integer one; static const Integer one;
static const Integer two; static const Integer two;
Integer(word value, unsigned int length);
int PositiveCompare(const Integer& t) const; int PositiveCompare(const Integer& t) const;
friend void PositiveAdd(Integer& sum, const Integer& a, const Integer& b); friend void PositiveAdd(Integer& sum, const Integer& a, const Integer& b);

3
extra/yassl/taocrypt/src/integer.cpp
View File

@ -3948,6 +3948,9 @@ Integer CRT(const Integer &xp, const Integer &p, const Integer &xq,
#ifdef __GNUC__ #ifdef __GNUC__
template unsigned int DivideThreeWordsByTwo<unsigned int, DWord>(unsigned int*, unsigned int, unsigned int, DWord*); template unsigned int DivideThreeWordsByTwo<unsigned int, DWord>(unsigned int*, unsigned int, unsigned int, DWord*);
#if defined(SSE2_INTRINSICS_AVAILABLE)
template AlignedAllocator<unsigned int>::pointer StdReallocate<unsigned int, AlignedAllocator<unsigned int> >(AlignedAllocator<unsigned int>&, unsigned int*, AlignedAllocator<unsigned int>::size_type, AlignedAllocator<unsigned int>::size_type, bool);
#endif
#endif #endif
} // namespace } // namespace