wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-29 18:27:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix for use with idea enabled

Browse Source
This commit is contained in:
Jacob Barthelmeh
2021-09-29 11:15:51 -06:00
parent ae47cb3bcd
commit dd7b62d067
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/api.c
View File

@ -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;

31
wolfssl/ssl.h
View File

@ -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
};