arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-26 07:02:15 +03:00
Code Activity

Fix handshake status not being set if increase_bm_data_size fails

Browse Source 
Also set warning level to -Wall
https://github.com/esp8266/Arduino/issues/1708
This commit is contained in:
Ivan Grokhotkov
2016-03-02 15:17:47 +03:00
parent 324c2fdade
commit b33ef68e6a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -40,7 +40,7 @@ LDFLAGS += -L$(XTENSA_LIBS)/lib \
CFLAGS+=-std=c99 -DESP8266 CFLAGS+=-std=c99 -DESP8266
CFLAGS += -Os -g -O2 -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mno-text-section-literals -D__ets__ -DICACHE_FLASH CFLAGS += -Wall -Os -g -O2 -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mno-text-section-literals -D__ets__ -DICACHE_FLASH
BIN_DIR := bin BIN_DIR := bin
AXTLS_AR := $(BIN_DIR)/libaxtls.a AXTLS_AR := $(BIN_DIR)/libaxtls.a

4
ssl/tls1.c
View File

@ -1415,16 +1415,16 @@ int increase_bm_data_size(SSL *ssl)
ssl->max_plain_length == RT_MAX_PLAIN_LENGTH) { ssl->max_plain_length == RT_MAX_PLAIN_LENGTH) {
return SSL_OK; return SSL_OK;
} }
ssl->can_increase_data_size = false;
certificate_free(ssl); certificate_free(ssl);
free(ssl->bm_all_data); free(ssl->bm_all_data);
ssl->bm_data = 0; ssl->bm_data = 0;
ssl->bm_all_data = malloc(RT_MAX_PLAIN_LENGTH + RT_EXTRA); ssl->bm_all_data = malloc(RT_MAX_PLAIN_LENGTH + RT_EXTRA);
if (!ssl->bm_all_data) { if (!ssl->bm_all_data) {
printf("failed to grow plain buffer\r\n"); printf("failed to grow plain buffer\r\n");
ssl->hs_status == SSL_ERROR_DEAD; ssl->hs_status = SSL_ERROR_DEAD;
return SSL_ERROR_CONN_LOST; return SSL_ERROR_CONN_LOST;
} }
ssl->can_increase_data_size = false;
ssl->max_plain_length = RT_MAX_PLAIN_LENGTH; ssl->max_plain_length = RT_MAX_PLAIN_LENGTH;
ssl->bm_data = ssl->bm_all_data + BM_RECORD_OFFSET; ssl->bm_data = ssl->bm_all_data + BM_RECORD_OFFSET;
return SSL_OK; return SSL_OK;