Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-27 07:47:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

switched rs_usernp into rs_useopenpgpsdk

Browse Source
This commit is contained in:
csoler 2024-10-22 19:25:11 +02:00
parent 126ce6607e
commit ed0105f44c
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
retroshare-friendserver/src/friendserver.cc
View File

@ -8,10 +8,10 @@
#include "pgp/pgpkeyutil.h" #include "pgp/pgpkeyutil.h"
#include "pgp/rscertificate.h" #include "pgp/rscertificate.h"
#ifdef USE_RNP_LIB #ifdef USE_OPENPGPSDK
#include "pgp/rnppgphandler.h"
#else
#include "pgp/openpgpsdkhandler.h" #include "pgp/openpgpsdkhandler.h"
#else
#include "pgp/rnppgphandler.h"
#endif #endif
#include "friendserver.h" #include "friendserver.h"
@ -397,10 +397,10 @@ FriendServer::FriendServer(const std::string& base_dir,const std::string& listen
std::string pgp_private_keyring_path = RsDirUtil::makePath(base_dir,"pgp_private_keyring") ; // not used. std::string pgp_private_keyring_path = RsDirUtil::makePath(base_dir,"pgp_private_keyring") ; // not used.
std::string pgp_trustdb_path = RsDirUtil::makePath(base_dir,"pgp_trustdb") ; // not used. std::string pgp_trustdb_path = RsDirUtil::makePath(base_dir,"pgp_trustdb") ; // not used.
#ifdef USE_RNP_LIB #ifdef USE_OPENPGPSDK
mPgpHandler = new RNPPGPHandler(pgp_public_keyring_path,pgp_private_keyring_path,pgp_trustdb_path,pgp_lock_path);
#else
mPgpHandler = new OpenPGPSDKHandler(pgp_public_keyring_path,pgp_private_keyring_path,pgp_trustdb_path,pgp_lock_path); mPgpHandler = new OpenPGPSDKHandler(pgp_public_keyring_path,pgp_private_keyring_path,pgp_trustdb_path,pgp_lock_path);
#else
mPgpHandler = new RNPPGPHandler(pgp_public_keyring_path,pgp_private_keyring_path,pgp_trustdb_path,pgp_lock_path);
#endif #endif
// Random bias. Should be cryptographically safe. // Random bias. Should be cryptographically safe.

6
retroshare-gui/src/gui/connect/PGPKeyDialog.cpp
View File

@ -196,11 +196,11 @@ void PGPKeyDialog::load()
ui.trustlevel_CB->show(); ui.trustlevel_CB->show();
ui.is_signing_me->show(); ui.is_signing_me->show();
ui.signersLabel->setText(tr("This key is signed by :")+" "); ui.signersLabel->setText(tr("This key is signed by :")+" ");
#ifdef USE_RNP_LIB #ifdef USE_OPENPGPSDK
ui.signKeyButton->setEnabled(!detail.ownsign);
#else
ui.signKeyButton->setEnabled(false); ui.signKeyButton->setEnabled(false);
ui.signKeyButton->setToolTip("Disabled because key signing is not yet implemented in RNP lib"); ui.signKeyButton->setToolTip("Disabled because key signing is not yet implemented in RNP lib");
#else
ui.signKeyButton->setEnabled(!detail.ownsign);
#endif #endif
if (detail.accept_connection) if (detail.accept_connection)

12
retroshare.pri
View File

@ -184,8 +184,8 @@ rs_use_native_dialogs:CONFIG -= no_rs_use_native_dialogs
# By default, use RNP lib for RFC4880 PGP management. If not, compilation will # By default, use RNP lib for RFC4880 PGP management. If not, compilation will
# default to openpgp-sdk, which is old and unmaintained, so probably not very secure. # default to openpgp-sdk, which is old and unmaintained, so probably not very secure.
CONFIG *= rs_rnplib CONFIG *=
rs_no_rnplib:CONFIG -= use_rnp_lib rs_no_openpgpsdk:CONFIG -= use_openpgpsdk
# To disable broadcast discovery append the following assignation to qmake # To disable broadcast discovery append the following assignation to qmake
# command line "CONFIG+=no_rs_broadcast_discovery" # command line "CONFIG+=no_rs_broadcast_discovery"
@ -867,14 +867,14 @@ isEmpty(RS_UPNP_LIB) {
} }
} }
rs_rnplib { rs_openpgpsdk {
DEFINES += USE_RNP_LIB
message("Using RNP lib for PGP")
} else {
SUBDIRS += openpgpsdk SUBDIRS += openpgpsdk
openpgpsdk.file = openpgpsdk/src/openpgpsdk.pro openpgpsdk.file = openpgpsdk/src/openpgpsdk.pro
libretroshare.depends += openpgpsdk libretroshare.depends += openpgpsdk
message("Using OpenPGP-SDK for PGP") message("Using OpenPGP-SDK for PGP")
} else {
DEFINES += USE_RNP_LIB
message("Using RNP lib for PGP")
} }