Commit c13cc758 authored by unknown's avatar unknown
Browse files

Merge mysqldev@production.mysql.com:my/mysql-5.0-release 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-release
parents a8159c71 5db9db07

extra/yassl/include/openssl/rsa.h

+1 −1
Original line number Diff line number Diff line 
/* rsa.h for openSSL */





#ifndef ysSSL_rsa_h__

#ifndef yaSSL_rsa_h__

#define yaSSL_rsa_h__



enum { RSA_F4 = 1 };

extra/yassl/include/openssl/ssl.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
 *

 */



#ifndef ysSSL_openssl_h__

#ifndef yaSSL_openssl_h__

#define yaSSL_openssl_h__



#include <stdio.h>   /* ERR_print fp */

extra/yassl/include/yassl_int.hpp

+0 −4
Original line number Diff line number Diff line
@@ -123,8 +123,6 @@ public: 


    friend sslFactory& GetSSL_Factory();        // singleton creator

private:

    static sslFactory instance_;



    sslFactory(const sslFactory&);              // hide copy

    sslFactory& operator=(const sslFactory&);   // and assign   

};
@@ -216,8 +214,6 @@ public: 


    friend Sessions& GetSessions(); // singleton creator

private:

    static Sessions instance_;



    Sessions(const Sessions&);              // hide copy

    Sessions& operator=(const Sessions&);   // and assign

};

extra/yassl/include/yassl_types.hpp

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,11 @@ 


namespace yaSSL {





// Delete static singleton memory holders

void CleanUp();





// library allocation

struct new_t {};      // yaSSL New type

extern new_t ys;      // pass in parameter

extra/yassl/src/handshake.cpp

+10 −7
Original line number Diff line number Diff line
@@ -648,8 +648,6 @@ void build_certHashes(SSL& ssl, Hashes& hashes) 
}





mySTL::auto_ptr<input_buffer> null_buffer(ysDelete);



// do process input requests

mySTL::auto_ptr<input_buffer>

DoProcessReply(SSL& ssl, mySTL::auto_ptr<input_buffer> buffered)
@@ -659,7 +657,8 @@ DoProcessReply(SSL& ssl, mySTL::auto_ptr<input_buffer> buffered) 
    if (!ready) {

      // Nothing to receive after blocking wait => error

      ssl.SetError(receive_error);

      return buffered= null_buffer;

      buffered.reset(0);

      return buffered;

    }



    // add buffered data if its there
@@ -667,10 +666,10 @@ DoProcessReply(SSL& ssl, mySTL::auto_ptr<input_buffer> buffered) 
    input_buffer buffer(buffSz + ready);

    if (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);

    buffer.add_size(read);

    uint offset = 0;
@@ -703,11 +702,15 @@ DoProcessReply(SSL& ssl, mySTL::auto_ptr<input_buffer> buffered) 
            mySTL::auto_ptr<Message> msg(mf.CreateObject(hdr.type_), ysDelete);

            if (!msg.get()) {

                ssl.SetError(factory_error);

                return buffered = null_buffer;

                buffered.reset(0);

                return buffered;

            }

            buffer >> *msg;

            msg->Process(buffer, ssl);

            if (ssl.GetError()) return buffered = null_buffer;

            if (ssl.GetError()) {

                buffered.reset(0);

                return buffered;

            }

        }

        offset += hdr.length_ + RECORD_HEADER;

    }