Commit 8abd2662 authored by unknown's avatar unknown

Import yaSSL


extra/yassl/include/lock.hpp:
  Import patch yassl.diff
extra/yassl/include/openssl/ssl.h:
  Import patch yassl.diff
extra/yassl/include/socket_wrapper.hpp:
  Import patch yassl.diff
extra/yassl/include/yassl.hpp:
  Import patch yassl.diff
extra/yassl/src/ssl.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/mySTL/algorithm.hpp:
  Import patch yassl.diff
parent fc81492a
...@@ -28,7 +28,7 @@ namespace yaSSL { ...@@ -28,7 +28,7 @@ namespace yaSSL {
#ifdef MULTI_THREADED #ifdef MULTI_THREADED
#if defined(_WIN32) || defined(_WIN64) #ifdef _WIN32
#include <windows.h> #include <windows.h>
class Mutex { class Mutex {
......
...@@ -189,6 +189,7 @@ enum { /* ERR Constants */ ...@@ -189,6 +189,7 @@ enum { /* ERR Constants */
ERR_TXT_STRING = 1, ERR_TXT_STRING = 1,
EVP_R_BAD_DECRYPT = 2 EVP_R_BAD_DECRYPT = 2
}; };
/* /*
Allow type used by SSL_set_fd to be changed, default to int Allow type used by SSL_set_fd to be changed, default to int
in order to be compatible with OpenSSL in order to be compatible with OpenSSL
......
...@@ -28,8 +28,9 @@ ...@@ -28,8 +28,9 @@
#include <assert.h> #include <assert.h>
#include "openssl/ssl.h" /* for socket_t */ #ifdef _WIN32
#if !defined(_WIN32) && !defined(_WIN64) #include <winsock2.h>
#else
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
namespace yaSSL { namespace yaSSL {
#if defined(_WIN32) || defined(_WIN64) #ifdef _WIN32
typedef unsigned int SOCKET_T; typedef unsigned int SOCKET_T;
#else #else
typedef int SOCKET_T; typedef int SOCKET_T;
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#include "coding.hpp" // HexDecoder #include "coding.hpp" // HexDecoder
#include "helpers.hpp" // for placement new hack #include "helpers.hpp" // for placement new hack
#include <stdio.h> #include <stdio.h>
#include <assert.h>
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> // FindFirstFile etc.. #include <windows.h> // FindFirstFile etc..
......
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
namespace mySTL { namespace mySTL {
#undef max
#undef min
template<typename T> template<typename T>
inline const T& max(const T& a, const T&b) inline const T& max(const T& a, const T&b)
......
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