Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-25 23:06:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed wrong size check

Browse Source
This commit is contained in:
sehraf 2020-11-28 11:16:55 +01:00
parent aef993de55
commit 5418483934
No known key found for this signature in database
GPG Key ID: DF09F6EAE356B2C6
2 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,8 +50,10 @@ std::string publicKeyFromPrivate(std::string const &priv)
* https://geti2p.net/spec/common-structures#keysandcert * https://geti2p.net/spec/common-structures#keysandcert
* https://geti2p.net/spec/common-structures#certificate * https://geti2p.net/spec/common-structures#certificate
*/ */
if (priv.empty() || priv.length() < 884) // base64 ( = 663 bytes = KeyCert + priv Keys) if (priv.length() < privKeyMinLenth_b64) {
RS_WARN("key to short!");
return std::string(); return std::string();
}
// creat a copy to work on, need to convert it to standard base64 // creat a copy to work on, need to convert it to standard base64
auto priv_copy(priv); auto priv_copy(priv);
@ -163,8 +165,10 @@ std::string publicKeyFromPrivate(std::string const &priv)
bool getKeyTypes(const std::string &key, std::string &signingKey, std::string &cryptoKey) bool getKeyTypes(const std::string &key, std::string &signingKey, std::string &cryptoKey)
{ {
if (key.length() < 522) // base64 (391 bytes = 384 bytes + 7 bytes = KeysAndCert + Certificate) if (key.length() < pubKeyMinLenth_b64) {
RS_WARN("key to short!");
return false; return false;
}
// creat a copy to work on, need to convert it to standard base64 // creat a copy to work on, need to convert it to standard base64
auto key_copy(key); auto key_copy(key);

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

@ -186,6 +186,39 @@ static const std::array<std::pair<uint16_t, uint16_t>, 12> signingKeyLengths {
/*SigningKeyType::RedDSA_SHA512_Ed25519 */ std::make_pair<uint16_t, uint16_t>( 32, 32), /*SigningKeyType::RedDSA_SHA512_Ed25519 */ std::make_pair<uint16_t, uint16_t>( 32, 32),
}; };
/*
* Key length infos:
*
* BOB private key
* len b64: 884
* len pln: 663
*
* BOB public key / destination
* len b64: 516
* len pln: 387
*
* SAMv3 private key
* len b64: 908
* len pln: 679
*
* SAMv3 public key
* len b64: 516
* len pln: 387
*
* Example:
* in bytes, public key only
* 384 (Key) + 3 (Null certificate) = 387 bytes
* 384 (Key) + 7 (key certificate) = 391 bytes
*
* in bytes public + private key
* 384 (Key) + 3 (Null certificate) + 256 (ElGamal) + 20 (DSA_SHA1) = 663 bytes
* 384 (Key) + 7 (key certificate) + 256 (ElGamal) + 32 (EdDSA_SHA512_Ed25519) = 679 bytes
*/
constexpr size_t pubKeyMinLenth_b64 = 516;
constexpr size_t pubKeyMinLenth_bin = 387;
constexpr size_t privKeyMinLenth_b64 = 884;
constexpr size_t privKeyMinLenth_bin = 663;
/** /**
* @brief makeOption Creates the string "lhs=rhs" used by BOB and SAM. Converts rhs * @brief makeOption Creates the string "lhs=rhs" used by BOB and SAM. Converts rhs
* @param lhs option to set * @param lhs option to set