diff --git a/libi2pd/Garlic.cpp b/libi2pd/Garlic.cpp
index 295fdd8a..57b621b5 100644
--- a/libi2pd/Garlic.cpp
+++ b/libi2pd/Garlic.cpp
@@ -189,7 +189,7 @@ namespace garlic
 			uint8_t iv[32]; // IV is first 16 bytes
 			SHA256(elGamal.preIV, 32, iv); 
 			BN_CTX * ctx = BN_CTX_new ();
-			i2p::crypto::ElGamalEncrypt (m_Destination->GetEncryptionPublicKey (), (uint8_t *)&elGamal, buf, ctx, true);	
+			m_Destination->Encrypt ((uint8_t *)&elGamal, buf, ctx);		
 			BN_CTX_free (ctx);		
 			m_Encryption.SetIV (iv);
 			buf += 514;
diff --git a/libi2pd/Identity.h b/libi2pd/Identity.h
index d321e726..1e141583 100644
--- a/libi2pd/Identity.h
+++ b/libi2pd/Identity.h
@@ -191,8 +191,7 @@ namespace data
 			virtual ~RoutingDestination () {};
 
 			virtual std::shared_ptr<const IdentityEx> GetIdentity ()  const = 0;
-			virtual const uint8_t * GetEncryptionPublicKey () const = 0; // deprecated
-			virtual void Encrypt (const uint8_t * data, uint8_t * encrypted, BN_CTX * ctx) = 0; // encrypt data for
+			virtual void Encrypt (const uint8_t * data, uint8_t * encrypted, BN_CTX * ctx) const = 0; // encrypt data for
 			virtual bool IsDestination () const = 0; // for garlic
 
 			const IdentHash& GetIdentHash () const { return GetIdentity ()->GetIdentHash (); };
diff --git a/libi2pd/LeaseSet.cpp b/libi2pd/LeaseSet.cpp
index 3faf085a..d2709a97 100644
--- a/libi2pd/LeaseSet.cpp
+++ b/libi2pd/LeaseSet.cpp
@@ -208,7 +208,7 @@ namespace data
 		return ts > m_ExpirationTime;
 	}
 
-	void LeaseSet::Encrypt (const uint8_t * data, uint8_t * encrypted, BN_CTX * ctx)
+	void LeaseSet::Encrypt (const uint8_t * data, uint8_t * encrypted, BN_CTX * ctx) const
 	{
 		auto encryptor = m_Identity->CreateEncryptor (m_EncryptionKey);
 		if (encryptor)
diff --git a/libi2pd/LeaseSet.h b/libi2pd/LeaseSet.h
index ec9744eb..5a4202ee 100644
--- a/libi2pd/LeaseSet.h
+++ b/libi2pd/LeaseSet.h
@@ -76,8 +76,7 @@ namespace data
 
 			// implements RoutingDestination
 			std::shared_ptr<const IdentityEx> GetIdentity () const { return m_Identity; };
-			const uint8_t * GetEncryptionPublicKey () const { return m_EncryptionKey; }; // deprecated
-			void Encrypt (const uint8_t * data, uint8_t * encrypted, BN_CTX * ctx);
+			void Encrypt (const uint8_t * data, uint8_t * encrypted, BN_CTX * ctx) const;
 			bool IsDestination () const { return true; };
 
 		private:
diff --git a/libi2pd/RouterInfo.cpp b/libi2pd/RouterInfo.cpp
index c73b8afa..f0ad1b88 100644
--- a/libi2pd/RouterInfo.cpp
+++ b/libi2pd/RouterInfo.cpp
@@ -829,10 +829,11 @@ namespace data
 		return m_Profile;
 	}	
 
-	void RouterInfo::Encrypt (const uint8_t * data, uint8_t * encrypted, BN_CTX * ctx)
+	void RouterInfo::Encrypt (const uint8_t * data, uint8_t * encrypted, BN_CTX * ctx) const
 	{
-		// TODO: we always assume ElGamal for RouterInfo, might change later
-		i2p::crypto::ElGamalEncrypt (m_RouterIdentity->GetEncryptionPublicKey (), data, encrypted, ctx);
+		auto encryptor = m_RouterIdentity->CreateEncryptor (nullptr);
+		if (encryptor)
+			encryptor->Encrypt (data, encrypted, ctx);
 	}
 }
 }
diff --git a/libi2pd/RouterInfo.h b/libi2pd/RouterInfo.h
index 2f4800e6..97c0f7b2 100644
--- a/libi2pd/RouterInfo.h
+++ b/libi2pd/RouterInfo.h
@@ -186,8 +186,7 @@ namespace data
       
 			// implements RoutingDestination
 			std::shared_ptr<const IdentityEx> GetIdentity () const { return m_RouterIdentity; };
-			const uint8_t * GetEncryptionPublicKey () const { return m_RouterIdentity->GetStandardIdentity ().publicKey; }; // deprecated
-			void Encrypt (const uint8_t * data, uint8_t * encrypted, BN_CTX * ctx);			
+			void Encrypt (const uint8_t * data, uint8_t * encrypted, BN_CTX * ctx) const;			
 
 			bool IsDestination () const { return false; };