wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 12:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup to move the secret length to ssl.h so its accessible for the compatability layer as well.

Browse Source
This commit is contained in:
David Garske
2017-10-17 09:56:34 -07:00
parent aab1e060a0
commit b82a529ec2
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wolfssl/internal.h
View File

@@ -960,7 +960,8 @@ enum Misc {
ZLIB_COMPRESSION = 221, /* wolfSSL zlib compression */ ZLIB_COMPRESSION = 221, /* wolfSSL zlib compression */
HELLO_EXT_SIG_ALGO = 13, /* ID for the sig_algo hello extension */ HELLO_EXT_SIG_ALGO = 13, /* ID for the sig_algo hello extension */
HELLO_EXT_EXTMS = 0x0017, /* ID for the extended master secret ext */ HELLO_EXT_EXTMS = 0x0017, /* ID for the extended master secret ext */
SECRET_LEN = 48, /* pre RSA and all master */ SECRET_LEN = WOLFSSL_MAX_MASTER_KEY_LENGTH,
/* pre RSA and all master */
#if defined(WOLFSSL_MYSQL_COMPATIBLE) #if defined(WOLFSSL_MYSQL_COMPATIBLE)
ENCRYPT_LEN = 1024, /* allow larger static buffer with mysql */ ENCRYPT_LEN = 1024, /* allow larger static buffer with mysql */
#else #else

2
wolfssl/openssl/ssl.h
View File

@@ -629,7 +629,7 @@ typedef WOLFSSL_X509_NAME_ENTRY X509_NAME_ENTRY;
#define ASN1_STRFLGS_ESC_MSB 4 #define ASN1_STRFLGS_ESC_MSB 4
#define X509_V_ERR_CERT_REJECTED 28 #define X509_V_ERR_CERT_REJECTED 28
#define SSL_MAX_MASTER_KEY_LENGTH 48 /* SECRET_LEN from internal.h */ #define SSL_MAX_MASTER_KEY_LENGTH WOLFSSL_MAX_MASTER_KEY_LENGTH
#define SSL_alert_desc_string_long wolfSSL_alert_desc_string_long #define SSL_alert_desc_string_long wolfSSL_alert_desc_string_long
#define SSL_alert_type_string_long wolfSSL_alert_type_string_long #define SSL_alert_type_string_long wolfSSL_alert_type_string_long

2
wolfssl/ssl.h
View File

@@ -299,6 +299,8 @@ enum AlertLevel {
alert_fatal = 2 alert_fatal = 2
}; };
/* Maximum master key length (SECRET_LEN) */
#define WOLFSSL_MAX_MASTER_KEY_LENGTH 48
typedef WOLFSSL_METHOD* (*wolfSSL_method_func)(void* heap); typedef WOLFSSL_METHOD* (*wolfSSL_method_func)(void* heap);
WOLFSSL_API WOLFSSL_METHOD *wolfSSLv3_server_method_ex(void* heap); WOLFSSL_API WOLFSSL_METHOD *wolfSSLv3_server_method_ex(void* heap);