Merge pull request #34 from jakcron/feat-33_legacy_ciphers

[FEAT-33] Add Legacy Ciphers (DES + TDES)
jakcron · Nov 3, 2023 · e8003ff · e8003ff
2 parents 0edac5e + 402cfc2
commit e8003ff
Show file tree

Hide file tree

Showing 41 changed files with 5,916 additions and 44 deletions.
diff --git a/build/visualstudio/libtoolchain-test/libtoolchain-test.vcxproj b/build/visualstudio/libtoolchain-test/libtoolchain-test.vcxproj
@@ -162,6 +162,8 @@
     <ClCompile Include="..\..\..\test\crypto_Aes256EcbEncryptor_TestClass.cpp" />
     <ClCompile Include="..\..\..\test\crypto_Aes256Encryptor_TestClass.cpp" />
     <ClCompile Include="..\..\..\test\crypto_Aes256XtsEncryptor_TestClass.cpp" />
+    <ClCompile Include="..\..\..\test\crypto_Des56CbcEncryptor_TestClass.cpp" />
+    <ClCompile Include="..\..\..\test\crypto_Des56EcbEncryptor_TestClass.cpp" />
     <ClCompile Include="..\..\..\test\crypto_HmacMd5Generator_TestClass.cpp" />
     <ClCompile Include="..\..\..\test\crypto_HmacSha1Generator_TestClass.cpp" />
     <ClCompile Include="..\..\..\test\crypto_HmacSha2256Generator_TestClass.cpp" />
@@ -199,6 +201,10 @@
     <ClCompile Include="..\..\..\test\crypto_Sha1Generator_TestClass.cpp" />
     <ClCompile Include="..\..\..\test\crypto_Sha2256Generator_TestClass.cpp" />
     <ClCompile Include="..\..\..\test\crypto_Sha2512Generator_TestClass.cpp" />
+    <ClCompile Include="..\..\..\test\crypto_Tdes112CbcEncryptor_TestClass.cpp" />
+    <ClCompile Include="..\..\..\test\crypto_Tdes112EcbEncryptor_TestClass.cpp" />
+    <ClCompile Include="..\..\..\test\crypto_Tdes168CbcEncryptor_TestClass.cpp" />
+    <ClCompile Include="..\..\..\test\crypto_Tdes168EcbEncryptor_TestClass.cpp" />
     <ClCompile Include="..\..\..\test\Optional_TestClass.cpp" />
     <ClCompile Include="..\..\..\test\PbkdfUtil.cpp" />
     <ClCompile Include="..\..\..\test\RsaOaepUtil.cpp" />
@@ -227,6 +233,8 @@
     <ClCompile Include="..\..\..\test\io_VirtualFileSystem_TestClass.cpp" />
     <ClCompile Include="..\..\..\test\main.cpp" />
     <ClCompile Include="..\..\..\test\string_TranscodeUtil_TestClass.cpp" />
+    <ClCompile Include="..\..\..\test\TdesDesCbcEncryptorUtil.cpp" />
+    <ClCompile Include="..\..\..\test\TdesDesEcbEncryptorUtil.cpp" />
     <ClCompile Include="..\..\..\test\TestException.cpp" />
     <ClCompile Include="..\..\..\test\AesEncryptorUtil.cpp" />
     <ClCompile Include="..\..\..\test\AesEcbEncryptorUtil.cpp" />
@@ -264,6 +272,8 @@
     <ClInclude Include="..\..\..\test\crypto_Aes256EcbEncryptor_TestClass.h" />
     <ClInclude Include="..\..\..\test\crypto_Aes256Encryptor_TestClass.h" />
     <ClInclude Include="..\..\..\test\crypto_Aes256XtsEncryptor_TestClass.h" />
+    <ClInclude Include="..\..\..\test\crypto_Des56CbcEncryptor_TestClass.h" />
+    <ClInclude Include="..\..\..\test\crypto_Des56EcbEncryptor_TestClass.h" />
     <ClInclude Include="..\..\..\test\crypto_HmacMd5Generator_TestClass.h" />
     <ClInclude Include="..\..\..\test\crypto_HmacSha1Generator_TestClass.h" />
     <ClInclude Include="..\..\..\test\crypto_HmacSha2256Generator_TestClass.h" />
