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

Fix typo in PGP fingerprint type

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2019-05-02 19:59:29 +02:00
parent 7642216912
commit e118b4dbf8
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -915,7 +915,7 @@ bool PGPHandler::checkAndImportKeyPair(ops_keyring_t *tmp_keyring, RsPgpId &impo
} }
if(memcmp( pubkey->fingerprint.fingerprint, if(memcmp( pubkey->fingerprint.fingerprint,
seckey->fingerprint.fingerprint, seckey->fingerprint.fingerprint,
RsPpgFingerprint::SIZE_IN_BYTES ) != 0) RsPgpFingerprint::SIZE_IN_BYTES ) != 0)
{ {
import_error = "Public and private keys do nt have the same fingerprint. Sorry!" ; import_error = "Public and private keys do nt have the same fingerprint. Sorry!" ;
return false ; return false ;
@ -945,7 +945,7 @@ bool PGPHandler::checkAndImportKeyPair(ops_keyring_t *tmp_keyring, RsPgpId &impo
if(!memcmp( if(!memcmp(
static_cast<uint8_t*>(result->valid_sigs[i].signer_id), static_cast<uint8_t*>(result->valid_sigs[i].signer_id),
pubkey->key_id, pubkey->key_id,
RsPpgFingerprint::SIZE_IN_BYTES )) RsPgpFingerprint::SIZE_IN_BYTES ))
{ {
found = true ; found = true ;
break ; break ;
@ -1095,7 +1095,7 @@ bool PGPHandler::LoadCertificateFromString(const std::string& pgp_cert,RsPgpId&
if(!memcmp( if(!memcmp(
static_cast<uint8_t*>(result->valid_sigs[i].signer_id), static_cast<uint8_t*>(result->valid_sigs[i].signer_id),
keydata->key_id, keydata->key_id,
RsPpgFingerprint::SIZE_IN_BYTES )) RsPgpFingerprint::SIZE_IN_BYTES ))
{ {
found = true ; found = true ;
break ; break ;
@ -1174,7 +1174,7 @@ bool PGPHandler::locked_addOrMergeKey(ops_keyring_t *keyring,std::map<RsPgpId,PG
{ {
if(memcmp( existing_key->fingerprint.fingerprint, if(memcmp( existing_key->fingerprint.fingerprint,
keydata->fingerprint.fingerprint, keydata->fingerprint.fingerprint,
RsPpgFingerprint::SIZE_IN_BYTES )) RsPgpFingerprint::SIZE_IN_BYTES ))
{ {
std::cerr << "(EE) attempt to merge key with identical id, but different fingerprint!" << std::endl; std::cerr << "(EE) attempt to merge key with identical id, but different fingerprint!" << std::endl;
return false ; return false ;

4
libretroshare/src/retroshare/rsids.h
View File

@ -325,7 +325,7 @@ using RsPeerId = t_RsGenericIdType<_RsIdSize::SSL_ID , false, R
using RsPgpId = t_RsGenericIdType<_RsIdSize::PGP_ID , true, RsGenericIdType::PGP_ID >; using RsPgpId = t_RsGenericIdType<_RsIdSize::PGP_ID , true, RsGenericIdType::PGP_ID >;
using Sha1CheckSum = t_RsGenericIdType<_RsIdSize::SHA1 , false, RsGenericIdType::SHA1 >; using Sha1CheckSum = t_RsGenericIdType<_RsIdSize::SHA1 , false, RsGenericIdType::SHA1 >;
using Sha256CheckSum = t_RsGenericIdType<_RsIdSize::SHA256 , false, RsGenericIdType::SHA256 >; using Sha256CheckSum = t_RsGenericIdType<_RsIdSize::SHA256 , false, RsGenericIdType::SHA256 >;
using RsPpgFingerprint = t_RsGenericIdType<_RsIdSize::PGP_FINGERPRINT, true, RsGenericIdType::PGP_FINGERPRINT>; using RsPgpFingerprint = t_RsGenericIdType<_RsIdSize::PGP_FINGERPRINT, true, RsGenericIdType::PGP_FINGERPRINT>;
using Bias20Bytes = t_RsGenericIdType<_RsIdSize::SHA1 , true, RsGenericIdType::BIAS_20_BYTES >; using Bias20Bytes = t_RsGenericIdType<_RsIdSize::SHA1 , true, RsGenericIdType::BIAS_20_BYTES >;
using RsGxsGroupId = t_RsGenericIdType<_RsIdSize::CERT_SIGN , false, RsGenericIdType::GXS_GROUP >; using RsGxsGroupId = t_RsGenericIdType<_RsIdSize::CERT_SIGN , false, RsGenericIdType::GXS_GROUP >;
using RsGxsId = t_RsGenericIdType<_RsIdSize::CERT_SIGN , false, RsGenericIdType::GXS_ID >; using RsGxsId = t_RsGenericIdType<_RsIdSize::CERT_SIGN , false, RsGenericIdType::GXS_ID >;
@ -335,4 +335,4 @@ using DistantChatPeerId = t_RsGenericIdType<_RsIdSize::SSL_ID , false, R
using RsNodeGroupId = t_RsGenericIdType<_RsIdSize::CERT_SIGN , false, RsGenericIdType::NODE_GROUP >; using RsNodeGroupId = t_RsGenericIdType<_RsIdSize::CERT_SIGN , false, RsGenericIdType::NODE_GROUP >;
/// @deprecated Ugly name kept temporarly only because it is used in many places /// @deprecated Ugly name kept temporarly only because it is used in many places
using PGPFingerprintType RS_DEPRECATED_FOR(RsPpgFingerprint) = RsPpgFingerprint; using PGPFingerprintType RS_DEPRECATED_FOR(RsPpgFingerprint) = RsPgpFingerprint;

2
libretroshare/src/services/broadcastdiscoveryservice.cc
View File

@ -44,7 +44,7 @@ struct BroadcastDiscoveryPack : RsSerializable
{ {
BroadcastDiscoveryPack() : mLocalPort(0) {} BroadcastDiscoveryPack() : mLocalPort(0) {}
PGPFingerprintType mPgpFingerprint; RsPgpFingerprint mPgpFingerprint;
RsPeerId mSslId; RsPeerId mSslId;
uint16_t mLocalPort; uint16_t mLocalPort;
std::string mProfileName; std::string mProfileName;