Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-04-05 21:45:53 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

added filtering of private key for login window, and fixed uid at cert creation time

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5282 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-07-08 21:06:41 +00:00
parent fa6674fd01
commit 0a6c60d2df
6 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libretroshare/src/pgp/pgphandler.cc
View File

@ -157,6 +157,7 @@ PGPHandler::PGPHandler(const std::string& pubring, const std::string& secring,co
std::cerr << "Secring read successfully." << std::endl;
locked_readPrivateTrustDatabase() ;
_trustdb_last_update_time = time(NULL) ;
}
void PGPHandler::initCertificateInfo(PGPCertificateInfo& cert,const ops_keydata_t *keydata,uint32_t index)
@ -285,6 +286,13 @@ bool PGPHandler::printKeys() const
return true ;
}
bool PGPHandler::haveSecretKey(const PGPIdType& id) const
{
RsStackMutex mtx(pgphandlerMtx) ; // lock access to PGP memory structures.
return getSecretKey(id) != NULL ;
}
const PGPCertificateInfo *PGPHandler::getCertificateInfo(const PGPIdType& id) const
{
RsStackMutex mtx(pgphandlerMtx) ; // lock access to PGP memory structures.
@ -330,7 +338,7 @@ bool PGPHandler::GeneratePGPCertificate(const std::string& name, const std::stri
// 1 - generate keypair - RSA-2048
//
ops_user_id_t uid ;
char *s = strdup((name + " " + email + " (Generated by RetroShare)").c_str()) ;
char *s = strdup((name + " (Generated by RetroShare) <" + email + ">" ).c_str()) ;
uid.user_id = (unsigned char *)s ;
unsigned long int e = 65537 ; // some prime number

1
libretroshare/src/pgp/pgphandler.h
View File

@ -70,6 +70,7 @@ class PGPHandler
* @param ids list of gpg certificate ids (note, not the actual certificates)
*/
bool getGPGFilteredList(std::list<PGPIdType>& list,bool (*filter)(const PGPCertificateInfo&) = NULL) const ;
bool haveSecretKey(const PGPIdType& id) const ;
bool availableGPGCertificatesWithPrivateKeys(std::list<PGPIdType>& ids);
bool GeneratePGPCertificate(const std::string& name, const std::string& email, const std::string& passwd, PGPIdType& pgpId, std::string& errString) ;

5
libretroshare/src/pqi/authgpg.cc
View File

@ -389,7 +389,10 @@ bool AuthGPG::getGPGAllList(std::list<std::string> &ids)
return true;
}
bool AuthGPG::haveSecretKey(const std::string& id) const
{
return PGPHandler::haveSecretKey(PGPIdType(id)) ;
}
bool AuthGPG::isKeySupported(const std::string& id) const
{
const PGPCertificateInfo *pc = PGPHandler::getCertificateInfo(PGPIdType(id)) ;

1
libretroshare/src/pqi/authgpg.h
View File

@ -166,6 +166,7 @@ class AuthGPG: public p3Config, public RsThread, public PGPHandler
//virtual std::string getGPGOwnEmail();
virtual bool isKeySupported(const std::string &id) const ;
virtual bool haveSecretKey(const std::string &id) const ;
virtual bool getGPGDetails(const std::string &id, RsPeerDetails &d);
virtual bool getGPGAllList(std::list<std::string> &ids);
virtual bool getGPGValidList(std::list<std::string> &ids);

1
libretroshare/src/pqi/authssl.cc
View File

@ -54,6 +54,7 @@
/****
* #define AUTHSSL_DEBUG 1
***/
#define AUTHSSL_DEBUG 1
// initialisation du pointeur de singleton
static AuthSSL *instance_ssl = NULL;

3
libretroshare/src/rsserver/rsinit.cc
View File

@ -1112,6 +1112,9 @@ static bool checkAccount(std::string accountdir, accountId &id)
if(!AuthGPG::getAuthGPG()->isKeySupported(id.pgpId))
return false ;
if(!AuthGPG::getAuthGPG()->haveSecretKey(id.pgpId))
return false ;
#ifdef GPG_DEBUG
std::cerr << "PGPLoginDetails: " << id.pgpId << " name: " << id.pgpName;
std::cerr << " email: " << id.pgpEmail << std::endl;