@@ -301,6 +311,10 @@
     <ClInclude Include="..\..\..\test\crypto_Sha1Generator_TestClass.h" />
     <ClInclude Include="..\..\..\test\crypto_Sha2256Generator_TestClass.h" />
     <ClInclude Include="..\..\..\test\crypto_Sha2512Generator_TestClass.h" />
+    <ClInclude Include="..\..\..\test\crypto_Tdes112CbcEncryptor_TestClass.h" />
+    <ClInclude Include="..\..\..\test\crypto_Tdes112EcbEncryptor_TestClass.h" />
+    <ClInclude Include="..\..\..\test\crypto_Tdes168CbcEncryptor_TestClass.h" />
+    <ClInclude Include="..\..\..\test\crypto_Tdes168EcbEncryptor_TestClass.h" />
     <ClInclude Include="..\..\..\test\ITestClass.h" />
     <ClInclude Include="..\..\..\test\Optional_TestClass.h" />
     <ClInclude Include="..\..\..\test\PbkdfUtil.h" />
@@ -329,6 +343,8 @@
     <ClInclude Include="..\..\..\test\io_SubStream_TestClass.h" />
     <ClInclude Include="..\..\..\test\io_VirtualFileSystem_TestClass.h" />
     <ClInclude Include="..\..\..\test\string_TranscodeUtil_TestClass.h" />
+    <ClInclude Include="..\..\..\test\TdesDesCbcEncryptorUtil.h" />
+    <ClInclude Include="..\..\..\test\TdesDesEcbEncryptorUtil.h" />
     <ClInclude Include="..\..\..\test\TestException.h" />
     <ClInclude Include="..\..\..\test\AesEncryptorUtil.h" />
     <ClInclude Include="..\..\..\test\AesEcbEncryptorUtil.h" />

diff --git a/build/visualstudio/libtoolchain-test/libtoolchain-test.vcxproj.filters b/build/visualstudio/libtoolchain-test/libtoolchain-test.vcxproj.filters
@@ -126,6 +126,12 @@
     <ClCompile Include="..\..\..\test\crypto_Aes256XtsEncryptor_TestClass.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\test\crypto_Des56CbcEncryptor_TestClass.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\test\crypto_Des56EcbEncryptor_TestClass.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\test\crypto_HmacMd5Generator_TestClass.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -237,6 +243,18 @@
     <ClCompile Include="..\..\..\test\crypto_Sha2512Generator_TestClass.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\test\crypto_Tdes112CbcEncryptor_TestClass.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\test\crypto_Tdes112EcbEncryptor_TestClass.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\test\crypto_Tdes168CbcEncryptor_TestClass.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\test\crypto_Tdes168EcbEncryptor_TestClass.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\test\PbkdfUtil.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -294,6 +312,12 @@
     <ClCompile Include="..\..\..\test\io_EmptyStream_TestClass.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\test\TdesDesCbcEncryptorUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\test\TdesDesEcbEncryptorUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\test\TestException.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -428,6 +452,12 @@
     <ClInclude Include="..\..\..\test\crypto_Aes256XtsEncryptor_TestClass.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\test\crypto_Des56CbcEncryptor_TestClass.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\test\crypto_Des56EcbEncryptor_TestClass.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\test\crypto_HmacMd5Generator_TestClass.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -539,6 +569,18 @@
     <ClInclude Include="..\..\..\test\crypto_Sha2512Generator_TestClass.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\test\crypto_Tdes112CbcEncryptor_TestClass.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\test\crypto_Tdes112EcbEncryptor_TestClass.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\test\crypto_Tdes168CbcEncryptor_TestClass.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\test\crypto_Tdes168EcbEncryptor_TestClass.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\test\PbkdfUtil.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -596,6 +638,12 @@
     <ClInclude Include="..\..\..\test\io_EmptyStream_TestClass.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\test\TdesDesCbcEncryptorUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\test\TdesDesEcbEncryptorUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\test\TestException.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/build/visualstudio/libtoolchain/libtoolchain.vcxproj b/build/visualstudio/libtoolchain/libtoolchain.vcxproj
@@ -166,9 +166,13 @@
     <ClInclude Include="..\..\..\include\tc\crypto\Aes256EcbEncryptor.h" />
     <ClInclude Include="..\..\..\include\tc\crypto\Aes256XtsEncryptor.h" />
     <ClInclude Include="..\..\..\include\tc\crypto\AesEncryptor.h" />
+    <ClInclude Include="..\..\..\include\tc\crypto\Des56CbcEncryptor.h" />
+    <ClInclude Include="..\..\..\include\tc\crypto\Des56EcbEncryptor.h" />
+    <ClInclude Include="..\..\..\include\tc\crypto\DesEncryptor.h" />
     <ClInclude Include="..\..\..\include\tc\crypto\CbcEncryptor.h" />
     <ClInclude Include="..\..\..\include\tc\crypto\CryptoException.h" />
     <ClInclude Include="..\..\..\include\tc\crypto\CtrEncryptor.h" />
+    <ClInclude Include="..\..\..\include\tc\crypto\DesEncryptor.h" />
     <ClInclude Include="..\..\..\include\tc\crypto\EcbEncryptor.h" />
     <ClInclude Include="..\..\..\include\tc\crypto\HmacGenerator.h" />
     <ClInclude Include="..\..\..\include\tc\crypto\HmacMd5Generator.h" />
@@ -200,11 +204,17 @@
     <ClInclude Include="..\..\..\include\tc\crypto\Sha1Generator.h" />
     <ClInclude Include="..\..\..\include\tc\crypto\Sha2256Generator.h" />
     <ClInclude Include="..\..\..\include\tc\crypto\Sha2512Generator.h" />
+    <ClInclude Include="..\..\..\include\tc\crypto\Tdes112CbcEncryptor.h" />
+    <ClInclude Include="..\..\..\include\tc\crypto\Tdes112EcbEncryptor.h" />
+    <ClInclude Include="..\..\..\include\tc\crypto\Tdes168CbcEncryptor.h" />
+    <ClInclude Include="..\..\..\include\tc\crypto\Tdes168EcbEncryptor.h" />
+    <ClInclude Include="..\..\..\include\tc\crypto\TdesEncryptor.h" />
     <ClInclude Include="..\..\..\include\tc\crypto\XtsEncryptor.h" />
     <ClInclude Include="..\..\..\include\tc\crypto\detail\AesImpl.h" />
     <ClInclude Include="..\..\..\include\tc\crypto\detail\BlockUtilImpl.h" />
     <ClInclude Include="..\..\..\include\tc\crypto\detail\CbcModeImpl.h" />
     <ClInclude Include="..\..\..\include\tc\crypto\detail\CtrModeImpl.h" />
+    <ClInclude Include="..\..\..\include\tc\crypto\detail\DesImpl.h" />
     <ClInclude Include="..\..\..\include\tc\crypto\detail\EcbModeImpl.h" />
     <ClInclude Include="..\..\..\include\tc\crypto\detail\HmacImpl.h" />
     <ClInclude Include="..\..\..\include\tc\crypto\detail\Md5Impl.h" />
@@ -218,6 +228,7 @@
     <ClInclude Include="..\..\..\include\tc\crypto\detail\RsaPssPadding.h" />
     <ClInclude Include="..\..\..\include\tc\crypto\detail\Sha1Impl.h" />
     <ClInclude Include="..\..\..\include\tc\crypto\detail\Sha2Impl.h" />
+    <ClInclude Include="..\..\..\include\tc\crypto\detail\TdesImpl.h" />
     <ClInclude Include="..\..\..\include\tc\crypto\detail\XtsModeImpl.h" />
     <ClInclude Include="..\..\..\include\tc\crypto.h" />
     <ClInclude Include="..\..\..\include\tc\io\BasicPathResolver.h" />
@@ -285,6 +296,8 @@
     <ClCompile Include="..\..\..\src\crypto\Aes256CtrEncryptor.cpp" />
     <ClCompile Include="..\..\..\src\crypto\Aes256EcbEncryptor.cpp" />
     <ClCompile Include="..\..\..\src\crypto\Aes256XtsEncryptor.cpp" />
+    <ClCompile Include="..\..\..\src\crypto\Des56CbcEncryptor.cpp" />
+    <ClCompile Include="..\..\..\src\crypto\Des56EcbEncryptor.cpp" />
     <ClCompile Include="..\..\..\src\crypto\HmacMd5Generator.cpp" />
     <ClCompile Include="..\..\..\src\crypto\HmacSha1Generator.cpp" />
     <ClCompile Include="..\..\..\src\crypto\HmacSha2256Generator.cpp" />
@@ -309,13 +322,19 @@
     <ClCompile Include="..\..\..\src\crypto\Sha1Generator.cpp" />
     <ClCompile Include="..\..\..\src\crypto\Sha2256Generator.cpp" />
     <ClCompile Include="..\..\..\src\crypto\Sha2512Generator.cpp" />
