josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dep/ACE: Upgrade ACE -library to 5.8.3

Browse Source 
--HG--
branch : trunk
This commit is contained in:
click
2010-11-04 05:30:29 +01:00
parent 2604250c3c
commit 9b16ee203f
581 changed files with 10265 additions and 14303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dep/acelite/ace/SSL/SSL_Asynch_BIO.cpp
+1 -5
View File
@@ -1,5 +1,5 @@
// -*- C++ -*-
// $Id: SSL_Asynch_BIO.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
#include "SSL_Asynch_BIO.h"
#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
@@ -8,10 +8,6 @@
#include "ace/OS_NS_string.h"
#include "ace/Truncate.h"
ACE_RCSID (ACE_SSL,
SSL_Asynch_BIO,
"$Id: SSL_Asynch_BIO.cpp 82574 2008-08-08 19:35:06Z parsons $")
#if (defined (ACE_HAS_VERSIONED_NAMESPACE) && ACE_HAS_VERSIONED_NAMESPACE == 1)
# define ACE_ASYNCH_BIO_WRITE_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ACE_Asynch_BIO_write)
# define ACE_ASYNCH_BIO_READ_NAME ACE_PREPROC_CONCATENATE(ACE_VERSIONED_NAMESPACE_NAME, _ACE_Asynch_BIO_read)
dep/acelite/ace/SSL/SSL_Asynch_Stream.cpp
+2 -5
View File
@@ -1,9 +1,6 @@
// $Id: SSL_Asynch_Stream.cpp 91813 2010-09-17 07:52:52Z johnnyw $
#include "SSL_Asynch_Stream.h"
ACE_RCSID (ACE_SSL,
SSL_Asynch_Stream,
"$Id: SSL_Asynch_Stream.cpp 84181 2009-01-16 22:37:49Z shuston $")
// This only works on platforms with Asynchronous IO support.
#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
@@ -505,7 +502,7 @@ ACE_SSL_Asynch_Stream::do_SSL_handshake (void)
return -1;
}
}
return 1;
return 1;
}
if (this->flags_ & SF_REQ_SHUTDOWN)
dep/acelite/ace/SSL/SSL_Asynch_Stream.h
+7 -7
View File
@@ -4,7 +4,7 @@
/**
* @file SSL_Asynch_Stream.h
*
* $Id: SSL_Asynch_Stream.h 84181 2009-01-16 22:37:49Z shuston $
* $Id: SSL_Asynch_Stream.h 91743 2010-09-13 18:24:51Z johnnyw $
*
* @author Alexander Libman <[email protected]>
*/
@@ -306,13 +306,13 @@ protected:
*
* Check 1:
*
* SSL clients that require a peer certificate must specify SSL_VERIFY_PEER
* SSL clients that require a peer certificate must specify SSL_VERIFY_PEER
* via ACE_SSL_Context::default_verify_mode. If the peer sends an invalid
* certificate, the SSL handshake will fail; however, if the peer does not
* send a certificate, the SSL handshake will complete successfully which
* send a certificate, the SSL handshake will complete successfully which
* may not be acceptable. In this case, you must override this method in a
* subclass and return false if the call to SSL_get_peer_certificate returns
* null.
* null.
*
* Check 2:
*
@@ -322,10 +322,10 @@ protected:
* by your CA to usurp your session. For further info on this check, see
* the post_connection_check method in Example 5-8 of 'Network Security with
* OpenSSL' by Viega, et. al.
*
*
* Return:
*
* false - Terminate the connection. Outstanding IO complete with ERR_CANCELED.
*
* false - Terminate the connection. Outstanding IO complete with ERR_CANCELED.
*
* true - Proceed with connection. The default implementation returns true.
*/
dep/acelite/ace/SSL/SSL_Context.cpp
+1 -5
View File
@@ -1,3 +1,4 @@
// $Id: SSL_Context.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
#include "SSL_Context.h"
#include "sslconf.h"
@@ -26,11 +27,6 @@
#include <openssl/rand.h>
#include <openssl/safestack.h>
ACE_RCSID (ACE_SSL,
SSL_Context,
"$Id: SSL_Context.cpp 85202 2009-04-28 18:52:57Z johnnyw $")
namespace
{
/// Reference count of the number of times the ACE_SSL_Context was
dep/acelite/ace/SSL/SSL_SOCK.cpp
+1 -6
View File
@@ -1,4 +1,4 @@
// $Id: SSL_SOCK.cpp 80826 2008-03-04 14:51:23Z wotte $
// $Id: SSL_SOCK.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
#include "SSL_SOCK.h"
@@ -9,11 +9,6 @@
#include "ace/OS_NS_errno.h"
#include "ace/os_include/os_signal.h"
ACE_RCSID (ACE_SSL,
SSL_SOCK,
"$Id: SSL_SOCK.cpp 80826 2008-03-04 14:51:23Z wotte $")
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_SSL_SOCK::ACE_SSL_SOCK (void)
dep/acelite/ace/SSL/SSL_SOCK.h
+1 -11
View File
@@ -4,7 +4,7 @@
/**
* @file SSL_SOCK.h
*
* $Id: SSL_SOCK.h 80826 2008-03-04 14:51:23Z wotte $
* $Id: SSL_SOCK.h 91685 2010-09-09 09:35:14Z johnnyw $
*
* @author Ossama Othman <[email protected]>
*/
@@ -24,16 +24,6 @@
#include "ace/SOCK.h"
#if defined (ACE_HAS_TEMPLATE_TYPEDEFS)
# define ACE_SSL_SOCK_ACCEPTOR ACE_SSL_SOCK_Acceptor
# define ACE_SSL_SOCK_CONNECTOR ACE_SSL_SOCK_Connector
# define ACE_SSL_SOCK_STREAM ACE_SSL_SOCK_Stream
#else
# define ACE_SSL_SOCK_ACCEPTOR ACE_SSL_SOCK_Acceptor, ACE_INET_Addr
# define ACE_SSL_SOCK_CONNECTOR ACE_SSL_SOCK_Connector, ACE_INET_Addr
# define ACE_SSL_SOCK_STREAM ACE_SSL_SOCK_Stream, ACE_INET_Addr
#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
/**
dep/acelite/ace/SSL/SSL_SOCK_Acceptor.cpp
+1 -5
View File
@@ -1,6 +1,6 @@
// -*- C++ -*-
//
// $Id: SSL_SOCK_Acceptor.cpp 82723 2008-09-16 09:35:44Z johnnyw $
// $Id: SSL_SOCK_Acceptor.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
#include "SSL_SOCK_Acceptor.h"
@@ -17,10 +17,6 @@
#include "SSL_SOCK_Acceptor.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (ACE_SSL,
SSL_SOCK_Acceptor,
"$Id: SSL_SOCK_Acceptor.cpp 82723 2008-09-16 09:35:44Z johnnyw $")
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Acceptor)
dep/acelite/ace/SSL/SSL_SOCK_Connector.cpp
+3 -7
View File
@@ -1,6 +1,6 @@
// -*- C++ -*-
//
// $Id: SSL_SOCK_Connector.cpp 82577 2008-08-09 17:43:11Z mitza $
// $Id: SSL_SOCK_Connector.cpp 91813 2010-09-17 07:52:52Z johnnyw $
#include "SSL_SOCK_Connector.h"
@@ -17,10 +17,6 @@
#include "SSL_SOCK_Connector.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (ACE_SSL,
SSL_SOCK_Connector,
"$Id: SSL_SOCK_Connector.cpp 82577 2008-08-09 17:43:11Z mitza $")
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Connector)
@@ -75,7 +71,7 @@ ACE_SSL_SOCK_Connector::ssl_connect (ACE_SSL_SOCK_Stream &new_stream,
ACE_Countdown_Time countdown ((timeout == 0 ? 0 : &t));
int status;
do
{
// These handle sets are used to set up for whatever SSL_connect
@@ -142,7 +138,7 @@ ACE_SSL_SOCK_Connector::ssl_connect (ACE_SSL_SOCK_Stream &new_stream,
{
status = -1;
}
break;
default:
dep/acelite/ace/SSL/SSL_SOCK_Stream.cpp
+1 -5
View File
@@ -1,4 +1,4 @@
// $Id: SSL_SOCK_Stream.cpp 82577 2008-08-09 17:43:11Z mitza $
// $Id: SSL_SOCK_Stream.cpp 91368 2010-08-16 13:03:34Z mhengstmengel $
#include "ace/Handle_Set.h"
#include "ace/Log_Msg.h"
@@ -15,10 +15,6 @@
#include "SSL_SOCK_Stream.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (ACE_SSL,
SSL_SOCK_Stream,
"$Id: SSL_SOCK_Stream.cpp 82577 2008-08-09 17:43:11Z mitza $")
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_ALLOC_HOOK_DEFINE(ACE_SSL_SOCK_Stream)
dep/acelite/ace/SSL/SSL_SOCK_Stream.h
+2 -2
View File
@@ -4,7 +4,7 @@
/**
* @file SSL_SOCK_Stream.h
*
* $Id: SSL_SOCK_Stream.h 91103 2010-07-15 12:36:57Z mcorino $
* $Id: SSL_SOCK_Stream.h 91743 2010-09-13 18:24:51Z johnnyw $
*
* @author Ossama Othman <[email protected]>
* @author Carlos O'Ryan <[email protected]>
@@ -233,7 +233,7 @@ public:
int flags,
const ACE_Time_Value *timeout,
size_t *bytes_transferred = 0) const;
/**
* Try to receive exactly len bytes into buf (uses the recv() call).
* The ACE_Time_Value indicates how long to blocking trying to