Split tunnel-specific crypto from aes.h/cpp.

AESNIMacros.h

@@ -0,0 +1,66 @@
+#ifndef AESNIMACROS_H__
+#define AESNIMACROS_H__
+
+#define KeyExpansion256(round0,round1) \
+    "pshufd $0xff, %%xmm2, %%xmm2 \n" \
+    "movaps %%xmm1, %%xmm4 \n" \
+    "pslldq $4, %%xmm4 \n" \
+    "pxor %%xmm4, %%xmm1 \n" \
+    "pslldq $4, %%xmm4 \n" \
+    "pxor %%xmm4, %%xmm1 \n" \
+    "pslldq $4, %%xmm4 \n" \
+    "pxor %%xmm4, %%xmm1 \n" \
+    "pxor %%xmm2, %%xmm1 \n" \
+    "movaps %%xmm1, "#round0"(%[sched]) \n" \
+    "aeskeygenassist $0, %%xmm1, %%xmm4 \n" \
+    "pshufd $0xaa, %%xmm4, %%xmm2 \n" \
+    "movaps %%xmm3, %%xmm4 \n" \
+    "pslldq $4, %%xmm4 \n" \
+    "pxor %%xmm4, %%xmm3 \n" \
+    "pslldq $4, %%xmm4 \n" \
+    "pxor %%xmm4, %%xmm3 \n" \
+    "pslldq $4, %%xmm4 \n" \
+    "pxor %%xmm4, %%xmm3 \n" \
+    "pxor %%xmm2, %%xmm3 \n" \
+    "movaps %%xmm3, "#round1"(%[sched]) \n" 
+
+#define EncryptAES256(sched) \
+    "pxor (%["#sched"]), %%xmm0 \n" \
+    "aesenc 16(%["#sched"]), %%xmm0 \n" \
+    "aesenc 32(%["#sched"]), %%xmm0 \n" \
+    "aesenc 48(%["#sched"]), %%xmm0 \n" \
+    "aesenc 64(%["#sched"]), %%xmm0 \n" \
+    "aesenc 80(%["#sched"]), %%xmm0 \n" \
+    "aesenc 96(%["#sched"]), %%xmm0 \n" \
+    "aesenc 112(%["#sched"]), %%xmm0 \n" \
+    "aesenc 128(%["#sched"]), %%xmm0 \n" \
+    "aesenc 144(%["#sched"]), %%xmm0 \n" \
+    "aesenc 160(%["#sched"]), %%xmm0 \n" \
+    "aesenc 176(%["#sched"]), %%xmm0 \n" \
+    "aesenc 192(%["#sched"]), %%xmm0 \n" \
+    "aesenc 208(%["#sched"]), %%xmm0 \n" \
+    "aesenclast 224(%["#sched"]), %%xmm0 \n"
+
+#define DecryptAES256(sched) \
+    "pxor 224(%["#sched"]), %%xmm0 \n" \
+    "aesdec 208(%["#sched"]), %%xmm0 \n" \
+    "aesdec 192(%["#sched"]), %%xmm0 \n" \
+    "aesdec 176(%["#sched"]), %%xmm0 \n" \
+    "aesdec 160(%["#sched"]), %%xmm0 \n" \
+    "aesdec 144(%["#sched"]), %%xmm0 \n" \
+    "aesdec 128(%["#sched"]), %%xmm0 \n" \
+    "aesdec 112(%["#sched"]), %%xmm0 \n" \
+    "aesdec 96(%["#sched"]), %%xmm0 \n" \
+    "aesdec 80(%["#sched"]), %%xmm0 \n" \
+    "aesdec 64(%["#sched"]), %%xmm0 \n" \
+    "aesdec 48(%["#sched"]), %%xmm0 \n" \
+    "aesdec 32(%["#sched"]), %%xmm0 \n" \
+    "aesdec 16(%["#sched"]), %%xmm0 \n" \
+    "aesdeclast (%["#sched"]), %%xmm0 \n"
+
+#define CallAESIMC(offset) \
+    "movaps "#offset"(%[shed]), %%xmm0 \n"  \
+    "aesimc %%xmm0, %%xmm0 \n" \
+    "movaps %%xmm0, "#offset"(%[shed]) \n" 
+
+#endif

build/CMakeLists.txt

