Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

get rid of cipher_version variable. use plain output from openssl

Browse Source
This commit is contained in:
sehraf 2018-09-15 14:30:23 +02:00
parent 7ce2bef37b
commit 1e85b05f09
No known key found for this signature in database
GPG Key ID: DF09F6EAE356B2C6
5 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libresapi/src/api/PeersHandler.cpp
View File

@ -1195,14 +1195,7 @@ void PeersHandler::handleGetNodeOptions(Request& req, Response& resp)
std::string encryption; std::string encryption;
RsPeerCryptoParams cdet; RsPeerCryptoParams cdet;
if(RsControl::instance()->getPeerCryptoDetails(detail.id, cdet) && cdet.connexion_state != 0) if(RsControl::instance()->getPeerCryptoDetails(detail.id, cdet) && cdet.connexion_state != 0)
{ encryption = cdet.cipher_name;
encryption = cdet.cipher_version;
encryption += ": ";
encryption += cdet.cipher_name;
if(cdet.cipher_version != "TLSv1.2")
encryption += cdet.cipher_bits_1;
}
else else
encryption = "Not connected"; encryption = "Not connected";

2
libretroshare/src/pqi/pqiperson.cc
View File

@ -606,7 +606,6 @@ bool pqiperson::getCryptoParams(RsPeerCryptoParams & params)
params.cipher_name.clear(); params.cipher_name.clear();
params.cipher_bits_1 = 0; params.cipher_bits_1 = 0;
params.cipher_bits_2 = 0; params.cipher_bits_2 = 0;
params.cipher_version.clear();
return false ; return false ;
} }
@ -627,7 +626,6 @@ bool pqiconnect::getCryptoParams(RsPeerCryptoParams & params)
params.cipher_name.clear() ; params.cipher_name.clear() ;
params.cipher_bits_1 = 0 ; params.cipher_bits_1 = 0 ;
params.cipher_bits_2 = 0 ; params.cipher_bits_2 = 0 ;
params.cipher_version.clear() ;
return false ; return false ;
} }
} }

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

@ -304,7 +304,6 @@ void pqissl::getCryptoParams(RsPeerCryptoParams& params)
if(active) if(active)
{ {
params.connexion_state = 1 ; params.connexion_state = 1 ;
params.cipher_name = std::string( SSL_get_cipher(ssl_connection));
int alg ; int alg ;
int al2 = SSL_get_cipher_bits(ssl_connection,&alg); int al2 = SSL_get_cipher_bits(ssl_connection,&alg);
@ -313,12 +312,7 @@ void pqissl::getCryptoParams(RsPeerCryptoParams& params)
params.cipher_bits_2 = al2 ; params.cipher_bits_2 = al2 ;
char *desc = SSL_CIPHER_description(SSL_get_current_cipher(ssl_connection), NULL, 0); char *desc = SSL_CIPHER_description(SSL_get_current_cipher(ssl_connection), NULL, 0);
params.cipher_version = params.cipher_name = std::string(desc);
std::string(desc).find("TLSv1.3") != std::string::npos ?
std::string("TLSv1.3") :
std::string(desc).find("TLSv1.2") != std::string::npos ?
std::string("TLSv1.2") :
std::string("TLSv1");
OPENSSL_free(desc); OPENSSL_free(desc);
} }
else else
@ -327,7 +321,6 @@ void pqissl::getCryptoParams(RsPeerCryptoParams& params)
params.cipher_name.clear() ; params.cipher_name.clear() ;
params.cipher_bits_1 = 0 ; params.cipher_bits_1 = 0 ;
params.cipher_bits_2 = 0 ; params.cipher_bits_2 = 0 ;
params.cipher_version.clear() ;
} }
} }

1
libretroshare/src/retroshare/rspeers.h
View File

@ -335,7 +335,6 @@ struct RsPeerCryptoParams
std::string cipher_name; std::string cipher_name;
int cipher_bits_1; int cipher_bits_1;
int cipher_bits_2; int cipher_bits_2;
std::string cipher_version;
}; };
struct RsGroupInfo : RsSerializable struct RsGroupInfo : RsSerializable

11
retroshare-gui/src/gui/connect/ConfCertDialog.cpp
View File

@ -165,16 +165,7 @@ void ConfCertDialog::load()
RsPeerCryptoParams cdet ; RsPeerCryptoParams cdet ;
if(RsControl::instance()->getPeerCryptoDetails(detail.id,cdet) && cdet.connexion_state!=0) if(RsControl::instance()->getPeerCryptoDetails(detail.id,cdet) && cdet.connexion_state!=0)
{ ui.crypto_info->setText(QString::fromStdString(cdet.cipher_name));
QString ct ;
ct += QString::fromStdString(cdet.cipher_version) + ": ";
ct += QString::fromStdString(cdet.cipher_name);
if(cdet.cipher_version != "TLSv1.2" && cdet.cipher_version != "TLSv1.3")
ct += QString::number(cdet.cipher_bits_1);
ui.crypto_info->setText(ct) ;
}
else else
ui.crypto_info->setText(tr("Not connected")) ; ui.crypto_info->setText(tr("Not connected")) ;