From dd7b62d0672a169d2fa8970e991250c9dd4d5c12 Mon Sep 17 00:00:00 2001
From: Jacob Barthelmeh <jacob@wolfssl.com>
Date: Wed, 29 Sep 2021 11:15:51 -0600
Subject: [PATCH] fix for use with idea enabled

---
 tests/api.c   |  6 ++----
 wolfssl/ssl.h | 31 ++++++++++++++++---------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/tests/api.c b/tests/api.c
index 210532acd..2bc9a5d16 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -5650,8 +5650,7 @@ static void test_wolfSSL_dtls_export(void)
 }
 
 
-#if defined(WOLFSSL_SESSION_EXPORT) && !defined(HAVE_IDEA) &&\
-    !defined(WOLFSSL_NO_TLS12)
+#if defined(WOLFSSL_SESSION_EXPORT) && !defined(WOLFSSL_NO_TLS12)
 static const byte canned_client_session[] = {
     0xA7, 0xA4, 0x01, 0x40, 0x00, 0x41, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x00,
@@ -5869,8 +5868,7 @@ done:
 
 static void test_wolfSSL_tls_export(void)
 {
-#if defined(WOLFSSL_SESSION_EXPORT) && !defined(HAVE_IDEA) &&\
-    !defined(WOLFSSL_NO_TLS12)
+#if defined(WOLFSSL_SESSION_EXPORT) && !defined(WOLFSSL_NO_TLS12)
     SOCKET_T sockfd = 0;
     WOLFSSL_CTX*     ctx     = 0;
     WOLFSSL*         ssl     = 0;
diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h
index 7b3f0b7d5..5b22cc632 100644
--- a/wolfssl/ssl.h
+++ b/wolfssl/ssl.h
@@ -2927,24 +2927,25 @@ enum {
     WOLFSSL_TLS_HMAC_INNER_SZ = 13      /* SEQ_SZ + ENUM + VERSION_SZ + LEN_SZ */
 };
 
-/* for GetBulkCipher and internal use */
+/* for GetBulkCipher and internal use
+ * using explicit values to assist with serialization of a TLS session */
 enum BulkCipherAlgorithm {
-    wolfssl_cipher_null,
-    wolfssl_rc4,
-    wolfssl_rc2,
-    wolfssl_des,
-    wolfssl_triple_des,             /* leading 3 (3des) not valid identifier */
-    wolfssl_des40,
+    wolfssl_cipher_null = 0,
+    wolfssl_rc4         = 1,
+    wolfssl_rc2         = 2,
+    wolfssl_des         = 3,
+    wolfssl_triple_des  = 4,
+    wolfssl_des40       = 5,
+    wolfssl_aes         = 6,
+    wolfssl_aes_gcm     = 7,
+    wolfssl_aes_ccm     = 8,
+    wolfssl_chacha      = 9,
+    wolfssl_camellia    = 10,
+    wolfssl_hc128       = 11,
+    wolfssl_rabbit      = 12,
 #ifdef HAVE_IDEA
-    wolfssl_idea,
+    wolfssl_idea        = 13
 #endif
-    wolfssl_aes,
-    wolfssl_aes_gcm,
-    wolfssl_aes_ccm,
-    wolfssl_chacha,
-    wolfssl_camellia,
-    wolfssl_hc128,                  /* wolfSSL extensions */
-    wolfssl_rabbit
 };