+    <ClCompile Include="..\..\..\src\crypto\Tdes112CbcEncryptor.cpp" />
+    <ClCompile Include="..\..\..\src\crypto\Tdes112EcbEncryptor.cpp" />
+    <ClCompile Include="..\..\..\src\crypto\Tdes168CbcEncryptor.cpp" />
+    <ClCompile Include="..\..\..\src\crypto\Tdes168EcbEncryptor.cpp" />
     <ClCompile Include="..\..\..\src\crypto\detail\AesImpl.cpp" />
+    <ClCompile Include="..\..\..\src\crypto\detail\DesImpl.cpp" />
     <ClCompile Include="..\..\..\src\crypto\detail\Md5Impl.cpp" />
     <ClCompile Include="..\..\..\src\crypto\detail\PrbgImpl.cpp" />
     <ClCompile Include="..\..\..\src\crypto\detail\RsaImpl.cpp" />
     <ClCompile Include="..\..\..\src\crypto\detail\RsaKeyGeneratorImpl.cpp" />
     <ClCompile Include="..\..\..\src\crypto\detail\Sha1Impl.cpp" />
     <ClCompile Include="..\..\..\src\crypto\detail\Sha2Impl.cpp" />
+    <ClCompile Include="..\..\..\src\crypto\detail\TdesImpl.cpp" />
     <ClCompile Include="..\..\..\src\io\BasicPathResolver.cpp" />
     <ClCompile Include="..\..\..\src\io\ConcatenatedStream.cpp" />
     <ClCompile Include="..\..\..\src\io\EmptyStream.cpp" />

diff --git a/build/visualstudio/libtoolchain/libtoolchain.vcxproj.filters b/build/visualstudio/libtoolchain/libtoolchain.vcxproj.filters
@@ -58,6 +58,12 @@
     <ClCompile Include="..\..\..\src\crypto\Aes256XtsEncryptor.cpp">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\crypto\Des56CbcEncryptor.cpp">
+      <Filter>Source Files\crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\crypto\Des56EcbEncryptor.cpp">
+      <Filter>Source Files\crypto</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\src\crypto\HmacMd5Generator.cpp">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
@@ -130,9 +136,24 @@
     <ClCompile Include="..\..\..\src\crypto\Sha2512Generator.cpp">
       <Filter>Source Files\crypto</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\crypto\Tdes112CbcEncryptor.cpp">
+      <Filter>Source Files\crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\crypto\Tdes112EcbEncryptor.cpp">
+      <Filter>Source Files\crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\crypto\Tdes168CbcEncryptor.cpp">
+      <Filter>Source Files\crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\crypto\Tdes168EcbEncryptor.cpp">
+      <Filter>Source Files\crypto</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\src\crypto\detail\AesImpl.cpp">
       <Filter>Source Files\crypto\detail</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\crypto\detail\DesImpl.cpp">
+      <Filter>Source Files\crypto\detail</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\src\crypto\detail\Md5Impl.cpp">
       <Filter>Source Files\crypto\detail</Filter>
     </ClCompile>
@@ -151,6 +172,9 @@
     <ClCompile Include="..\..\..\src\crypto\detail\Sha2Impl.cpp">
       <Filter>Source Files\crypto\detail</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\crypto\detail\TdesImpl.cpp">
+      <Filter>Source Files\crypto\detail</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\src\io\BasicPathResolver.cpp">
       <Filter>Source Files\io</Filter>
     </ClCompile>
@@ -360,6 +384,15 @@
     <ClInclude Include="..\..\..\include\tc\crypto\AesEncryptor.h">
       <Filter>Header Files\tc\crypto</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\include\tc\crypto\Des56CbcEncryptor.h">
+      <Filter>Header Files\tc\crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\tc\crypto\Des56EcbEncryptor.h">
+      <Filter>Header Files\tc\crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\tc\crypto\DesEncryptor.h">
+      <Filter>Header Files\tc\crypto</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\include\tc\crypto\CbcEncryptor.h">
       <Filter>Header Files\tc\crypto</Filter>
     </ClInclude>
@@ -462,12 +495,30 @@
     <ClInclude Include="..\..\..\include\tc\crypto\Sha2512Generator.h">
       <Filter>Header Files\tc\crypto</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\include\tc\crypto\Tdes112CbcEncryptor.h">
