MLKEM512_X25519 crypto key added

libi2pd/CryptoKey.cpp

@@ -174,17 +174,12 @@ namespace crypto
 		return m_StaticKeys.Agree (epub, sharedSecret);
 	}
 
-	bool CreateECIESX25519AEADRatchetRandomKeys (uint8_t * priv, uint8_t * pub, i2p::data::CryptoKeyType type)
+	void CreateECIESX25519AEADRatchetRandomKeys (uint8_t * priv, uint8_t * pub)
 	{
-		if (type == i2p::data::CRYPTO_KEY_TYPE_ECIES_X25519_AEAD)
+		X25519Keys k;
-		{
+		k.GenerateKeys ();
-			X25519Keys k;
+		k.GetPrivateKey (priv);
-			k.GenerateKeys ();
+		memcpy (pub, k.GetPublicKey (), 32);
-			k.GetPrivateKey (priv);
-			memcpy (pub, k.GetPublicKey (), 32);
-			return true;
-		}	
-		return false;
 	}
 }
 }

libi2pd/CryptoKey.h

@@ -158,8 +158,7 @@ namespace crypto
 			X25519Keys m_StaticKeys;
 	};
 
-	bool CreateECIESX25519AEADRatchetRandomKeys (uint8_t * priv, uint8_t * pub,
+	void CreateECIESX25519AEADRatchetRandomKeys (uint8_t * priv, uint8_t * pub); // including hybrid
-		i2p::data::CryptoKeyType type = i2p::data::CRYPTO_KEY_TYPE_ECIES_X25519_AEAD);
 
 	constexpr size_t GetCryptoPrivateKeyLen (i2p::data::CryptoKeyType type)
 	{
@@ -168,6 +167,7 @@ namespace crypto
 			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;
+			case i2p::data::CRYPTO_KEY_TYPE_ECIES_MLKEM512_X25519_AEAD: return 32;
 		};	
 		return 0;
 	}
@@ -179,6 +179,7 @@ namespace crypto
 			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;
+			case i2p::data::CRYPTO_KEY_TYPE_ECIES_MLKEM512_X25519_AEAD: return 32;
 		};	
 		return 0;
 	}

libi2pd/Destination.cpp

@@ -1520,14 +1520,14 @@ namespace client
 
 	bool ClientDestination::SupportsEncryptionType (i2p::data::CryptoKeyType keyType) const
 	{
-		return keyType == i2p::data::CRYPTO_KEY_TYPE_ECIES_X25519_AEAD ? (bool)m_ECIESx25519EncryptionKey : (bool)m_StandardEncryptionKey;
+		return keyType == i2p::data::CRYPTO_KEY_TYPE_ELGAMAL ? (bool)m_StandardEncryptionKey : (bool)m_ECIESx25519EncryptionKey;
 	}
 
 	const uint8_t * ClientDestination::GetEncryptionPublicKey (i2p::data::CryptoKeyType keyType) const
 	{
-		if (keyType == i2p::data::CRYPTO_KEY_TYPE_ECIES_X25519_AEAD)
+		if (keyType == i2p::data::CRYPTO_KEY_TYPE_ELGAMAL)
-			return m_ECIESx25519EncryptionKey ? m_ECIESx25519EncryptionKey->pub.data () : nullptr;
+			return m_StandardEncryptionKey ? m_StandardEncryptionKey->pub.data () : nullptr;
-		return m_StandardEncryptionKey ? m_StandardEncryptionKey->pub.data () : nullptr;
+		return m_ECIESx25519EncryptionKey ? m_ECIESx25519EncryptionKey->pub.data () : nullptr;
 	}
 
 	void ClientDestination::ReadAuthKey (const std::string& group, const std::map<std::string, std::string> * params)

libi2pd/Identity.h

@@ -70,6 +70,7 @@ namespace data
 	const uint16_t CRYPTO_KEY_TYPE_ELGAMAL = 0;
 	const uint16_t CRYPTO_KEY_TYPE_ECIES_P256_SHA256_AES256CBC = 1;
 	const uint16_t CRYPTO_KEY_TYPE_ECIES_X25519_AEAD = 4;
+	const uint16_t CRYPTO_KEY_TYPE_ECIES_MLKEM512_X25519_AEAD = 5;
 	
 	const uint16_t SIGNING_KEY_TYPE_DSA_SHA1 = 0;
 	const uint16_t SIGNING_KEY_TYPE_ECDSA_SHA256_P256 = 1;