From e118b4dbf816193bd891c35cb74a0051fbf741ff Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Thu, 2 May 2019 19:59:29 +0200 Subject: [PATCH] Fix typo in PGP fingerprint type --- libretroshare/src/pgp/pgphandler.cc | 8 ++++---- libretroshare/src/retroshare/rsids.h | 4 ++-- libretroshare/src/services/broadcastdiscoveryservice.cc | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libretroshare/src/pgp/pgphandler.cc b/libretroshare/src/pgp/pgphandler.cc index 9c8989af6..8ea1a2be8 100644 --- a/libretroshare/src/pgp/pgphandler.cc +++ b/libretroshare/src/pgp/pgphandler.cc @@ -915,7 +915,7 @@ bool PGPHandler::checkAndImportKeyPair(ops_keyring_t *tmp_keyring, RsPgpId &impo } if(memcmp( pubkey->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!" ; return false ; @@ -945,7 +945,7 @@ bool PGPHandler::checkAndImportKeyPair(ops_keyring_t *tmp_keyring, RsPgpId &impo if(!memcmp( static_cast(result->valid_sigs[i].signer_id), pubkey->key_id, - RsPpgFingerprint::SIZE_IN_BYTES )) + RsPgpFingerprint::SIZE_IN_BYTES )) { found = true ; break ; @@ -1095,7 +1095,7 @@ bool PGPHandler::LoadCertificateFromString(const std::string& pgp_cert,RsPgpId& if(!memcmp( static_cast(result->valid_sigs[i].signer_id), keydata->key_id, - RsPpgFingerprint::SIZE_IN_BYTES )) + RsPgpFingerprint::SIZE_IN_BYTES )) { found = true ; break ; @@ -1174,7 +1174,7 @@ bool PGPHandler::locked_addOrMergeKey(ops_keyring_t *keyring,std::mapfingerprint.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; return false ; diff --git a/libretroshare/src/retroshare/rsids.h b/libretroshare/src/retroshare/rsids.h index 65c0f8d56..8c2cdc51e 100644 --- a/libretroshare/src/retroshare/rsids.h +++ b/libretroshare/src/retroshare/rsids.h @@ -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 Sha1CheckSum = t_RsGenericIdType<_RsIdSize::SHA1 , false, RsGenericIdType::SHA1 >; 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 RsGxsGroupId = t_RsGenericIdType<_RsIdSize::CERT_SIGN , false, RsGenericIdType::GXS_GROUP >; 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 >; /// @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; diff --git a/libretroshare/src/services/broadcastdiscoveryservice.cc b/libretroshare/src/services/broadcastdiscoveryservice.cc index cb49f6a88..6d9d3d218 100644 --- a/libretroshare/src/services/broadcastdiscoveryservice.cc +++ b/libretroshare/src/services/broadcastdiscoveryservice.cc @@ -44,7 +44,7 @@ struct BroadcastDiscoveryPack : RsSerializable { BroadcastDiscoveryPack() : mLocalPort(0) {} - PGPFingerprintType mPgpFingerprint; + RsPgpFingerprint mPgpFingerprint; RsPeerId mSslId; uint16_t mLocalPort; std::string mProfileName;