Merge pull request #163 from cconlon/cipherAesCts

JNI/JCE: add AesCts to JNI and Cipher.AES/CTS/NoPadding to wolfJCE

Author: rlm2002

IDE/Android/app/src/main/cpp/CMakeLists.txt

@@ -257,6 +257,7 @@ list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/ssl_load.c)
 list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/ssl_misc.c)
 list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/ssl_p7p12.c)
 list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/ssl_sess.c)
+list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/ssl_sk.c)
 list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/x509.c)
 list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/x509_str.c)
 
@@ -336,7 +337,14 @@ add_library(wolfssl SHARED
 # wolfCrypt JNI Java files are tied into build in Module build.gradle file
 add_library(wolfcryptjni SHARED
         ${wolfcryptjni_DIR}/jni/jni_aes.c
+        ${wolfcryptjni_DIR}/jni/jni_aesccm.c
+        ${wolfcryptjni_DIR}/jni/jni_aescmac.c
+        ${wolfcryptjni_DIR}/jni/jni_aesctr.c
+        ${wolfcryptjni_DIR}/jni/jni_aescts.c
+        ${wolfcryptjni_DIR}/jni/jni_aesecb.c
         ${wolfcryptjni_DIR}/jni/jni_aesgcm.c
+        ${wolfcryptjni_DIR}/jni/jni_aesgmac.c
+        ${wolfcryptjni_DIR}/jni/jni_aesofb.c
         ${wolfcryptjni_DIR}/jni/jni_asn.c
         ${wolfcryptjni_DIR}/jni/jni_chacha.c
         ${wolfcryptjni_DIR}/jni/jni_curve25519.c

IDE/WIN/wolfcryptjni.vcxproj

@@ -36,7 +36,14 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\jni\include\com_wolfssl_wolfcrypt_Aes.h" />
+    <ClInclude Include="..\..\jni\include\com_wolfssl_wolfcrypt_AesCcm.h" />
+    <ClInclude Include="..\..\jni\include\com_wolfssl_wolfcrypt_AesCmac.h" />
+    <ClInclude Include="..\..\jni\include\com_wolfssl_wolfcrypt_AesCtr.h" />
+    <ClInclude Include="..\..\jni\include\com_wolfssl_wolfcrypt_AesCts.h" />
+    <ClInclude Include="..\..\jni\include\com_wolfssl_wolfcrypt_AesEcb.h" />
+    <ClInclude Include="..\..\jni\include\com_wolfssl_wolfcrypt_AesGcm.h" />
     <ClInclude Include="..\..\jni\include\com_wolfssl_wolfcrypt_AesGmac.h" />
+    <ClInclude Include="..\..\jni\include\com_wolfssl_wolfcrypt_AesOfb.h" />
     <ClInclude Include="..\..\jni\include\com_wolfssl_wolfcrypt_Asn.h" />
     <ClInclude Include="..\..\jni\include\com_wolfssl_wolfcrypt_Chacha.h" />
     <ClInclude Include="..\..\jni\include\com_wolfssl_wolfcrypt_Curve25519.h" />
@@ -67,8 +74,14 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\jni\jni_aes.c" />
+    <ClCompile Include="..\..\jni\jni_aesccm.c" />
+    <ClCompile Include="..\..\jni\jni_aescmac.c" />
+    <ClCompile Include="..\..\jni\jni_aesctr.c" />
+    <ClCompile Include="..\..\jni\jni_aescts.c" />
+    <ClCompile Include="..\..\jni\jni_aesecb.c" />
     <ClCompile Include="..\..\jni\jni_aesgcm.c" />
     <ClCompile Include="..\..\jni\jni_aesgmac.c" />
+    <ClCompile Include="..\..\jni\jni_aesofb.c" />
     <ClCompile Include="..\..\jni\jni_asn.c" />
     <ClCompile Include="..\..\jni\jni_chacha.c" />
     <ClCompile Include="..\..\jni\jni_curve25519.c" />
@@ -462,4 +475,4 @@ ant build-jce-release</Command>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

IDE/WIN/wolfcryptjni.vcxproj.filters

@@ -18,6 +18,27 @@
     <ClInclude Include="..\..\jni\include\com_wolfssl_wolfcrypt_Aes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\jni\include\com_wolfssl_wolfcrypt_AesCcm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\jni\include\com_wolfssl_wolfcrypt_AesCmac.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\jni\include\com_wolfssl_wolfcrypt_AesCtr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\jni\include\com_wolfssl_wolfcrypt_AesEcb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\jni\include\com_wolfssl_wolfcrypt_AesGcm.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\jni\include\com_wolfssl_wolfcrypt_AesGmac.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\jni\include\com_wolfssl_wolfcrypt_AesOfb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\jni\include\com_wolfssl_wolfcrypt_Asn.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -104,6 +125,30 @@
     <ClCompile Include="..\..\jni\jni_aes.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\jni\jni_aesccm.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jni\jni_aescmac.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jni\jni_aesctr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jni\jni_aescts.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jni\jni_aesecb.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jni\jni_aesgcm.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jni\jni_aesgmac.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jni\jni_aesofb.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\jni\jni_asn.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -174,4 +219,4 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-</Project>
+</Project>

README_JCE.md

@@ -104,6 +104,7 @@ The JCE provider currently supports the following algorithms:
     Cipher Class
         AES/CBC/NoPadding
         AES/CBC/PKCS5Padding
+        AES/CTS/NoPadding
         AES/CCM/NoPadding
         AES/CTR/NoPadding
         AES/ECB/NoPadding