Commit 64295d82 authored by kent@mysql.com's avatar kent@mysql.com

Merge

parents 423119d2 de430a14
...@@ -653,7 +653,7 @@ static struct my_option my_long_options[] = ...@@ -653,7 +653,7 @@ static struct my_option my_long_options[] =
"Base name of shared memory.", (gptr*) &shared_memory_base_name, (gptr*) &shared_memory_base_name, "Base name of shared memory.", (gptr*) &shared_memory_base_name, (gptr*) &shared_memory_base_name,
0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#endif #endif
{"socket", 'S', "Socket file to use for connection. (This will override --port unless --protocol=TCP is specified.)", {"socket", 'S', "Socket file to use for connection.",
(gptr*) &opt_mysql_unix_port, (gptr*) &opt_mysql_unix_port, 0, GET_STR_ALLOC, (gptr*) &opt_mysql_unix_port, (gptr*) &opt_mysql_unix_port, 0, GET_STR_ALLOC,
REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#include "sslopt-longopts.h" #include "sslopt-longopts.h"
...@@ -940,13 +940,6 @@ static int get_options(int argc, char **argv) ...@@ -940,13 +940,6 @@ static int get_options(int argc, char **argv)
connect_flag= 0; /* Not in interactive mode */ connect_flag= 0; /* Not in interactive mode */
} }
if (opt_mysql_port && (!opt_protocol) && (!opt_mysql_unix_port))
{
/* Not checking return type since we are using a constant value */
/* straight from the initialization of sql_protocol_typelib. */
opt_protocol= find_type("TCP", &sql_protocol_typelib, 0);
}
if (strcmp(default_charset, charset_info->csname) && if (strcmp(default_charset, charset_info->csname) &&
!(charset_info= get_charset_by_csname(default_charset, !(charset_info= get_charset_by_csname(default_charset,
MY_CS_PRIMARY, MYF(MY_WME)))) MY_CS_PRIMARY, MYF(MY_WME))))
......
/* rsa.h for openSSL */ /* rsa.h for openSSL */
#ifndef ysSSL_rsa_h__ #ifndef yaSSL_rsa_h__
#define yaSSL_rsa_h__ #define yaSSL_rsa_h__
enum { RSA_F4 = 1 }; enum { RSA_F4 = 1 };
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* *
*/ */
#ifndef ysSSL_openssl_h__ #ifndef yaSSL_openssl_h__
#define yaSSL_openssl_h__ #define yaSSL_openssl_h__
#include <stdio.h> /* ERR_print fp */ #include <stdio.h> /* ERR_print fp */
......
...@@ -123,8 +123,6 @@ public: ...@@ -123,8 +123,6 @@ public:
friend sslFactory& GetSSL_Factory(); // singleton creator friend sslFactory& GetSSL_Factory(); // singleton creator
private: private:
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
}; };
...@@ -216,8 +214,6 @@ public: ...@@ -216,8 +214,6 @@ 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
}; };
......
...@@ -34,6 +34,11 @@ ...@@ -34,6 +34,11 @@
namespace yaSSL { namespace yaSSL {
// Delete static singleton memory holders
void CleanUp();
// library allocation // library allocation
struct new_t {}; // yaSSL New type struct new_t {}; // yaSSL New type
extern new_t ys; // pass in parameter extern new_t ys; // pass in parameter
......
...@@ -648,8 +648,6 @@ void build_certHashes(SSL& ssl, Hashes& hashes) ...@@ -648,8 +648,6 @@ void build_certHashes(SSL& ssl, Hashes& hashes)
} }
mySTL::auto_ptr<input_buffer> null_buffer(ysDelete);
// do process input requests // do process input requests
mySTL::auto_ptr<input_buffer> mySTL::auto_ptr<input_buffer>
DoProcessReply(SSL& ssl, mySTL::auto_ptr<input_buffer> buffered) DoProcessReply(SSL& ssl, mySTL::auto_ptr<input_buffer> buffered)
...@@ -659,7 +657,8 @@ DoProcessReply(SSL& ssl, mySTL::auto_ptr<input_buffer> buffered) ...@@ -659,7 +657,8 @@ DoProcessReply(SSL& ssl, mySTL::auto_ptr<input_buffer> buffered)
if (!ready) { if (!ready) {
// Nothing to receive after blocking wait => error // Nothing to receive after blocking wait => error
ssl.SetError(receive_error); ssl.SetError(receive_error);
return buffered= null_buffer; buffered.reset(0);
return buffered;
} }
// add buffered data if its there // add buffered data if its there
...@@ -667,10 +666,10 @@ DoProcessReply(SSL& ssl, mySTL::auto_ptr<input_buffer> buffered) ...@@ -667,10 +666,10 @@ DoProcessReply(SSL& ssl, mySTL::auto_ptr<input_buffer> buffered)
input_buffer buffer(buffSz + ready); input_buffer buffer(buffSz + ready);
if (buffSz) { if (buffSz) {
buffer.assign(buffered.get()->get_buffer(), buffSz); buffer.assign(buffered.get()->get_buffer(), buffSz);
buffered = null_buffer; buffered.reset(0);
} }
// add new (ys) data // add new data
uint read = ssl.getSocket().receive(buffer.get_buffer() + buffSz, ready); uint read = ssl.getSocket().receive(buffer.get_buffer() + buffSz, ready);
buffer.add_size(read); buffer.add_size(read);
uint offset = 0; uint offset = 0;
...@@ -703,11 +702,15 @@ DoProcessReply(SSL& ssl, mySTL::auto_ptr<input_buffer> buffered) ...@@ -703,11 +702,15 @@ DoProcessReply(SSL& ssl, mySTL::auto_ptr<input_buffer> buffered)
mySTL::auto_ptr<Message> msg(mf.CreateObject(hdr.type_), ysDelete); mySTL::auto_ptr<Message> msg(mf.CreateObject(hdr.type_), ysDelete);
if (!msg.get()) { if (!msg.get()) {
ssl.SetError(factory_error); ssl.SetError(factory_error);
return buffered = null_buffer; buffered.reset(0);
return buffered;
} }
buffer >> *msg; buffer >> *msg;
msg->Process(buffer, ssl); msg->Process(buffer, ssl);
if (ssl.GetError()) return buffered = null_buffer; if (ssl.GetError()) {
buffered.reset(0);
return buffered;
}
} }
offset += hdr.length_ + RECORD_HEADER; offset += hdr.length_ + RECORD_HEADER;
} }
......
...@@ -87,6 +87,8 @@ template void ysDelete<BulkCipher>(BulkCipher*); ...@@ -87,6 +87,8 @@ template void ysDelete<BulkCipher>(BulkCipher*);
template void ysDelete<Digest>(Digest*); template void ysDelete<Digest>(Digest*);
template void ysDelete<X509>(X509*); template void ysDelete<X509>(X509*);
template void ysDelete<Message>(Message*); template void ysDelete<Message>(Message*);
template void ysDelete<sslFactory>(sslFactory*);
template void ysDelete<Sessions>(Sessions*);
template void ysArrayDelete<unsigned char>(unsigned char*); template void ysArrayDelete<unsigned char>(unsigned char*);
template void ysArrayDelete<char>(char*); template void ysArrayDelete<char>(char*);
} }
......
...@@ -1361,19 +1361,31 @@ SSL_SESSION::~SSL_SESSION() ...@@ -1361,19 +1361,31 @@ SSL_SESSION::~SSL_SESSION()
} }
Sessions Sessions::instance_; // simple singleton static Sessions* sessionsInstance = 0;
Sessions& GetSessions() Sessions& GetSessions()
{ {
return Sessions::instance_; if (!sessionsInstance)
sessionsInstance = new (ys) Sessions;
return *sessionsInstance;
} }
sslFactory sslFactory::instance_; // simple singleton static sslFactory* sslFactoryInstance = 0;
sslFactory& GetSSL_Factory() sslFactory& GetSSL_Factory()
{ {
return sslFactory::instance_; if (!sslFactoryInstance)
sslFactoryInstance = new (ys) sslFactory;
return *sslFactoryInstance;
}
void CleanUp()
{
TaoCrypt::CleanUp();
ysDelete(sslFactoryInstance);
ysDelete(sessionsInstance);
} }
......
...@@ -275,8 +275,6 @@ private: ...@@ -275,8 +275,6 @@ private:
AlignedWordBlock reg_; AlignedWordBlock reg_;
Sign sign_; Sign sign_;
static const Integer zero_;
static const Integer one_;
}; };
inline bool operator==(const Integer& a, const Integer& b) inline bool operator==(const Integer& a, const Integer& b)
......
...@@ -34,6 +34,11 @@ ...@@ -34,6 +34,11 @@
namespace TaoCrypt { namespace TaoCrypt {
// Delete static singleton holders
void CleanUp();
// library allocation // library allocation
struct new_t {}; // TaoCrypt New type struct new_t {}; // TaoCrypt New type
extern new_t tc; // pass in parameter extern new_t tc; // pass in parameter
......
...@@ -25,11 +25,27 @@ ...@@ -25,11 +25,27 @@
#if !defined(yaSSL_NEW_HPP) && defined(__GNUC__) #ifndef yaSSL_NEW_HPP
#if !(defined(__ICC) || defined(__INTEL_COMPILER))
#define yaSSL_NEW_HPP #define yaSSL_NEW_HPP
#ifdef __sun
#include <assert.h>
// Handler for pure virtual functions
namespace __Crun {
static void pure_error(void)
{
assert("Pure virtual method called." == "Aborted");
}
} // namespace __Crun
#endif // __sun
#if defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
#if __GNUC__ > 2 #if __GNUC__ > 2
extern "C" { extern "C" {
...@@ -47,6 +63,6 @@ static int __cxa_pure_virtual() ...@@ -47,6 +63,6 @@ static int __cxa_pure_virtual()
} // extern "C" } // extern "C"
#endif // __GNUC__ > 2 #endif // __GNUC__ > 2
#endif // ! _ICC #endif // compiler check
#endif // yaSSL_NEW_HPP && __GNUC__ #endif // yaSSL_NEW_HPP
...@@ -76,7 +76,9 @@ const Integer& AbstractEuclideanDomain::Mod(const Element &a, ...@@ -76,7 +76,9 @@ const Integer& AbstractEuclideanDomain::Mod(const Element &a,
const Integer& AbstractEuclideanDomain::Gcd(const Element &a, const Integer& AbstractEuclideanDomain::Gcd(const Element &a,
const Element &b) const const Element &b) const
{ {
Element g[3]={b, a}; mySTL::vector<Element> g(3);
g[0]= b;
g[1]= a;
unsigned int i0=0, i1=1, i2=2; unsigned int i0=0, i1=1, i2=2;
while (!Equal(g[i1], this->Identity())) while (!Equal(g[i1], this->Identity()))
......
...@@ -2709,19 +2709,32 @@ unsigned int Integer::Encode(byte* output, unsigned int outputLen, ...@@ -2709,19 +2709,32 @@ unsigned int Integer::Encode(byte* output, unsigned int outputLen,
} }
const Integer Integer::zero_; static Integer* zero = 0;
const Integer &Integer::Zero() const Integer &Integer::Zero()
{ {
return zero_; if (!zero)
zero = new (tc) Integer;
return *zero;
} }
const Integer Integer::one_(1,2); static Integer* one = 0;
const Integer &Integer::One() const Integer &Integer::One()
{ {
return one_; if (!one)
one = new (tc) Integer(1,2);
return *one;
}
// Clean up static singleton holders, not a leak, but helpful to have gone
// when checking for leaks
void CleanUp()
{
tcDelete(one);
tcDelete(zero);
} }
......
...@@ -41,6 +41,7 @@ template class RSA_Decryptor<RSA_BlockType2>; ...@@ -41,6 +41,7 @@ template class RSA_Decryptor<RSA_BlockType2>;
template class RSA_Encryptor<RSA_BlockType1>; template class RSA_Encryptor<RSA_BlockType1>;
template class RSA_Encryptor<RSA_BlockType2>; template class RSA_Encryptor<RSA_BlockType2>;
template void tcDelete<HASH>(HASH*); template void tcDelete<HASH>(HASH*);
template void tcDelete<Integer>(Integer*);
template void tcArrayDelete<byte>(byte*); template void tcArrayDelete<byte>(byte*);
template AllocatorWithCleanup<byte>::pointer StdReallocate<byte, AllocatorWithCleanup<byte> >(AllocatorWithCleanup<byte>&, byte*, AllocatorWithCleanup<byte>::size_type, AllocatorWithCleanup<byte>::size_type, bool); template AllocatorWithCleanup<byte>::pointer StdReallocate<byte, AllocatorWithCleanup<byte> >(AllocatorWithCleanup<byte>&, byte*, AllocatorWithCleanup<byte>::size_type, AllocatorWithCleanup<byte>::size_type, bool);
template void tcArrayDelete<word>(word*); template void tcArrayDelete<word>(word*);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment