From 80603f3c05bc9b2c52ecb85a0bd9ab94ef86653f Mon Sep 17 00:00:00 2001
From: Chris Conlon <chris@wolfssl.com>
Date: Thu, 10 Feb 2022 10:29:07 -0700
Subject: [PATCH] remove IDEA support, matching wolfSSL deprecation

---
 IDE/Android/app/src/main/cpp/CMakeLists.txt |  1 -
 native/com_wolfssl_WolfSSL.c                | 13 -------------
 native/com_wolfssl_WolfSSL.h                |  8 --------
 platform/android_aosp/wolfssl/Android.mk    |  1 -
 src/java/com/wolfssl/WolfSSL.java           |  4 ----
 5 files changed, 27 deletions(-)

diff --git a/IDE/Android/app/src/main/cpp/CMakeLists.txt b/IDE/Android/app/src/main/cpp/CMakeLists.txt
index 13d8a54..674c411 100644
--- a/IDE/Android/app/src/main/cpp/CMakeLists.txt
+++ b/IDE/Android/app/src/main/cpp/CMakeLists.txt
@@ -65,7 +65,6 @@ add_library(wolfssl SHARED
         ${wolfssl_DIR}/wolfcrypt/src/ge_operations.c
         ${wolfssl_DIR}/wolfcrypt/src/hash.c
         ${wolfssl_DIR}/wolfcrypt/src/hmac.c
-        ${wolfssl_DIR}/wolfcrypt/src/idea.c
         ${wolfssl_DIR}/wolfcrypt/src/integer.c
         ${wolfssl_DIR}/wolfcrypt/src/kdf.c
         ${wolfssl_DIR}/wolfcrypt/src/logging.c
diff --git a/native/com_wolfssl_WolfSSL.c b/native/com_wolfssl_WolfSSL.c
index 754e819..120f2e2 100644
--- a/native/com_wolfssl_WolfSSL.c
+++ b/native/com_wolfssl_WolfSSL.c
@@ -238,19 +238,6 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getBulkCipherAlgorithmEnumDES40
     return wolfssl_des40;
 }
 
-JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getBulkCipherAlgorithmEnumIDEA
-  (JNIEnv* jenv, jclass jcl)
-{
-    (void)jenv;
-    (void)jcl;
-
-#ifdef HAVE_IDEA
-    return wolfssl_idea;
-#else
-    return NOT_COMPILED_IN;
-#endif
-}
-
 JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getBulkCipherAlgorithmEnumAES
   (JNIEnv* jenv, jclass jcl)
 {
diff --git a/native/com_wolfssl_WolfSSL.h b/native/com_wolfssl_WolfSSL.h
index b06421f..ec198b4 100644
--- a/native/com_wolfssl_WolfSSL.h
+++ b/native/com_wolfssl_WolfSSL.h
@@ -253,14 +253,6 @@ JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getBulkCipherAlgorithmEnum3DES
 JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getBulkCipherAlgorithmEnumDES40
   (JNIEnv *, jclass);
 
-/*
- * Class:     com_wolfssl_WolfSSL
- * Method:    getBulkCipherAlgorithmEnumIDEA
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_wolfssl_WolfSSL_getBulkCipherAlgorithmEnumIDEA
-  (JNIEnv *, jclass);
-
 /*
  * Class:     com_wolfssl_WolfSSL
  * Method:    getBulkCipherAlgorithmEnumAES
diff --git a/platform/android_aosp/wolfssl/Android.mk b/platform/android_aosp/wolfssl/Android.mk
index a188258..164ed86 100644
--- a/platform/android_aosp/wolfssl/Android.mk
+++ b/platform/android_aosp/wolfssl/Android.mk
@@ -49,7 +49,6 @@ LOCAL_SRC_FILES+= \
 	./wolfcrypt/src/ge_operations.c \
 	./wolfcrypt/src/hash.c \
 	./wolfcrypt/src/hmac.c \
-	./wolfcrypt/src/idea.c \
 	./wolfcrypt/src/integer.c \
 	./wolfcrypt/src/kdf.c \
 	./wolfcrypt/src/logging.c \
diff --git a/src/java/com/wolfssl/WolfSSL.java b/src/java/com/wolfssl/WolfSSL.java
index b3540c9..4771770 100644
--- a/src/java/com/wolfssl/WolfSSL.java
+++ b/src/java/com/wolfssl/WolfSSL.java
@@ -224,8 +224,6 @@ public class WolfSSL {
     public static int wolfssl_triple_des;
     /** Bulk cipher algorithm enum: DES40 */
     public static int wolfssl_des40;
-    /** Bulk cipher algorithm enum: IDEA */
-    public static int wolfssl_idea;
     /** Bulk cipher algorithm enum: AES */
     public static int wolfssl_aes;
     /** Bulk cipher algorithm enum: AES-GCM */
@@ -369,7 +367,6 @@ public class WolfSSL {
         wolfssl_des         = getBulkCipherAlgorithmEnumDES();
         wolfssl_triple_des  = getBulkCipherAlgorithmEnumDES();
         wolfssl_des40       = getBulkCipherAlgorithmEnumDES40();
-        wolfssl_idea        = getBulkCipherAlgorithmEnumIDEA();
         wolfssl_aes_gcm     = getBulkCipherAlgorithmEnumAESGCM();
         wolfssl_aes_ccm     = getBulkCipherAlgorithmEnumAESCCM();
         wolfssl_rabbit      = getBulkCipherAlgorithmEnumRABBIT();
@@ -393,7 +390,6 @@ public class WolfSSL {
     static native int getBulkCipherAlgorithmEnumDES();
     static native int getBulkCipherAlgorithmEnum3DES();
     static native int getBulkCipherAlgorithmEnumDES40();
-    static native int getBulkCipherAlgorithmEnumIDEA();
     static native int getBulkCipherAlgorithmEnumAES();
     static native int getBulkCipherAlgorithmEnumAESGCM();
     static native int getBulkCipherAlgorithmEnumAESCCM();