Skip to content

Commit b33ef68

Browse files
committed
Fix handshake status not being set if increase_bm_data_size fails
Also set warning level to -Wall esp8266/Arduino#1708
1 parent 324c2fd commit b33ef68

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ LDFLAGS += -L$(XTENSA_LIBS)/lib \
4040

4141
CFLAGS+=-std=c99 -DESP8266
4242

43-
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
43+
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
4444
BIN_DIR := bin
4545
AXTLS_AR := $(BIN_DIR)/libaxtls.a
4646

ssl/tls1.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1415,16 +1415,16 @@ int increase_bm_data_size(SSL *ssl)
14151415
ssl->max_plain_length == RT_MAX_PLAIN_LENGTH) {
14161416
return SSL_OK;
14171417
}
1418-
ssl->can_increase_data_size = false;
14191418
certificate_free(ssl);
14201419
free(ssl->bm_all_data);
14211420
ssl->bm_data = 0;
14221421
ssl->bm_all_data = malloc(RT_MAX_PLAIN_LENGTH + RT_EXTRA);
14231422
if (!ssl->bm_all_data) {
14241423
printf("failed to grow plain buffer\r\n");
1425-
ssl->hs_status == SSL_ERROR_DEAD;
1424+
ssl->hs_status = SSL_ERROR_DEAD;
14261425
return SSL_ERROR_CONN_LOST;
14271426
}
1427+
ssl->can_increase_data_size = false;
14281428
ssl->max_plain_length = RT_MAX_PLAIN_LENGTH;
14291429
ssl->bm_data = ssl->bm_all_data + BM_RECORD_OFFSET;
14301430
return SSL_OK;

0 commit comments

Comments
 (0)