Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-06 05:38:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

included patch for openssl-1.0.0 compatibility

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2747 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-04-21 08:52:04 +00:00
parent 3577fb9acf
commit 2dd10e5151
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libretroshare/src/pqi/authssl.cc
View file

@ -1662,8 +1662,11 @@ bool AuthSSL::encrypt(void *&out, int &outlen, const void *in, int inlen, std
return false; return false;
} }
//ekl=EVP_PKEY_encrypt_old (ek,key,EVP_CIPHER_CTX_key_length(&cipher_ctx), public_key); //use this line for openssl 1.0 #if OPENSSL_VERSION_NUMBER >= 0x10000000L
ekl=EVP_PKEY_encrypt_old(ek,key,EVP_CIPHER_CTX_key_length(&cipher_ctx), public_key);
#else
ekl=EVP_PKEY_encrypt(ek,key,EVP_CIPHER_CTX_key_length(&cipher_ctx), public_key); ekl=EVP_PKEY_encrypt(ek,key,EVP_CIPHER_CTX_key_length(&cipher_ctx), public_key);
#endif
/// ** copied implementation of EVP_SealInit of openssl V *** /// /// ** copied implementation of EVP_SealInit of openssl V *** ///
@ -1769,8 +1772,11 @@ bool AuthSSL::decrypt(void *&out, int &outlen, const void *in, int inlen)
return false; return false;
} }
//i=EVP_PKEY_decrypt_old (key,encryptKey,ekeylen,own_private_key); //use this line for openssl 1.0 #if OPENSSL_VERSION_NUMBER >= 0x10000000L
i=EVP_PKEY_decrypt_old(key,encryptKey,ekeylen,own_private_key);
#else
i=EVP_PKEY_decrypt(key,encryptKey,ekeylen,own_private_key); i=EVP_PKEY_decrypt(key,encryptKey,ekeylen,own_private_key);
#endif
if ((i <= 0) || !EVP_CIPHER_CTX_set_key_length(&ectx, i)) if ((i <= 0) || !EVP_CIPHER_CTX_set_key_length(&ectx, i))
{ {
return false; return false;