mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-08-02 19:26:31 -04:00
Merge pull request #850 from csoler/v0.6-GxsTransport
V0.6 gxs transport
This commit is contained in:
commit
bd1edbcd25
4 changed files with 6 additions and 3 deletions
|
@ -1990,7 +1990,7 @@ bool p3GRouter::signDataItem(RsGRouterAbstractMsgItem *item,const RsGxsId& signi
|
||||||
std::cerr << "Created signature for data hash: " << RsDirUtil::sha1sum(data,data_size) << " and key id=" << signing_id << std::endl;
|
std::cerr << "Created signature for data hash: " << RsDirUtil::sha1sum(data,data_size) << " and key id=" << signing_id << std::endl;
|
||||||
//#endif
|
//#endif
|
||||||
// Check signature
|
// Check signature
|
||||||
RsIdentityUsage::UsageCode info;
|
RsIdentityUsage::UsageCode info = RsIdentityUsage::GLOBAL_ROUTER_SIGNATURE_CREATION;
|
||||||
uint32_t error;
|
uint32_t error;
|
||||||
|
|
||||||
if(verifySignedDataItem(item,info,error))
|
if(verifySignedDataItem(item,info,error))
|
||||||
|
|
|
@ -359,7 +359,7 @@ bool GxsSecurity::getSignature(const char *data, uint32_t data_len, const RsTlvP
|
||||||
ok &= EVP_SignUpdate(mdctx, data, data_len) == 1;
|
ok &= EVP_SignUpdate(mdctx, data, data_len) == 1;
|
||||||
|
|
||||||
unsigned int siglen = EVP_PKEY_size(key_priv);
|
unsigned int siglen = EVP_PKEY_size(key_priv);
|
||||||
unsigned char sigbuf[siglen];
|
unsigned char sigbuf[siglen] = { 0 };
|
||||||
ok &= EVP_SignFinal(mdctx, sigbuf, &siglen, key_priv) == 1;
|
ok &= EVP_SignFinal(mdctx, sigbuf, &siglen, key_priv) == 1;
|
||||||
|
|
||||||
// clean up
|
// clean up
|
||||||
|
|
|
@ -87,7 +87,10 @@ bool p3GxsTrans::sendData( RsGxsTransId& mailId,
|
||||||
}
|
}
|
||||||
|
|
||||||
OutgoingRecord pr( recipient, service, data, size );
|
OutgoingRecord pr( recipient, service, data, size );
|
||||||
|
|
||||||
|
pr.mailItem.clear();
|
||||||
pr.mailItem.meta.mAuthorId = own_gxsid;
|
pr.mailItem.meta.mAuthorId = own_gxsid;
|
||||||
|
pr.mailItem.meta.mMsgId.clear();
|
||||||
pr.mailItem.cryptoType = cm;
|
pr.mailItem.cryptoType = cm;
|
||||||
pr.mailItem.mailId = RSRandom::random_u64();
|
pr.mailItem.mailId = RSRandom::random_u64();
|
||||||
|
|
||||||
|
|
|
@ -599,7 +599,7 @@ bool AuthSSLimpl::SignData(const void *data, const uint32_t len, std::string &si
|
||||||
|
|
||||||
EVP_MD_CTX *mdctx = EVP_MD_CTX_create();
|
EVP_MD_CTX *mdctx = EVP_MD_CTX_create();
|
||||||
unsigned int signlen = EVP_PKEY_size(mOwnPrivateKey);
|
unsigned int signlen = EVP_PKEY_size(mOwnPrivateKey);
|
||||||
unsigned char signature[signlen];
|
unsigned char signature[signlen] = { 0 };
|
||||||
|
|
||||||
if (0 == EVP_SignInit(mdctx, EVP_sha1()))
|
if (0 == EVP_SignInit(mdctx, EVP_sha1()))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue