espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-08-06 15:15:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

NEW VERSION: 1.4.0

Browse Source 
1. update boot.bin to v1.5;
2. phy version to 762;
3. add wifi_station_set/get_hostname api;
4. optimize net80211;
5. optimize ssl;
6. optimize ota;
7. optimize dhcp client;
8. update smartconfig to version 2.5.3;
9. support gpio wakeup;
10.enable IGMP in lwip;
11.some modify due to phy update;
12.add espconn_init in espconn.h;
13.update cjson/freertos/ssl;
14.add lwip/nopoll source code;
15.add libairkiss.a/airkiss.h, update smart_config;
16.update esp_init_data_default.bin;
17.irom0 too large, start addr change to 0x20000;
18.some modifications for system stability;
19.many other optimization;
This commit is contained in:
Espressif Systems
2016-02-26 20:40:06 +08:00
committed by Wu Jian Gang
parent 50459308c1
commit dba89f9aba
166 changed files with 70205 additions and 1766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/ssl/ssl_config.h
View File

@ -47,7 +47,7 @@
#define CONFIG_SSL_EXPIRY_TIME 24
#define CONFIG_X509_MAX_CA_CERTS 3
#define CONFIG_SSL_MAX_CERTS 3
#undef CONFIG_SSL_CTX_MUTEXING
#define CONFIG_SSL_CTX_MUTEXING 1
#define CONFIG_USE_DEV_URANDOM 1
#undef CONFIG_WIN32_USE_CRYPTO_LIB
#undef CONFIG_OPENSSL_COMPATIBLE
@ -59,6 +59,23 @@
/*add by LiuH for debug at 2015.06.11*/
#define CONFIG_SSL_DISPLAY_MODE 0
/* Mutexing definitions */
#if defined(CONFIG_SSL_CTX_MUTEXING)
#include "lwip/sys.h"
#include "arch/sys_arch.h"
#define SSL_CTX_MUTEX_TYPE sys_mutex_t
#define SSL_CTX_MUTEX_INIT(A) sys_mutex_new(&A)
#define SSL_CTX_MUTEX_DESTROY(A) sys_mutex_free(&A)
#define SSL_CTX_LOCK(A) sys_mutex_lock(&A)
#define SSL_CTX_UNLOCK(A) sys_mutex_unlock(&A)
#else /* no mutexing */
#define SSL_CTX_MUTEX_INIT(A)
#define SSL_CTX_MUTEX_DESTROY(A)
#define SSL_CTX_LOCK(A)
#define SSL_CTX_UNLOCK(A)
#endif
/*
* Axhttpd Configuration
*/

53
include/ssl/ssl_os_port.h
View File

@ -88,13 +88,56 @@ static __inline__ uint64 be64toh(uint64 __x) {return (((uint64)be32toh(__x & (ui
#define htobe64(x) be64toh(x)
#endif
/* Mutexing definitions */
#if 1
#define SSL_MALLOC(size) ax_malloc(size, __FILE__, __LINE__)
#define SSL_REALLOC(mem_ref,size) ax_realloc(mem_ref, size, __FILE__, __LINE__)
#define SSL_CALLOC(element, size) ax_calloc(element, size, __FILE__, __LINE__)
#define SSL_ZALLOC(size) ax_zalloc(size, __FILE__, __LINE__)
#else
#define SSL_MALLOC(size) malloc(size)
#define SSL_REALLOC(mem_ref,size) realloc(mem_ref, size)
#define SSL_CALLOC(element, size) calloc(element, size)
#define SSL_ZALLOC(size) zalloc(size)
#endif
#define SSL_CTX_MUTEX_INIT(A)
#define SSL_CTX_MUTEX_DESTROY(A)
#define SSL_CTX_LOCK(A)
#define SSL_CTX_UNLOCK(A)
#define SSL_FREE(mem_ref) ax_free(mem_ref, __FILE__, __LINE__)
#if 0
#define FILE_NAME_LENGTH 25
//#define OUTPUT_FILE "leak_info.txt" //¡ä?¡¤??¨²¡ä?D1??¦Ì?D??¡é
//#define SSL_MALLOC(size) xmalloc (size, __FILE__, __LINE__) //??D?¨º¦Ì??malloc?¡écalloco¨ªfree
//#define CALLOC(elements, size) xcalloc (elements, size, __FILE__, __LINE__)
//#define FREE(mem_ref) xfree(mem_ref)
struct _MEM_INFO
{
void *address;
unsigned int size;
char file_name[FILE_NAME_LENGTH];
unsigned int line;
};
typedef struct _MEM_INFO MEM_INFO;
struct _MEM_LEAK {
MEM_INFO mem_info;
struct _MEM_LEAK * next;
};
typedef struct _MEM_LEAK MEM_LEAK;
void add(MEM_INFO alloc_info);
void erase(unsigned pos);
void clear(void);
void * xmalloc(unsigned int size, const char * file, unsigned int line);
void * xcalloc(unsigned int elements, unsigned int size, const char * file, unsigned int line);
void xfree(void * mem_ref);
void add_mem_info (void * mem_ref, unsigned int size, const char * file, unsigned int line);
void remove_mem_info (void * mem_ref);
void report_mem_leak(void);
#endif
#ifdef __cplusplus
}
#endif