Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-05 09:35:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bug related to opening cache hist file in text mode for windows

Browse Source 
added cleaning of cipher context to authssl encrypt decrypt functions 

added header to trustview which caused compilation error


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4199 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2011-05-15 12:01:23 +00:00
parent fcee4ebc32
commit 00c1bfcf54
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libretroshare/src/pqi/authssl.cc
View File

@ -1026,6 +1026,8 @@ bool AuthSSLimpl::encrypt(void *&out, int &outlen, const void *in, int inlen,
// free encrypted key data // free encrypted key data
free(ek); free(ek);
EVP_CIPHER_CTX_cleanup(&ctx);
outlen = out_offset; outlen = out_offset;
#ifdef DISTRIB_DEBUG #ifdef DISTRIB_DEBUG
@ -1052,7 +1054,8 @@ bool AuthSSLimpl::decrypt(void *&out, int &outlen, const void *in, int inlen)
int eklen = 0, net_ekl = 0; int eklen = 0, net_ekl = 0;
unsigned char *ek = NULL; unsigned char *ek = NULL;
unsigned char iv[EVP_MAX_IV_LENGTH]; unsigned char iv[EVP_MAX_IV_LENGTH];
ek = (unsigned char*)malloc(EVP_PKEY_size(mOwnPrivateKey)); int ek_mkl = EVP_PKEY_size(mOwnPrivateKey);
ek = (unsigned char*)malloc(ek_mkl);
EVP_CIPHER_CTX_init(&ctx); EVP_CIPHER_CTX_init(&ctx);
int in_offset = 0, out_currOffset = 0; int in_offset = 0, out_currOffset = 0;
@ -1085,7 +1088,7 @@ bool AuthSSLimpl::decrypt(void *&out, int &outlen, const void *in, int inlen)
const EVP_CIPHER* cipher = EVP_aes_128_cbc(); const EVP_CIPHER* cipher = EVP_aes_128_cbc();
if(!EVP_OpenInit(&ctx, cipher, ek, eklen, iv, mOwnPrivateKey)) { if(0 == EVP_OpenInit(&ctx, cipher, ek, eklen, iv, mOwnPrivateKey)) {
free(ek); free(ek);
return false; return false;
} }
@ -1114,6 +1117,8 @@ bool AuthSSLimpl::decrypt(void *&out, int &outlen, const void *in, int inlen)
if(ek != NULL) if(ek != NULL)
free(ek); free(ek);
EVP_CIPHER_CTX_cleanup(&ctx);
#ifdef AUTHSSL_DEBUG #ifdef AUTHSSL_DEBUG
std::cerr << "AuthSSLimpl::decrypt() finished with outlen : " << outlen << std::endl; std::cerr << "AuthSSLimpl::decrypt() finished with outlen : " << outlen << std::endl;
#endif #endif

6
libretroshare/src/services/p3distrib.cc
View File

@ -51,6 +51,7 @@
#define FAILED_CACHE_CONT "failedcachegrp" // cache id which have failed are stored under a node of this name/grpid #define FAILED_CACHE_CONT "failedcachegrp" // cache id which have failed are stored under a node of this name/grpid
#define HIST_CACHE_FNAME "grp_history.xml" #define HIST_CACHE_FNAME "grp_history.xml"
#define ENABLE_CACHE_OPT
/***** /*****
* #define DISTRIB_DEBUG 1 * #define DISTRIB_DEBUG 1
@ -786,7 +787,7 @@ void p3GroupDistrib::locked_getHistoryCacheData(const std::string& grpId, std::l
bool p3GroupDistrib::locked_loadHistoryCacheFile() bool p3GroupDistrib::locked_loadHistoryCacheFile()
{ {
std::string hFileName = mKeyBackUpDir + "/" + HIST_CACHE_FNAME; std::string hFileName = mKeyBackUpDir + "/" + HIST_CACHE_FNAME;
std::ifstream hFile(hFileName.c_str()); std::ifstream hFile(hFileName.c_str(), std::ios::binary | std::ios::in);
int fileLength; int fileLength;
char* fileLoadBuffer = NULL; char* fileLoadBuffer = NULL;
char* decryptedCacheFile = NULL; char* decryptedCacheFile = NULL;
@ -812,6 +813,7 @@ bool p3GroupDistrib::locked_loadHistoryCacheFile()
char* buffer = static_cast<char*>(pugi::get_memory_allocation_function()(outlen)); char* buffer = static_cast<char*>(pugi::get_memory_allocation_function()(outlen));
if(ok){ if(ok){
memcpy(buffer, decryptedCacheFile, outlen); memcpy(buffer, decryptedCacheFile, outlen);
if(decryptedCacheFile != NULL) if(decryptedCacheFile != NULL)
@ -834,7 +836,7 @@ bool p3GroupDistrib::locked_saveHistoryCacheFile()
return false; return false;
std::string hFileName = mKeyBackUpDir + "/" + HIST_CACHE_FNAME; std::string hFileName = mKeyBackUpDir + "/" + HIST_CACHE_FNAME;
std::ofstream hFile(hFileName.c_str()); std::ofstream hFile(hFileName.c_str(), std::ios::binary | std::ios::out);
std::ostringstream cacheStream; std::ostringstream cacheStream;
char* fileBuffer = NULL; char* fileBuffer = NULL;
int streamLength; int streamLength;

2
retroshare-gui/src/gui/TrustView.cpp
View File

@ -8,6 +8,8 @@
#include <QTableView> #include <QTableView>
#include "TrustView.h" #include "TrustView.h"
#include <list>
using namespace std ; using namespace std ;
TrustView::TrustView() TrustView::TrustView()