@@ -31,6 +31,7 @@ set (COMMON_SRC
   "${CMAKE_SOURCE_DIR}/tunnel/TunnelGateway.cpp"
   "${CMAKE_SOURCE_DIR}/tunnel/TunnelEndpoint.cpp"
   "${CMAKE_SOURCE_DIR}/tunnel/TunnelPool.cpp"
+  "${CMAKE_SOURCE_DIR}/tunnel/TunnelCrypto.cpp"
   "${CMAKE_SOURCE_DIR}/AddressBook.cpp"	
   "${CMAKE_SOURCE_DIR}/Garlic.cpp"
   "${CMAKE_SOURCE_DIR}/I2NPProtocol.cpp"

crypto/aes.cpp

@@ -1,36 +1,11 @@
 #include <stdlib.h>
-#include "tunnel/TunnelBase.h"
 #include "aes.h"
 
-namespace i2p
+namespace i2p {
-{
+namespace crypto {
-namespace crypto
-{
 
 #ifdef AESNI
-    
+#include "AESNIMacros.h" 
-    #define KeyExpansion256(round0,round1) \
-        "pshufd $0xff, %%xmm2, %%xmm2 \n" \
-        "movaps %%xmm1, %%xmm4 \n" \
-        "pslldq $4, %%xmm4 \n" \
-        "pxor %%xmm4, %%xmm1 \n" \
-        "pslldq $4, %%xmm4 \n" \
-        "pxor %%xmm4, %%xmm1 \n" \
-        "pslldq $4, %%xmm4 \n" \
-        "pxor %%xmm4, %%xmm1 \n" \
-        "pxor %%xmm2, %%xmm1 \n" \
-        "movaps %%xmm1, "#round0"(%[sched]) \n" \
-        "aeskeygenassist $0, %%xmm1, %%xmm4 \n" \
-        "pshufd $0xaa, %%xmm4, %%xmm2 \n" \
-        "movaps %%xmm3, %%xmm4 \n" \
-        "pslldq $4, %%xmm4 \n" \
-        "pxor %%xmm4, %%xmm3 \n" \
-        "pslldq $4, %%xmm4 \n" \
-        "pxor %%xmm4, %%xmm3 \n" \
-        "pslldq $4, %%xmm4 \n" \
-        "pxor %%xmm4, %%xmm3 \n" \
-        "pxor %%xmm2, %%xmm3 \n" \
-        "movaps %%xmm3, "#round1"(%[sched]) \n" 
 
 void ECBCryptoAESNI::ExpandKey (const AESKey& key)
 {
@@ -70,23 +45,6 @@ namespace crypto
     );
 }
 
-    #define EncryptAES256(sched) \
-        "pxor (%["#sched"]), %%xmm0 \n" \
-        "aesenc 16(%["#sched"]), %%xmm0 \n" \
-        "aesenc 32(%["#sched"]), %%xmm0 \n" \
-        "aesenc 48(%["#sched"]), %%xmm0 \n" \
-        "aesenc 64(%["#sched"]), %%xmm0 \n" \
-        "aesenc 80(%["#sched"]), %%xmm0 \n" \
-        "aesenc 96(%["#sched"]), %%xmm0 \n" \
-        "aesenc 112(%["#sched"]), %%xmm0 \n" \
-        "aesenc 128(%["#sched"]), %%xmm0 \n" \
-        "aesenc 144(%["#sched"]), %%xmm0 \n" \
-        "aesenc 160(%["#sched"]), %%xmm0 \n" \
-        "aesenc 176(%["#sched"]), %%xmm0 \n" \
-        "aesenc 192(%["#sched"]), %%xmm0 \n" \
-        "aesenc 208(%["#sched"]), %%xmm0 \n" \
-        "aesenclast 224(%["#sched"]), %%xmm0 \n"
-        
 void ECBEncryptionAESNI::Encrypt (const ChipherBlock * in, ChipherBlock * out)
 {
     __asm__
@@ -98,22 +56,6 @@ namespace crypto
     );
 }       
 
-    #define DecryptAES256(sched) \
-        "pxor 224(%["#sched"]), %%xmm0 \n" \
-        "aesdec 208(%["#sched"]), %%xmm0 \n" \
-        "aesdec 192(%["#sched"]), %%xmm0 \n" \
-        "aesdec 176(%["#sched"]), %%xmm0 \n" \
-        "aesdec 160(%["#sched"]), %%xmm0 \n" \
-        "aesdec 144(%["#sched"]), %%xmm0 \n" \
-        "aesdec 128(%["#sched"]), %%xmm0 \n" \
-        "aesdec 112(%["#sched"]), %%xmm0 \n" \
-        "aesdec 96(%["#sched"]), %%xmm0 \n" \
-        "aesdec 80(%["#sched"]), %%xmm0 \n" \
-        "aesdec 64(%["#sched"]), %%xmm0 \n" \
-        "aesdec 48(%["#sched"]), %%xmm0 \n" \
-        "aesdec 32(%["#sched"]), %%xmm0 \n" \
-        "aesdec 16(%["#sched"]), %%xmm0 \n" \
-        "aesdeclast (%["#sched"]), %%xmm0 \n"
 
 void ECBDecryptionAESNI::Decrypt (const ChipherBlock * in, ChipherBlock * out)
 {
@@ -126,11 +68,6 @@ namespace crypto
     );      
 }
 
-    #define CallAESIMC(offset) \
-        "movaps "#offset"(%[shed]), %%xmm0 \n"  \
-        "aesimc %%xmm0, %%xmm0 \n" \
-        "movaps %%xmm0, "#offset"(%[shed]) \n" 
-
 void ECBDecryptionAESNI::SetKey (const AESKey& key)
 {
     ExpandKey (key); // expand encryption key first
@@ -280,78 +217,6 @@ namespace crypto
 #endif
 }
 
-    void TunnelEncryption::Encrypt (const uint8_t * in, uint8_t * out)
+} // crypto
-    {
+} // i2p
-#ifdef AESNI
-        __asm__
-        (
-            // encrypt IV 
-            "movups (%[in]), %%xmm0 \n"
-            EncryptAES256(sched_iv)
-            "movaps %%xmm0, %%xmm1 \n"
-            // double IV encryption
-            EncryptAES256(sched_iv)
-            "movups %%xmm0, (%[out]) \n"
-            // encrypt data, IV is xmm1
-            "1: \n"
-            "add $16, %[in] \n"
-            "add $16, %[out] \n"
-            "movups (%[in]), %%xmm0 \n"
-            "pxor %%xmm1, %%xmm0 \n"
-            EncryptAES256(sched_l)
-            "movaps %%xmm0, %%xmm1 \n"  
-            "movups %%xmm0, (%[out]) \n"
-            "dec %[num] \n"
-            "jnz 1b \n"     
-            : 
-            : [sched_iv]"r"(m_IVEncryption.GetKeySchedule ()), [sched_l]"r"(m_LayerEncryption.GetKeySchedule ()), 
-              [in]"r"(in), [out]"r"(out), [num]"r"(63) // 63 blocks = 1008 bytes
-            : "%xmm0", "%xmm1", "cc", "memory"
-        );
-#else
-        m_IVEncryption.Encrypt ((const ChipherBlock *)in, (ChipherBlock *)out); // iv
-        m_LayerEncryption.SetIV (out);
-        m_LayerEncryption.Encrypt (in + 16, i2p::tunnel::TUNNEL_DATA_ENCRYPTED_SIZE, out + 16); // data
-        m_IVEncryption.Encrypt ((ChipherBlock *)out, (ChipherBlock *)out); // double iv
-#endif
-    }
-
-    void TunnelDecryption::Decrypt (const uint8_t * in, uint8_t * out)
-    {
-#ifdef AESNI
-        __asm__
-        (
-            // decrypt IV 
-            "movups (%[in]), %%xmm0 \n"
-            DecryptAES256(sched_iv)
-            "movaps %%xmm0, %%xmm1 \n"
-            // double IV encryption
-            DecryptAES256(sched_iv)
-            "movups %%xmm0, (%[out]) \n"
-            // decrypt data, IV is xmm1
-            "1: \n"
-            "add $16, %[in] \n"
-            "add $16, %[out] \n"
-            "movups (%[in]), %%xmm0 \n"
-            "movaps %%xmm0, %%xmm2 \n"
-            DecryptAES256(sched_l)
-            "pxor %%xmm1, %%xmm0 \n"
-            "movups %%xmm0, (%[out]) \n"
-            "movaps %%xmm2, %%xmm1 \n"
-            "dec %[num] \n"
-            "jnz 1b \n"     
-            : 
-            : [sched_iv]"r"(m_IVDecryption.GetKeySchedule ()), [sched_l]"r"(m_LayerDecryption.GetKeySchedule ()), 
-              [in]"r"(in), [out]"r"(out), [num]"r"(63) // 63 blocks = 1008 bytes
-            : "%xmm0", "%xmm1", "%xmm2", "cc", "memory"
-        );
-#else
-        m_IVDecryption.Decrypt ((const ChipherBlock *)in, (ChipherBlock *)out); // iv
-        m_LayerDecryption.SetIV (out);  
-        m_LayerDecryption.Decrypt (in + 16, i2p::tunnel::TUNNEL_DATA_ENCRYPTED_SIZE, out + 16); // data
-        m_IVDecryption.Decrypt ((ChipherBlock *)out, (ChipherBlock *)out); // double iv
-#endif
-    }
-}
-}
 

crypto/aes.h

@@ -181,51 +181,7 @@ namespace crypto
             ECBDecryption m_ECBDecryption;
     };  
 
-    class TunnelEncryption // with double IV encryption
-    {
-        public:
-
-            void SetKeys (const AESKey& layerKey, const AESKey& ivKey)
-            {
-                m_LayerEncryption.SetKey (layerKey);
-                m_IVEncryption.SetKey (ivKey);
-            }   
-
-            void Encrypt (const uint8_t * in, uint8_t * out); // 1024 bytes (16 IV + 1008 data)     
-
-        private:
-
-            ECBEncryption m_IVEncryption;
-#ifdef AESNI
-            ECBEncryption m_LayerEncryption;
-#else
-            CBCEncryption m_LayerEncryption;
-#endif
-    };
-
-    class TunnelDecryption // with double IV encryption
-    {
-        public:
-
-            void SetKeys (const AESKey& layerKey, const AESKey& ivKey)
-            {
-                m_LayerDecryption.SetKey (layerKey);
-                m_IVDecryption.SetKey (ivKey);
-            }           
-
-            void Decrypt (const uint8_t * in, uint8_t * out); // 1024 bytes (16 IV + 1008 data) 
-
-        private:
-
-            ECBDecryption m_IVDecryption;
-#ifdef AESNI
-            ECBDecryption m_LayerDecryption;
-#else
-            CBCDecryption m_LayerDecryption;
-#endif
-    };
 }
 }
 
 #endif
