Commit d0703b45 authored by unknown's avatar unknown
Browse files

Merge 192.168.0.20:mysql/yassl_import/my50-yassl_import 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents 9c9ff3d2 71ded739

extra/yassl/include/yassl_error.hpp

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#ifndef yaSSL_ERROR_HPP

#define yaSSL_ERROR_HPP



#include "stdexcept.hpp"





namespace yaSSL {
@@ -63,7 +62,7 @@ enum { MAX_ERROR_SZ = 80 }; 


void SetErrorString(YasslError, char*);





/* remove for now, if go back to exceptions use this wrapper

// Base class for all yaSSL exceptions

class Error : public mySTL::runtime_error {

    YasslError  error_;
@@ -75,6 +74,7 @@ public: 
    YasslError  get_number() const;

    Library     get_lib()    const;

};

*/





} // naemspace

extra/yassl/mySTL/stdexcept.hpp

+0 −2
Original line number Diff line number Diff line
@@ -46,10 +46,8 @@ public: 
    // for compiler generated call, never used

    static void operator delete(void*) { assert(0); }

private:

#if defined(__hpux)

    // don't allow dynamic creation of exceptions

    static void* operator new(size_t);

#endif

};

extra/yassl/src/yassl_error.cpp

+3 −0
Original line number Diff line number Diff line
@@ -27,10 +27,12 @@ 
#include "yassl_error.hpp"

#include "error.hpp"        // TaoCrypt error numbers

#include "openssl/ssl.h"    // SSL_ERROR_WANT_READ

#include <string.h>         // strncpy



namespace yaSSL {





/* may bring back in future

Error::Error(const char* s, YasslError e, Library l) 

    : mySTL::runtime_error(s), error_(e), lib_(l) 

{
@@ -48,6 +50,7 @@ Library Error::get_lib() const 


    return lib_;

}

*/





void SetErrorString(YasslError error, char* buffer)

extra/yassl/src/yassl_int.cpp

+8 −3
Original line number Diff line number Diff line
@@ -2106,9 +2106,14 @@ ASN1_STRING* StringHolder::GetString() 
extern "C" void yaSSL_CleanUp()

{

    TaoCrypt::CleanUp();

    ysDelete(yaSSL::cryptProviderInstance);

    ysDelete(yaSSL::sslFactoryInstance);

    ysDelete(yaSSL::sessionsInstance);

    yaSSL::ysDelete(yaSSL::cryptProviderInstance);

    yaSSL::ysDelete(yaSSL::sslFactoryInstance);

    yaSSL::ysDelete(yaSSL::sessionsInstance);



    // In case user calls more than once, prevent seg fault

    yaSSL::cryptProviderInstance = 0;

    yaSSL::sslFactoryInstance = 0;

    yaSSL::sessionsInstance = 0;

}

extra/yassl/taocrypt/src/integer.cpp

+4 −1
Original line number Diff line number Diff line
@@ -2735,8 +2735,11 @@ void CleanUp() 
{

    tcDelete(one);

    tcDelete(zero);

}



    // In case user calls more than once, prevent seg fault

    one  = 0;

    zero = 0;

}



Integer::Integer(RandomNumberGenerator& rng, const Integer& min,

                 const Integer& max)