Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-27 23:57:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Completed Basic configuration storage:

Browse source 
* Added read/writetofile() fns to BinMemInterface
 * Added SignData() fns to AuthXPGP.
 * Added Certificate saving to AuthXPGP.
 * added Signatures to Configuration.
 * now discards messages if Hash is wrong (p3msgservice)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@341 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-02-08 12:39:40 +00:00
parent 08d3634d28
commit 3e1b155f1a
12 changed files with 353 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

97
libretroshare/src/pqi/authxpgp.cc
View file

@ -82,7 +82,7 @@ xpgpcert::xpgpcert(XPGP *xpgp, std::string pid)
AuthXPGP::AuthXPGP()
:init(0), sslctx(NULL), pkey(NULL)
:init(0), sslctx(NULL), pkey(NULL), mToSaveCerts(false), mConfigSaveActive(true)
{
}
@ -679,6 +679,9 @@ bool AuthXPGP::TrustCertificate(std::string id, bool totrust)
/* reevaluate the auth of the xpgp */
cert->trustLvl = XPGP_auth_certificate(pgp_keyring, cert->certificate);
valid = true;
/* resave if changed trust setting */
mToSaveCerts = true;
}
xpgpMtx.unlock(); /**** UNLOCK ****/
@ -755,8 +758,62 @@ bool AuthXPGP::AuthCertificate(std::string id)
}
/* Sign / Encrypt / Verify Data (TODO) */
bool AuthXPGP::SignData(std::string input, std::string &sign)
{
return SignData(input.c_str(), input.length(), sign);
}
bool AuthXPGP::SignData(const void *data, const uint32_t len, std::string &sign)
{
RsStackMutex stack(xpgpMtx); /***** STACK LOCK MUTEX *****/
EVP_MD_CTX *mdctx = EVP_MD_CTX_create();
unsigned int signlen = EVP_PKEY_size(pkey);
unsigned char signature[signlen];
if (0 == EVP_SignInit(mdctx, EVP_sha1()))
{
std::cerr << "EVP_SignInit Failure!" << std::endl;
EVP_MD_CTX_destroy(mdctx);
return false;
}
if (0 == EVP_SignUpdate(mdctx, data, len))
{
std::cerr << "EVP_SignUpdate Failure!" << std::endl;
EVP_MD_CTX_destroy(mdctx);
return false;
}
if (0 == EVP_SignFinal(mdctx, signature, &signlen, pkey))
{
std::cerr << "EVP_SignFinal Failure!" << std::endl;
EVP_MD_CTX_destroy(mdctx);
return false;
}
EVP_MD_CTX_destroy(mdctx);
sign.clear();
std::ostringstream out;
out << std::hex;
for(uint32_t i = 0; i < signlen; i++)
{
out << std::setw(2) << std::setfill('0');
out << (uint32_t) (signature[i]);
}
sign = out.str();
return true;
}
/**** NEW functions we've added ****/
@ -1119,6 +1176,8 @@ bool AuthXPGP::ProcessXPGP(XPGP *xpgp, std::string &id)
cert->signers = getXPGPsigners(xpgp);
/* resave if new certificate */
mToSaveCerts = true;
xpgpMtx.unlock(); /**** UNLOCK ****/
id = xpgpid;
@ -1592,6 +1651,33 @@ int printSSLError(SSL *ssl, int retval, int err, unsigned long err2,
*
*/
bool AuthXPGP::FinalSaveCertificates()
{
CheckSaveCertificates();
RsStackMutex stack(xpgpMtx); /***** LOCK *****/
mConfigSaveActive = false;
return true;
}
bool AuthXPGP::CheckSaveCertificates()
{
xpgpMtx.lock(); /***** LOCK *****/
if ((mConfigSaveActive) && (mToSaveCerts))
{
mToSaveCerts = false;
xpgpMtx.unlock(); /**** UNLOCK ****/
saveCertificates();
return true;
}
xpgpMtx.unlock(); /**** UNLOCK ****/
return false;
}
bool AuthXPGP::saveCertificates()
{
// construct file name.
@ -1605,6 +1691,12 @@ bool AuthXPGP::saveCertificates()
xpgpMtx.unlock(); /**** UNLOCK ****/
/* add on the slash */
if (neighdir != "")
{
neighdir += "/";
}
std::map<std::string, std::string>::iterator mit;
std::string conftxt;
@ -1989,6 +2081,7 @@ bool AuthXPGP::loadCertificates(bool &oldFormat, std::map<std::string, std::s
oldFormat = true;
}
mToSaveCerts = false;
return true;
}