Commit 2314cb1c authored by unknown's avatar unknown
Browse files

Merge with latest yaSSL. 

Fixes IsAligned yaSSL assertion failure.


extra/yassl/include/buffer.hpp:
  Merge with latest yaSSL.
extra/yassl/include/factory.hpp:
  Merge with latest yaSSL.
extra/yassl/include/openssl/ssl.h:
  Merge with latest yaSSL.
extra/yassl/include/yassl_int.hpp:
  Merge with latest yaSSL.
extra/yassl/include/yassl_types.hpp:
  Merge with latest yaSSL.
extra/yassl/mySTL/stdexcept.hpp:
  Merge with latest yaSSL.
extra/yassl/src/buffer.cpp:
  Merge with latest yaSSL.
extra/yassl/src/socket_wrapper.cpp:
  Merge with latest yaSSL.
extra/yassl/src/ssl.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/block.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/hash.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/hmac.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/integer.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/modes.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/include/rsa.hpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/aes.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/dsa.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/hash.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/integer.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/md5.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/misc.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/ripemd.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/rsa.cpp:
  Merge with latest yaSSL.
extra/yassl/taocrypt/src/sha.cpp:
  Merge with latest yaSSL.
parent 728ef761

extra/yassl/include/buffer.hpp

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 


#include <assert.h>             // assert

#include "yassl_types.hpp"      // ysDelete

#include "yassl_error.hpp"      // Error

#include "memory.hpp"           // mySTL::auto_ptr

#include "algorithm.hpp"        // mySTL::swap

extra/yassl/include/factory.hpp

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 


#include "vector.hpp"

#include "pair.hpp"

#include "yassl_error.hpp"

extra/yassl/include/openssl/ssl.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ namespace yaSSL { 
extern "C" {

#endif



#undef X509_NAME   /* wincrypt.h clash */



#if defined(__cplusplus) && !defined(YASSL_MYSQL_COMPATIBLE)

    class SSL;

extra/yassl/include/yassl_int.hpp

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#define yaSSL_INT_HPP



#include "yassl_imp.hpp"

#include "yassl_error.hpp"

#include "crypto_wrapper.hpp"

#include "cert_wrapper.hpp"

#include "log.hpp"
@@ -129,6 +130,8 @@ private: 
};





#undef X509_NAME  // wincrypt.h clash



// openSSL X509 names

class X509_NAME {

    char* name_;

extra/yassl/include/yassl_types.hpp

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ void ysArrayDelete(T* ptr) 




// to resolve compiler generated operator delete on base classes with

// virtual destructors, make sure doesn't get called

// virtual destructors (when on stack), make sure doesn't get called

class virtual_base {

public:

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