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

- CryptoPage now shows and exports clean certificate, without sslid & co

Browse source 
- ConnectFriendWizard exports the certificate with additional informations like sslid & co

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3142 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-06-15 21:07:22 +00:00
parent 1585859896
commit 540e99bc48
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View file

@ -661,7 +661,7 @@ void CertificatePage::loadFriendCert() {
void CertificatePage::generateCertificateCalled() { void CertificatePage::generateCertificateCalled() {
qDebug() << " generateCertificateCalled"; qDebug() << " generateCertificateCalled";
std::string cert = rsPeers->saveCertificateToString(rsPeers->getOwnId()); std::string cert = rsPeers->GetRetroshareInvite();
if (cert.empty()) { if (cert.empty()) {
QMessageBox::information(this, tr("RetroShare"), QMessageBox::information(this, tr("RetroShare"),
tr("Sorry, create certificate failed"), tr("Sorry, create certificate failed"),
@ -677,7 +677,7 @@ void CertificatePage::generateCertificateCalled() {
if (qdir.isEmpty() == false) { if (qdir.isEmpty() == false) {
QFile CertFile (qdir); QFile CertFile (qdir);
if (CertFile.open(QIODevice::WriteOnly | QIODevice::Text)) { if (CertFile.open(QIODevice::WriteOnly/* | QIODevice::Text*/)) {
if (CertFile.write(QByteArray(cert.c_str())) > 0) { if (CertFile.write(QByteArray(cert.c_str())) > 0) {
QMessageBox::information(this, tr("RetroShare"), QMessageBox::information(this, tr("RetroShare"),
tr("Certificate file successfully created"), tr("Certificate file successfully created"),

2
retroshare-gui/src/gui/settings/CryptoPage.cpp
View file

@ -84,7 +84,7 @@ CryptoPage::loadPublicKey()
QFont font("Courier New",9,50,false) ; QFont font("Courier New",9,50,false) ;
ui.certtextEdit->setFont(font) ; ui.certtextEdit->setFont(font) ;
ui.certtextEdit->setPlainText(QString::fromStdString(rsPeers->GetRetroshareInvite())); ui.certtextEdit->setPlainText(QString::fromStdString(rsPeers->saveCertificateToString(rsPeers->getOwnId())));
ui.certtextEdit->setReadOnly(true); ui.certtextEdit->setReadOnly(true);
ui.certtextEdit->setMinimumHeight(200); ui.certtextEdit->setMinimumHeight(200);
} }