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

Merge pull request #1338 from sehraf/pr_add-TLSv1.3

Browse Source 
Add support for displaying TLSv1.3
This commit is contained in:
csoler 2018-09-14 22:15:31 +02:00 committed by GitHub
commit 3c19a3929d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -313,7 +313,12 @@ void pqissl::getCryptoParams(RsPeerCryptoParams& params)
params.cipher_bits_2 = al2 ;
char *desc = SSL_CIPHER_description(SSL_get_current_cipher(ssl_connection), NULL, 0);
params.cipher_version = std::string(desc).find("TLSv1.2") != std::string::npos ? std::string("TLSv1.2") : std::string("TLSv1");
params.cipher_version =
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);
}
else

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

@ -170,7 +170,7 @@ void ConfCertDialog::load()
ct += QString::fromStdString(cdet.cipher_version) + ": ";
ct += QString::fromStdString(cdet.cipher_name);
if(cdet.cipher_version != "TLSv1.2")
if(cdet.cipher_version != "TLSv1.2" && cdet.cipher_version != "TLSv1.3")
ct += QString::number(cdet.cipher_bits_1);
ui.crypto_info->setText(ct) ;