mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-18 19:39:30 -04:00
Found cause of OSX network resets / lost connections: inet_ntoa is not thread-safe.
* Added thread-safe rs_inet_ntoa function (util/rsnet.cc) * Switched all calls to this function (most of the changes) * Modified getLocalInterfaces() and getPreferredInterface() to avoid string conversions. - NB: Modified windows functions too, but unable to test (hope it compiles!) Also: * Added EVP_CIPHER_CTX_rand_key() replacement function for old versions of SSL (pre 0.9.8) (for OSX 10.5) - NB: This code should be reworked to remove these calls anyway. * Updated tests/pqi to handle above changes. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3281 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
0b298f6ca1
commit
648e15bcf7
34 changed files with 360 additions and 235 deletions
|
@ -35,6 +35,7 @@
|
|||
|
||||
#include <openssl/evp.h>
|
||||
#include <openssl/x509.h>
|
||||
#include <openssl/ssl.h>
|
||||
|
||||
#include <inttypes.h>
|
||||
#include <string>
|
||||
|
@ -47,6 +48,21 @@
|
|||
/********************************************************************************/
|
||||
/********************************************************************************/
|
||||
|
||||
|
||||
// IF we are compiling against ssl0.9.7 - these functions don't exist.
|
||||
|
||||
#if !defined(EVP_CIPHER_CTX_rand_key)
|
||||
#define SSLFNS_ADD_CIPHER_CTX_RAND_KEY 1
|
||||
#endif
|
||||
|
||||
#if defined(SSLFNS_ADD_CIPHER_CTX_RAND_KEY)
|
||||
|
||||
int EVP_CIPHER_CTX_rand_key(EVP_CIPHER_CTX *ctx, unsigned char *key);
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
X509_REQ *GenerateX509Req(
|
||||
std::string pkey_file, std::string passwd,
|
||||
std::string name, std::string email, std::string org,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue