calculate crypto key length from key type

libi2pd/CryptoKey.cpp

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2021, The PurpleI2P Project
+* Copyright (c) 2013-2025, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *
@@ -174,12 +174,17 @@ namespace crypto
 		return m_StaticKeys.Agree (epub, sharedSecret);
 	}
 
-	void CreateECIESX25519AEADRatchetRandomKeys (uint8_t * priv, uint8_t * pub)
+	bool CreateECIESX25519AEADRatchetRandomKeys (uint8_t * priv, uint8_t * pub, i2p::data::CryptoKeyType type)
+	{
+		if (type == i2p::data::CRYPTO_KEY_TYPE_ECIES_X25519_AEAD)
 		{
 			X25519Keys k;
 			k.GenerateKeys ();
 			k.GetPrivateKey (priv);
 			memcpy (pub, k.GetPublicKey (), 32);
+			return true;
+		}	
+		return false;
 	}
 }
 }

libi2pd/CryptoKey.h

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2021, The PurpleI2P Project
+* Copyright (c) 2013-2025, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *
@@ -11,6 +11,7 @@
 
 #include <inttypes.h>
 #include "Crypto.h"
+#include "Identity.h"
 
 namespace i2p
 {
@@ -157,7 +158,30 @@ namespace crypto
 			X25519Keys m_StaticKeys;
 	};
 
-	void CreateECIESX25519AEADRatchetRandomKeys (uint8_t * priv, uint8_t * pub);
+	bool CreateECIESX25519AEADRatchetRandomKeys (uint8_t * priv, uint8_t * pub,
+		i2p::data::CryptoKeyType type = i2p::data::CRYPTO_KEY_TYPE_ECIES_X25519_AEAD);
+
+	constexpr size_t GetCryptoPrivateKeyLen (i2p::data::CryptoKeyType type)
+	{
+		switch (type)
+		{
+			case i2p::data::CRYPTO_KEY_TYPE_ELGAMAL: return 256;
+			case i2p::data::CRYPTO_KEY_TYPE_ECIES_P256_SHA256_AES256CBC: return 32;
+			case i2p::data::CRYPTO_KEY_TYPE_ECIES_X25519_AEAD: return 32;
+		};	
+		return 0;
+	}
+
+	constexpr size_t GetCryptoPublicKeyLen (i2p::data::CryptoKeyType type)
+	{
+		switch (type)
+		{
+			case i2p::data::CRYPTO_KEY_TYPE_ELGAMAL: return 256;
+			case i2p::data::CRYPTO_KEY_TYPE_ECIES_P256_SHA256_AES256CBC: return 32;
+			case i2p::data::CRYPTO_KEY_TYPE_ECIES_X25519_AEAD: return 32;
+		};	
+		return 0;
+	}
 }
 }
 

libi2pd/Destination.cpp

@@ -1416,21 +1416,29 @@ namespace client
 		std::string path  = i2p::fs::DataDirPath("destinations", ident + "." + std::to_string (keys->keyType) + ".dat");
 		std::ifstream f(path, std::ifstream::binary);
 
-		if (f) {
+		if (f) 
-			f.read ((char *)keys->pub, 256);
+		{
-			f.read ((char *)keys->priv, 256);
+			char pub[256], priv[256];
+			f.read (pub, 256);
+			memcpy (keys->pub.data(), pub, keys->pub.size());
+			f.read (priv, 256);
+			memcpy (keys->priv.data (), priv, keys->priv.size ());
 			return;
 		}
 
 		LogPrint (eLogInfo, "Destination: Creating new temporary keys of type for address ", ident, ".b32.i2p");
-		memset (keys->priv, 0, 256);
+		memset (keys->priv.data (), 0, keys->priv.size ());
-		memset (keys->pub, 0, 256);
+		memset (keys->pub.data (), 0, keys->pub.size ());
 		keys->GenerateKeys ();
 		// TODO:: persist crypto key type
 		std::ofstream f1 (path, std::ofstream::binary | std::ofstream::out);
-		if (f1) {
+		if (f1) 
-			f1.write ((char *)keys->pub, 256);
+		{
-			f1.write ((char *)keys->priv, 256);
+			char pub[256], priv[256];
+			memset (pub, 0, 256); memcpy (pub, keys->pub.data (), keys->pub.size ());
+			f1.write (pub, 256);
+			memset (priv, 0, 256); memcpy (priv, keys->priv.data (), keys->priv.size ());
+			f1.write (priv, 256);
 			return;
 		}
 		LogPrint(eLogCritical, "Destinations: Can't save keys to ", path);
@@ -1443,7 +1451,7 @@ namespace client
 		{
 			if (m_StandardEncryptionKey)
 			{
-				leaseSet = std::make_shared<i2p::data::LocalLeaseSet> (GetIdentity (), m_StandardEncryptionKey->pub, tunnels);
+				leaseSet = std::make_shared<i2p::data::LocalLeaseSet> (GetIdentity (), m_StandardEncryptionKey->pub.data (), tunnels);
 				// sign
 				Sign (leaseSet->GetBuffer (), leaseSet->GetBufferLen () - leaseSet->GetSignatureLen (), leaseSet->GetSignature ());
 			}
@@ -1455,9 +1463,9 @@ namespace client
 			// standard LS2 (type 3) first
 			i2p::data::LocalLeaseSet2::KeySections keySections;
 			if (m_ECIESx25519EncryptionKey)
-				keySections.push_back ({m_ECIESx25519EncryptionKey->keyType, 32, m_ECIESx25519EncryptionKey->pub} );
+				keySections.push_back ({m_ECIESx25519EncryptionKey->keyType, (uint16_t)m_ECIESx25519EncryptionKey->pub.size (), m_ECIESx25519EncryptionKey->pub.data ()} );
 			if (m_StandardEncryptionKey)
-				keySections.push_back ({m_StandardEncryptionKey->keyType, (uint16_t)m_StandardEncryptionKey->decryptor->GetPublicKeyLen (), m_StandardEncryptionKey->pub} );
+				keySections.push_back ({m_StandardEncryptionKey->keyType, (uint16_t)m_StandardEncryptionKey->decryptor->GetPublicKeyLen (), m_StandardEncryptionKey->pub.data ()} );
 
 			auto publishedTimestamp = i2p::util::GetSecondsSinceEpoch ();
 			if (publishedTimestamp <= m_LastPublishedTimestamp)
@@ -1501,8 +1509,8 @@ namespace client
 	const uint8_t * ClientDestination::GetEncryptionPublicKey (i2p::data::CryptoKeyType keyType) const
 	{
 		if (keyType == i2p::data::CRYPTO_KEY_TYPE_ECIES_X25519_AEAD)
-			return m_ECIESx25519EncryptionKey ? m_ECIESx25519EncryptionKey->pub : nullptr;
+			return m_ECIESx25519EncryptionKey ? m_ECIESx25519EncryptionKey->pub.data () : nullptr;
-		return m_StandardEncryptionKey ? m_StandardEncryptionKey->pub : nullptr;
+		return m_StandardEncryptionKey ? m_StandardEncryptionKey->pub.data () : nullptr;
 	}
 
 	void ClientDestination::ReadAuthKey (const std::string& group, const std::map<std::string, std::string> * params)

libi2pd/Destination.h

@@ -22,6 +22,7 @@
 #include "Identity.h"
 #include "TunnelPool.h"
 #include "Crypto.h"
+#include "CryptoKey.h"
 #include "LeaseSet.h"
 #include "Garlic.h"
 #include "NetDb.hpp"
@@ -231,13 +232,17 @@ namespace client
 	{
 		struct EncryptionKey
 		{
-			uint8_t pub[256], priv[256];
+			std::vector<uint8_t> pub, priv;
 			i2p::data::CryptoKeyType keyType;
 			std::shared_ptr<i2p::crypto::CryptoKeyDecryptor> decryptor;
 
-			EncryptionKey (i2p::data::CryptoKeyType t):keyType(t) { memset (pub, 0, 256); memset (priv, 0, 256);	};
+			EncryptionKey (i2p::data::CryptoKeyType t): keyType(t) 
-			void GenerateKeys () { i2p::data::PrivateKeys::GenerateCryptoKeyPair (keyType, priv, pub); };
+			{ 
-			void CreateDecryptor () { decryptor = i2p::data::PrivateKeys::CreateDecryptor (keyType, priv); };
+				pub.resize (i2p::crypto::GetCryptoPublicKeyLen (keyType)); 
+				priv.resize (i2p::crypto::GetCryptoPrivateKeyLen (keyType));
+			}
+			void GenerateKeys () { i2p::data::PrivateKeys::GenerateCryptoKeyPair (keyType, priv.data (), pub.data ()); };
+			void CreateDecryptor () { decryptor = i2p::data::PrivateKeys::CreateDecryptor (keyType, priv.data ()); };
 		};
 
 		public:

libi2pd/Identity.cpp

@@ -10,6 +10,7 @@
 #include "I2PEndian.h"
 #include "Log.h"
 #include "Timestamp.h"
+#include "CryptoKey.h"
 #include "Identity.h"
 
 namespace i2p
@@ -658,8 +659,7 @@ namespace data
 
 	size_t PrivateKeys::GetPrivateKeyLen () const
 	{
-		// private key length always 256, but type 4
+		return i2p::crypto::GetCryptoPrivateKeyLen (m_Public->GetCryptoKeyType ());
-		return (m_Public->GetCryptoKeyType () == CRYPTO_KEY_TYPE_ECIES_X25519_AEAD) ? 32 : 256;
 	}
 
 	uint8_t * PrivateKeys::GetPadding()

libi2pd/Identity.h

@@ -17,10 +17,14 @@
 #include <vector>
 #include "Base.h"
 #include "Signature.h"
-#include "CryptoKey.h"
 
 namespace i2p
 {
+namespace crypto
+{
+	class CryptoKeyEncryptor;
+	class CryptoKeyDecryptor;
+}	
 namespace data
 {
 	typedef Tag<32> IdentHash;

libi2pd/LeaseSet.cpp

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2024, The PurpleI2P Project
+* Copyright (c) 2013-2025, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *
@@ -14,6 +14,7 @@
 #include "Timestamp.h"
 #include "NetDb.hpp"
 #include "Tunnel.h"
+#include "CryptoKey.h"
 #include "LeaseSet.h"
 
 namespace i2p

libi2pd/RouterContext.cpp

@@ -22,6 +22,7 @@
 #include "ECIESX25519AEADRatchetSession.h"
 #include "Transports.h"
 #include "Tunnel.h"
+#include "CryptoKey.h"
 #include "RouterContext.h"
 
 namespace i2p

libi2pd/RouterInfo.cpp

@@ -25,6 +25,7 @@
 #include "Transports.h"
 #include "NetDb.hpp"
 #include "RouterContext.h"
+#include "CryptoKey.h"
 #include "RouterInfo.h"
 
 namespace i2p

libi2pd_client/I2CP.h

@@ -21,6 +21,7 @@
 #include "util.h"
 #include "Destination.h"
 #include "Streaming.h"
+#include "CryptoKey.h"
 
 namespace i2p
 {