Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 23:49:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

replace std::map with std::array

Browse Source
This commit is contained in:
sehraf 2020-06-10 21:46:59 +02:00
parent d0c5dc4e24
commit 008a4b87b3
No known key found for this signature in database
GPG Key ID: DF09F6EAE356B2C6
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libretroshare/src/util/i2pcommon.cpp
View File

@ -133,20 +133,20 @@ std::string publicKeyFromPrivate(std::string const &priv)
RsDbg() << __PRETTY_FUNCTION__ << " signing pubkey type " << certType << " has oversize" << std::endl;
// calculate oversize
auto it = signingKeyLengths.find(static_cast<SigningKeyType>(signingKeyType));
if (it == signingKeyLengths.end()) {
if (signingKeyType >= signingKeyLengths.size()) {
// just in case
RsDbg() << __PRETTY_FUNCTION__ << " signing pubkey type " << certType << " cannot be found in size map!" << std::endl;
return std::string();
}
if (it->second.first <= 128) {
auto values = signingKeyLengths[signingKeyType];
if (values.first <= 128) {
// just in case, it's supposed to be larger!
RsDbg() << __PRETTY_FUNCTION__ << " signing pubkey type " << certType << " is oversize but size calculation would underflow!" << std::endl;
return std::string();
}
publicKeyLen += it->second.first - 128; // 128 = default DSA key length = the space than can be used before the key must be splitted
publicKeyLen += values.first - 128; // 128 = default DSA key length = the space than can be used before the key must be splitted
}
// Crypto Public Key

36
libretroshare/src/util/i2pcommon.h
View File

@ -161,25 +161,27 @@ enum class CryptoKeyType : uint16_t {
X25519 = 4
};
static const std::map<CryptoKeyType, std::pair<uint16_t, uint16_t>> cryptoKeyLengths {
{CryptoKeyType::ElGamal, {256, 256}},
{CryptoKeyType::P256, { 64, 32}},
{CryptoKeyType::P384, { 96, 48}},
{CryptoKeyType::P521, {132, 66}},
{CryptoKeyType::X25519, { 32, 32}},
static const std::array<std::pair<uint16_t, uint16_t>, 5> cryptoKeyLengths {
/*CryptoKeyType::ElGamal*/ std::make_pair<uint16_t, uint16_t>(256, 256),
/*CryptoKeyType::P256, */ std::make_pair<uint16_t, uint16_t>( 64, 32),
/*CryptoKeyType::P384, */ std::make_pair<uint16_t, uint16_t>( 96, 48),
/*CryptoKeyType::P521, */ std::make_pair<uint16_t, uint16_t>(132, 66),
/*CryptoKeyType::X25519,*/ std::make_pair<uint16_t, uint16_t>( 32, 32),
};
static const std::map<SigningKeyType, std::pair<uint16_t, uint16_t>> signingKeyLengths {
{SigningKeyType::DSA_SHA1, {128, 128}},
{SigningKeyType::ECDSA_SHA256_P256, { 64, 32}},
{SigningKeyType::ECDSA_SHA384_P384, { 96, 48}},
{SigningKeyType::ECDSA_SHA512_P521, {132, 66}},
{SigningKeyType::RSA_SHA256_2048, {256, 512}},
{SigningKeyType::RSA_SHA384_3072, {384, 768}},
{SigningKeyType::RSA_SHA512_4096, {512,1024}},
{SigningKeyType::EdDSA_SHA512_Ed25519, { 32, 32}},
{SigningKeyType::EdDSA_SHA512_Ed25519ph,{ 32, 32}},
{SigningKeyType::RedDSA_SHA512_Ed25519, { 32, 32}},
static const std::array<std::pair<uint16_t, uint16_t>, 12> signingKeyLengths {
/*SigningKeyType::DSA_SHA1, */ std::make_pair<uint16_t, uint16_t>(128, 128),
/*SigningKeyType::ECDSA_SHA256_P256, */ std::make_pair<uint16_t, uint16_t>( 64, 32),
/*SigningKeyType::ECDSA_SHA384_P384, */ std::make_pair<uint16_t, uint16_t>( 96, 48),
/*SigningKeyType::ECDSA_SHA512_P521, */ std::make_pair<uint16_t, uint16_t>(132, 66),
/*SigningKeyType::RSA_SHA256_2048, */ std::make_pair<uint16_t, uint16_t>(256, 512),
/*SigningKeyType::RSA_SHA384_3072, */ std::make_pair<uint16_t, uint16_t>(384, 768),
/*SigningKeyType::RSA_SHA512_4096, */ std::make_pair<uint16_t, uint16_t>(512,1024),
/*SigningKeyType::EdDSA_SHA512_Ed25519 */ std::make_pair<uint16_t, uint16_t>( 32, 32),
/*SigningKeyType::EdDSA_SHA512_Ed25519ph */ std::make_pair<uint16_t, uint16_t>( 32, 32),
/*reserved (GOST) */ std::make_pair<uint16_t, uint16_t>( 64, 0),
/*reserved (GOST) */ std::make_pair<uint16_t, uint16_t>(128, 0),
/*SigningKeyType::RedDSA_SHA512_Ed25519 */ std::make_pair<uint16_t, uint16_t>( 32, 32),
};