+      <Filter>Header Files\tc\crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\tc\crypto\Tdes112EcbEncryptor.h">
+      <Filter>Header Files\tc\crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\tc\crypto\Tdes168CbcEncryptor.h">
+      <Filter>Header Files\tc\crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\tc\crypto\Tdes168EcbEncryptor.h">
+      <Filter>Header Files\tc\crypto</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\include\tc\crypto\TdesEncryptor.h">
+      <Filter>Header Files\tc\crypto</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\include\tc\crypto\XtsEncryptor.h">
       <Filter>Header Files\tc\crypto</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\include\tc\crypto\detail\AesImpl.h">
       <Filter>Header Files\tc\crypto\detail</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\include\tc\crypto\detail\DesImpl.h">
+      <Filter>Header Files\tc\crypto\detail</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\include\tc\crypto\detail\BlockUtilImpl.h">
       <Filter>Header Files\tc\crypto\detail</Filter>
     </ClInclude>
@@ -516,6 +567,9 @@
     <ClInclude Include="..\..\..\include\tc\crypto\detail\Sha2Impl.h">
       <Filter>Header Files\tc\crypto\detail</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\include\tc\crypto\detail\TdesImpl.h">
+      <Filter>Header Files\tc\crypto\detail</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\include\tc\crypto\detail\XtsModeImpl.h">
       <Filter>Header Files\tc\crypto\detail</Filter>
     </ClInclude>

diff --git a/include/tc/crypto.h b/include/tc/crypto.h
@@ -13,35 +13,56 @@
 // Exceptions
 #include <tc/crypto/CryptoException.h>
 
-// AES Encryption & Modes
+// Encryption Modes
+#include <tc/crypto/EcbEncryptor.h>
+#include <tc/crypto/CtrEncryptor.h>
+#include <tc/crypto/CbcEncryptor.h>
+#include <tc/crypto/CcmEncryptor.h>
+#include <tc/crypto/XtsEncryptor.h>
+
+// AES Encryption
 #include <tc/crypto/AesEncryptor.h>
 
-#include <tc/crypto/EcbEncryptor.h>
+//  AES ECB Encryption
 #include <tc/crypto/Aes128EcbEncryptor.h>
 #include <tc/crypto/Aes192EcbEncryptor.h>
 #include <tc/crypto/Aes256EcbEncryptor.h>
 
-#include <tc/crypto/CtrEncryptor.h>
+//  AES-CTR Encryption
 #include <tc/crypto/Aes128CtrEncryptor.h>
 #include <tc/crypto/Aes192CtrEncryptor.h>
 #include <tc/crypto/Aes256CtrEncryptor.h>
 
-#include <tc/crypto/CbcEncryptor.h>
+//  AES-CBC Encryption
 #include <tc/crypto/Aes128CbcEncryptor.h>
 #include <tc/crypto/Aes192CbcEncryptor.h>
 #include <tc/crypto/Aes256CbcEncryptor.h>
 
-#include <tc/crypto/CcmEncryptor.h>
+//  AES-CCM Encryption
 #include <tc/crypto/Aes128CcmEncryptor.h>
 
-#include <tc/crypto/XtsEncryptor.h>
+//  AES-XTS Encryption
 #include <tc/crypto/Aes128XtsEncryptor.h>
 #include <tc/crypto/Aes256XtsEncryptor.h>
 
 // AES Encryption Streams
 #include <tc/crypto/Aes128CtrEncryptedStream.h>
 #include <tc/crypto/Aes128CbcEncryptedStream.h>
 
+// DES/TDES Encryption
+#include <tc/crypto/DesEncryptor.h>
+#include <tc/crypto/TdesEncryptor.h>
+
+//  DES/TDES ECB Encryption
+#include <tc/crypto/Des56EcbEncryptor.h>
+#include <tc/crypto/Tdes112EcbEncryptor.h>
+#include <tc/crypto/Tdes168EcbEncryptor.h>
+
+//  DES/TDES CBC Encryption
+#include <tc/crypto/Des56CbcEncryptor.h>
+#include <tc/crypto/Tdes112CbcEncryptor.h>
+#include <tc/crypto/Tdes168CbcEncryptor.h>
+
 // Hash Calculator
 #include <tc/crypto/Md5Generator.h>
 #include <tc/crypto/Sha1Generator.h>