-

filelist.mk

@@ -5,7 +5,7 @@ COMMON_SRC = \
   crypto/CryptoConst.cpp crypto/aes.cpp crypto/Signature.cpp \
   tunnel/Tunnel.cpp tunnel/TransitTunnel.cpp tunnel/TunnelEndpoint.cpp \
   tunnel/TunnelEndpoint.cpp tunnel/TunnelPool.cpp tunnel/TunnelGateway.cpp \
-  Datagram.cpp Garlic.cpp I2NPProtocol.cpp LeaseSet.cpp \
+  tunnel/TunnelCrypto.cpp Datagram.cpp Garlic.cpp I2NPProtocol.cpp LeaseSet.cpp \
   NetDb.cpp NetDbRequests.cpp Profiling.cpp Reseed.cpp \
   RouterContext.cpp RouterInfo.cpp Streaming.cpp Identity.cpp \
   Destination.cpp UPnP.cpp

tunnel/TransitTunnel.h

@@ -5,7 +5,7 @@
 #include <vector>
 #include <mutex>
 #include <memory>
-#include "crypto/aes.h"
+#include "TunnelCrypto.h"
 #include "I2NPProtocol.h"
 #include "TunnelEndpoint.h"
 #include "TunnelGateway.h"

tunnel/TunnelConfig.h

@@ -5,7 +5,7 @@
 #include <sstream>
 #include <vector>
 #include <memory>
-#include "crypto/aes.h"
+#include "TunnelCrypto.h"
 #include "RouterInfo.h"
 #include "RouterContext.h"
 #include "util/Timestamp.h"

tunnel/TunnelCrypto.cpp

