From 540e99bc489fb13faffda9f5f644346a9d16f86b Mon Sep 17 00:00:00 2001 From: thunder2 Date: Tue, 15 Jun 2010 21:07:22 +0000 Subject: [PATCH] - CryptoPage now shows and exports clean certificate, without sslid & co - 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 --- retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp | 4 ++-- retroshare-gui/src/gui/settings/CryptoPage.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp index 9c1d608b5..a261f7643 100755 --- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp +++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp @@ -661,7 +661,7 @@ void CertificatePage::loadFriendCert() { void CertificatePage::generateCertificateCalled() { qDebug() << " generateCertificateCalled"; - std::string cert = rsPeers->saveCertificateToString(rsPeers->getOwnId()); + std::string cert = rsPeers->GetRetroshareInvite(); if (cert.empty()) { QMessageBox::information(this, tr("RetroShare"), tr("Sorry, create certificate failed"), @@ -677,7 +677,7 @@ void CertificatePage::generateCertificateCalled() { if (qdir.isEmpty() == false) { 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) { QMessageBox::information(this, tr("RetroShare"), tr("Certificate file successfully created"), diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp index b860d0e13..4e3e266a3 100755 --- a/retroshare-gui/src/gui/settings/CryptoPage.cpp +++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp @@ -81,10 +81,10 @@ CryptoPage::load() void CryptoPage::loadPublicKey() { - QFont font("Courier New",9,50,false) ; - ui.certtextEdit->setFont(font) ; + QFont font("Courier New",9,50,false) ; + 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->setMinimumHeight(200); }