@@ -0,0 +1,88 @@
+#include "TunnelCrypto.h"
+#include "TunnelBase.h"
+#include "AESNIMacros.h" 
+
+namespace i2p {
+namespace crypto {
+
+void TunnelEncryption::SetKeys (const AESKey& layerKey, const AESKey& ivKey)
+{
+    m_LayerEncryption.SetKey (layerKey);
+    m_IVEncryption.SetKey (ivKey);
+}
+
+void TunnelEncryption::Encrypt (const uint8_t * in, uint8_t * out)
+{
+#ifdef AESNI
+    __asm__
+    (
+        // encrypt IV 
+        "movups (%[in]), %%xmm0 \n"
+        EncryptAES256(sched_iv)
+        "movaps %%xmm0, %%xmm1 \n"
+        // double IV encryption
+        EncryptAES256(sched_iv)
+        "movups %%xmm0, (%[out]) \n"
+        // encrypt data, IV is xmm1
+        "1: \n"
+        "add $16, %[in] \n"
+        "add $16, %[out] \n"
+        "movups (%[in]), %%xmm0 \n"
+        "pxor %%xmm1, %%xmm0 \n"
+        EncryptAES256(sched_l)
+        "movaps %%xmm0, %%xmm1 \n"  
+        "movups %%xmm0, (%[out]) \n"
+        "dec %[num] \n"
+        "jnz 1b \n"     
+        : 
+        : [sched_iv]"r"(m_IVEncryption.GetKeySchedule ()), [sched_l]"r"(m_LayerEncryption.GetKeySchedule ()), 
+          [in]"r"(in), [out]"r"(out), [num]"r"(63) // 63 blocks = 1008 bytes
+        : "%xmm0", "%xmm1", "cc", "memory"
+    );
+#else
+    m_IVEncryption.Encrypt ((const ChipherBlock *)in, (ChipherBlock *)out); // iv
+    m_LayerEncryption.SetIV (out);
+    m_LayerEncryption.Encrypt (in + 16, i2p::tunnel::TUNNEL_DATA_ENCRYPTED_SIZE, out + 16); // data
+    m_IVEncryption.Encrypt ((ChipherBlock *)out, (ChipherBlock *)out); // double iv
+#endif
+    }
+
+void TunnelDecryption::Decrypt (const uint8_t * in, uint8_t * out)
+{
+#ifdef AESNI
+    __asm__
+    (
+        // decrypt IV 
+        "movups (%[in]), %%xmm0 \n"
+        DecryptAES256(sched_iv)
+        "movaps %%xmm0, %%xmm1 \n"
+        // double IV encryption
+        DecryptAES256(sched_iv)
+        "movups %%xmm0, (%[out]) \n"
+        // decrypt data, IV is xmm1
+        "1: \n"
+        "add $16, %[in] \n"
+        "add $16, %[out] \n"
+        "movups (%[in]), %%xmm0 \n"
+        "movaps %%xmm0, %%xmm2 \n"
+        DecryptAES256(sched_l)
+        "pxor %%xmm1, %%xmm0 \n"
+        "movups %%xmm0, (%[out]) \n"
+        "movaps %%xmm2, %%xmm1 \n"
+        "dec %[num] \n"
+        "jnz 1b \n"     
+        : 
+        : [sched_iv]"r"(m_IVDecryption.GetKeySchedule ()), [sched_l]"r"(m_LayerDecryption.GetKeySchedule ()), 
+          [in]"r"(in), [out]"r"(out), [num]"r"(63) // 63 blocks = 1008 bytes
+        : "%xmm0", "%xmm1", "%xmm2", "cc", "memory"
+    );
+#else
+    m_IVDecryption.Decrypt ((const ChipherBlock *)in, (ChipherBlock *)out); // iv
+    m_LayerDecryption.SetIV (out);  
+    m_LayerDecryption.Decrypt (in + 16, i2p::tunnel::TUNNEL_DATA_ENCRYPTED_SIZE, out + 16); // data
+    m_IVDecryption.Decrypt ((ChipherBlock *)out, (ChipherBlock *)out); // double iv
+#endif
+}
+
+} // crypto
+} // i2p

tunnel/TunnelCrypto.h

@@ -0,0 +1,49 @@
+#ifndef TUNNEL_CRYPTO_H__
+#define TUNNEL_CRYPTO_H__
+
+#include "crypto/aes.h"
+
+namespace i2p {
+namespace crypto {
+
+class TunnelEncryption { // with double IV encryption
+public:
+    void SetKeys (const AESKey& layerKey, const AESKey& ivKey);
+
+    void Encrypt (const uint8_t * in, uint8_t * out); // 1024 bytes (16 IV + 1008 data)     
+
+private:
+
+    ECBEncryption m_IVEncryption;
+#ifdef AESNI
+    ECBEncryption m_LayerEncryption;
+#else
+    CBCEncryption m_LayerEncryption;
+#endif
+};
+
+class TunnelDecryption { // with double IV encryption
+public:
+
+    void SetKeys (const AESKey& layerKey, const AESKey& ivKey)
+    {
+        m_LayerDecryption.SetKey (layerKey);
+        m_IVDecryption.SetKey (ivKey);
+    }           
+
+    void Decrypt (const uint8_t * in, uint8_t * out); // 1024 bytes (16 IV + 1008 data) 
+
+private:
+
+    ECBDecryption m_IVDecryption;
+#ifdef AESNI
+    ECBDecryption m_LayerDecryption;
+#else
+    CBCDecryption m_LayerDecryption;
+#endif
+};
+
+} // crypto
+} // i2p
+
+#endif