KRACK Vulnerability

[kylix34]

Hello Martin,

any hint about what has to be changed in order to patch the KRACK vulnerability?

Thanks!

[mharizanov]

Hi,
it is just a matter of switching to the latest https://github.com/espressif/ESP8266_NONOS_SDK , the libraries were patched there.
Could be quite a challenge since this branch hasn't been maintained for a while and the switch to version SDK 2.1 may not be trivial. If you get it going, please make a pull request

[kylix34]

Hi Martin!
Until now I used these steps for building the toolchain: https://github.com/esp8266/esp8266-wiki/wiki/toolchain

I see it uses a very old sdk version: 0.9.3

Could you instruct on how to use the new 2.1.0 sdk version for building the toolchain?

Thanks!

[mharizanov]

Hi,
I'd rather use this setup: https://github.com/pfalcon/esp-open-sdk

[kylix34]

Hi Martin,

I managed to compile the toolchain using the new SDK but now, when trying to compile the thermostat code I get a lot of errors:
felix@felix-VirtualBox:/Desktop/ESP8266_Relay_Board-master/1ch_relay$ make
CC driver/i2c_oled.c
In file included from driver/i2c_oled.c:12:0:
include/espmissingincludes.h:17:6: error: conflicting types for 'ets_isr_attach'
void ets_isr_attach(int intr, void *handler, void *arg);
^
In file included from include/espmissingincludes.h:4:0,
from driver/i2c_oled.c:12:
/opt/Espressif/ESP8266_SDK/include/ets_sys.h:67:6: note: previous declaration of 'ets_isr_attach' was here
void ets_isr_attach(int i, ets_isr_t func, void *arg);
^
In file included from include/driver/i2c.h:25:0,
from driver/i2c_oled.c:13:
/opt/Espressif/ESP8266_SDK/include/osapi.h:33:6: error: conflicting types for 'ets_delay_us'
void ets_delay_us(uint16_t us);
^
In file included from driver/i2c_oled.c:12:0:
include/espmissingincludes.h:49:6: note: previous declaration of 'ets_delay_us' was here
void ets_delay_us(long us);
^
In file included from include/driver/i2c.h:25:0,
from driver/i2c_oled.c:13:
/opt/Espressif/ESP8266_SDK/include/osapi.h:34:6: error: conflicting types for 'ets_install_putc1'
void ets_install_putc1(void (*p)(char c));
^
In file included from driver/i2c_oled.c:12:0:
include/espmissingincludes.h:16:6: note: previous declaration of 'ets_install_putc1' was here
void ets_install_putc1(void *routine);
^
In file included from include/driver/i2c.h:25:0,
from driver/i2c_oled.c:13:
/opt/Espressif/ESP8266_SDK/include/osapi.h:47:5: error: conflicting types for 'ets_strlen'
int ets_strlen(const char *s);
^
In file included from driver/i2c_oled.c:12:0:
include/espmissingincludes.h:27:8: note: previous declaration of 'ets_strlen' was here
size_t ets_strlen(const char *s);
^
In file included from include/driver/i2c.h:25:0,
from driver/i2c_oled.c:13:
/opt/Espressif/ESP8266_SDK/include/osapi.h:48:5: error: conflicting types for 'ets_strncmp'
int ets_strncmp(const char *s1, const char *s2, unsigned int n);
^
In file included from driver/i2c_oled.c:12:0:
include/espmissingincludes.h:28:5: note: previous declaration of 'ets_strncmp' was here
int ets_strncmp(const char *s1, const char *s2, int len);
^
In file included from include/driver/i2c.h:25:0,
from driver/i2c_oled.c:13:
/opt/Espressif/ESP8266_SDK/include/osapi.h:65:6: error: conflicting types for 'ets_timer_arm_new'
void ets_timer_arm_new(os_timer_t *ptimer, uint32_t time, bool repeat_flag, bool ms_flag);
^
In file included from driver/i2c_oled.c:12:0:
include/espmissingincludes.h:31:6: note: previous declaration of 'ets_timer_arm_new' was here
void ets_timer_arm_new(ETSTimer *a, int b, int c, int isMstimer);
^
In file included from include/driver/i2c.h:25:0,
from driver/i2c_oled.c:13:
/opt/Espressif/ESP8266_SDK/include/osapi.h:90:15: error: conflicting types for 'os_random'
unsigned long os_random(void);
^
In file included from driver/i2c_oled.c:12:0:
include/espmissingincludes.h:46:5: note: previous declaration of 'os_random' was here
int os_random();
^
Makefile:197: recipe for target 'build/driver/i2c_oled.o' failed
make: *** [build/driver/i2c_oled.o] Error 1
felix@felix-VirtualBox:~/Desktop/ESP8266_Relay_Board-master/1ch_relay$

Trying to remove the i2c driver brings out other kind of errors.
Do you have any suggestion?

Thanks!

[kylix34]

Removing the "DRIVER" folder (I don't use the i2c driver for the oled display) I get:

felix@felix-VirtualBox:~/Desktop/ESP8266_Relay_Board-master/1ch_relay$ make
CC user/mqtt.c
In file included from include/lwipopts.h:2034:0,
from include/lwip/opt.h:45,
from include/lwip/ip_addr.h:35,
from include/ip_addr.h:2,
from include/user_interface.h:13,
from user/mqtt.c:32:
include/espmissingincludes.h:17:6: error: conflicting types for 'ets_isr_attach'
void ets_isr_attach(int intr, void *handler, void *arg);
^
In file included from /opt/Espressif/ESP8266_SDK/include/os_type.h:28:0,
from include/user_interface.h:9,
from user/mqtt.c:32:
/opt/Espressif/ESP8266_SDK/include/ets_sys.h:67:6: note: previous declaration of 'ets_isr_attach' was here
void ets_isr_attach(int i, ets_isr_t func, void *arg);
^
In file included from include/arch/cc.h:40:0,
from include/lwip/arch.h:43,
from include/lwip/debug.h:35,
from include/lwip/opt.h:46,
from include/lwip/ip_addr.h:35,
from include/ip_addr.h:2,
from include/user_interface.h:13,
from user/mqtt.c:32:
/opt/Espressif/ESP8266_SDK/include/osapi.h:33:6: error: conflicting types for 'ets_delay_us'
void ets_delay_us(uint16_t us);
^
In file included from include/lwipopts.h:2034:0,
from include/lwip/opt.h:45,
from include/lwip/ip_addr.h:35,
from include/ip_addr.h:2,
from include/user_interface.h:13,
from user/mqtt.c:32:
include/espmissingincludes.h:49:6: note: previous declaration of 'ets_delay_us' was here
void ets_delay_us(long us);
^
In file included from include/arch/cc.h:40:0,
from include/lwip/arch.h:43,
from include/lwip/debug.h:35,
from include/lwip/opt.h:46,
from include/lwip/ip_addr.h:35,
from include/ip_addr.h:2,
from include/user_interface.h:13,
from user/mqtt.c:32:
/opt/Espressif/ESP8266_SDK/include/osapi.h:34:6: error: conflicting types for 'ets_install_putc1'
void ets_install_putc1(void (*p)(char c));
^
In file included from include/lwipopts.h:2034:0,
from include/lwip/opt.h:45,
from include/lwip/ip_addr.h:35,
from include/ip_addr.h:2,
from include/user_interface.h:13,
from user/mqtt.c:32:
include/espmissingincludes.h:16:6: note: previous declaration of 'ets_install_putc1' was here
void ets_install_putc1(void *routine);
^
In file included from include/arch/cc.h:40:0,
from include/lwip/arch.h:43,
from include/lwip/debug.h:35,
from include/lwip/opt.h:46,
from include/lwip/ip_addr.h:35,
from include/ip_addr.h:2,
from include/user_interface.h:13,
from user/mqtt.c:32:
/opt/Espressif/ESP8266_SDK/include/osapi.h:47:5: error: conflicting types for 'ets_strlen'
int ets_strlen(const char *s);
^
In file included from include/lwipopts.h:2034:0,
from include/lwip/opt.h:45,
from include/lwip/ip_addr.h:35,
from include/ip_addr.h:2,
from include/user_interface.h:13,
from user/mqtt.c:32:
include/espmissingincludes.h:27:8: note: previous declaration of 'ets_strlen' was here
size_t ets_strlen(const char *s);
^
In file included from include/arch/cc.h:40:0,
from include/lwip/arch.h:43,
from include/lwip/debug.h:35,
from include/lwip/opt.h:46,
from include/lwip/ip_addr.h:35,
from include/ip_addr.h:2,
from include/user_interface.h:13,
from user/mqtt.c:32:
/opt/Espressif/ESP8266_SDK/include/osapi.h:48:5: error: conflicting types for 'ets_strncmp'
int ets_strncmp(const char *s1, const char *s2, unsigned int n);
^
In file included from include/lwipopts.h:2034:0,
from include/lwip/opt.h:45,
from include/lwip/ip_addr.h:35,
from include/ip_addr.h:2,
from include/user_interface.h:13,
from user/mqtt.c:32:
include/espmissingincludes.h:28:5: note: previous declaration of 'ets_strncmp' was here
int ets_strncmp(const char *s1, const char *s2, int len);
^
In file included from include/arch/cc.h:40:0,
from include/lwip/arch.h:43,
from include/lwip/debug.h:35,
from include/lwip/opt.h:46,
from include/lwip/ip_addr.h:35,
from include/ip_addr.h:2,
from include/user_interface.h:13,
from user/mqtt.c:32:
/opt/Espressif/ESP8266_SDK/include/osapi.h:65:6: error: conflicting types for 'ets_timer_arm_new'
void ets_timer_arm_new(os_timer_t *ptimer, uint32_t time, bool repeat_flag, bool ms_flag);
^
In file included from include/lwipopts.h:2034:0,
from include/lwip/opt.h:45,
from include/lwip/ip_addr.h:35,
from include/ip_addr.h:2,
from include/user_interface.h:13,
from user/mqtt.c:32:
include/espmissingincludes.h:31:6: note: previous declaration of 'ets_timer_arm_new' was here
void ets_timer_arm_new(ETSTimer *a, int b, int c, int isMstimer);
^
In file included from include/arch/cc.h:40:0,
from include/lwip/arch.h:43,
from include/lwip/debug.h:35,
from include/lwip/opt.h:46,
from include/lwip/ip_addr.h:35,
from include/ip_addr.h:2,
from include/user_interface.h:13,
from user/mqtt.c:32:
/opt/Espressif/ESP8266_SDK/include/osapi.h:90:15: error: conflicting types for 'os_random'
unsigned long os_random(void);
^
In file included from include/lwipopts.h:2034:0,
from include/lwip/opt.h:45,
from include/lwip/ip_addr.h:35,
from include/ip_addr.h:2,
from include/user_interface.h:13,
from user/mqtt.c:32:
include/espmissingincludes.h:46:5: note: previous declaration of 'os_random' was here
int os_random();
^
In file included from user/mqtt.c:36:0:
/opt/Espressif/ESP8266_SDK/include/mem.h:40:7: error: conflicting types for 'pvPortMalloc'
void *pvPortMalloc (size_t sz, const char *, unsigned);
^
In file included from include/lwipopts.h:2034:0,
from include/lwip/opt.h:45,
from include/lwip/ip_addr.h:35,
from include/ip_addr.h:2,
from include/user_interface.h:13,
from user/mqtt.c:32:
include/espmissingincludes.h:39:7: note: previous declaration of 'pvPortMalloc' was here
void *pvPortMalloc(size_t xWantedSize);
^
In file included from user/mqtt.c:36:0:
/opt/Espressif/ESP8266_SDK/include/mem.h:41:6: error: conflicting types for 'vPortFree'
void vPortFree (void *p, const char *, unsigned);
^
In file included from include/lwipopts.h:2034:0,
from include/lwip/opt.h:45,
from include/lwip/ip_addr.h:35,
from include/ip_addr.h:2,
from include/user_interface.h:13,
from user/mqtt.c:32:
include/espmissingincludes.h:42:6: note: previous declaration of 'vPortFree' was here
void vPortFree(void *ptr);
^
In file included from user/mqtt.c:36:0:
/opt/Espressif/ESP8266_SDK/include/mem.h:42:7: error: conflicting types for 'pvPortZalloc'
void *pvPortZalloc (size_t sz, const char *, unsigned);
^
In file included from include/lwipopts.h:2034:0,
from include/lwip/opt.h:45,
from include/lwip/ip_addr.h:35,
from include/ip_addr.h:2,
from include/user_interface.h:13,
from user/mqtt.c:32:
include/espmissingincludes.h:40:7: note: previous declaration of 'pvPortZalloc' was here
void *pvPortZalloc(size_t);
^
Makefile:197: recipe for target 'build/user/mqtt.o' failed
make: *** [build/user/mqtt.o] Error 1

[mharizanov]

Yes, this is typical when the function prototypes finally appeared in the SDK or the declarations changed.

for example ets_isr_attach was missing before and therefore declared in espmissingincludes.h, however with the latest SDK the parameter types changed as well so now you end up with two conflicting declarations of the same function:

include/espmissingincludes.h
void ets_isr_attach(int intr, void *handler, void *arg);

vs

/opt/Espressif/ESP8266_SDK/include/ets_sys.h
void ets_isr_attach(int i, ets_isr_t func, void *arg);

To resolve this you will need to adjust the .h files and most probably the C code that uses them so that the correct parameter types are used.

repeat that with every error in the error log and eventually you will be able to compile..

[kylix34]

Thanks Martin! I'm not a programmer but I'll give it a try.
I commented some of the function declarations in espmissingincludes.h and now the compiling process stops at the ds18B20 module:
felix@felix-VirtualBox:/Desktop/ESP8266_Relay_Board-master/1ch_relay$ make
CC user/mqtt.c
CC user/io.c
CC user/stdout.c
CC user/config.c
CC user/ringbuf.c
CC user/dht22.c
CC user/thermostat.c
CC user/jsmn.c
CC user/mqtt_msg.c
CC user/ds18b20.c
user/ds18b20.c: In function 'readDS':
user/ds18b20.c:239:2: error: large integer implicitly truncated to unsigned type [-Werror=overflow]
os_delay_us( 1000000 );
^
user/ds18b20.c: In function 'ds_init':
user/ds18b20.c:319:2: error: implicit declaration of function 'PIN_PULLDWN_DIS' [-Werror=implicit-function-declaration]
PIN_PULLDWN_DIS(PERIPHS_IO_MUX_GPIO2_U);
^
cc1: all warnings being treated as errors
Makefile:197: recipe for target 'build/user/ds18b20.o' failed
make: *** [build/user/ds18b20.o] Error 1
felix@felix-VirtualBox:~/Desktop/ESP8266_Relay_Board-master/1ch_relay$

Solved the second issue by adding in CFLAGS (Makefile): -Wno-implicit-function-declaration. Is this the right way?
I can't go ahead with the first error though.

[kylix34]

I finally managed to compile it all (SDK 2.1.0) by doing these changes:

1. Comment in espmissingincludes.h:

void ets_install_putc1(void *routine);
void ets_isr_attach(int intr, void *handler, void *arg);
size_t ets_strlen(const char *s);
int ets_strncmp(const char *s1, const char *s2, int len);
int ets_strcmp(const char *s1, const char *s2);
void ets_timer_arm_new(ETSTimer *a, int b, int c, int isMstimer);
void pvPortFree(void *ptr);
void *pvPortMalloc(size_t xWantedSize);
void *pvPortZalloc(size_t);
void vPortFree(void *ptr);
void *vPortMalloc(size_t xWantedSize);
int os_random();
void ets_delay_us(long us);

2. In pwm.c, at the end of the file:
   changed
   ETS_FRC_TIMER1_INTR_ATTACH(pwm_tim1_intr_handler, NULL);
   into
   ETS_FRC_TIMER1_INTR_ATTACH((ets_isr_t)pwm_tim1_intr_handler, NULL);

3. In io.h, checked the presence of the following lines:
   extern char currGPIO13State;
   extern char currGPIO15State;

4. In ds18b20.c commented the following line:
   PIN_PULLDWN_DIS(PERIPHS_IO_MUX_GPIO2_U);

5. In the Makefile of the Thermostat project, CFLAGS, I added: -Wno-implicit-function-declaration

6. In the Makefile of the SDK, I used the new version:
   VENDOR_SDK = 2.1.0

7. Renamed in SDK folder/include/
   c_types.h into c_types.h.old and c_types.h.orig into c_types.h

I didn't test yet the compiled firmware.

[mharizanov]

This is good news, thanks for sharing the details!
I'm pretty sure it will work, but do share once you flash the new firmware..

[mharizanov]

In osapi.h (the SDK folder/include) changed:
void ets_delay_us(uint16_t us);
into:
void ets_delay_us(long us);

That probably isn't a good idea, rather change the delay value to fit uint16t i.e. 65535

[kylix34]

The delay I think it was used when reading the ds18b20 sensor. The default value is 1000000 microseconds. Will 65535 microseconds be enough?

[mharizanov]

Conversion time for 12bit is 750ms, so rather something like this:

for( i = 0; i < 75; i++ )
os_delay_us( 1000 ); // 750ms for 12 bit

[kylix34]

Great! I'll do the changes this evening and I'll let you know about the firmware. Thanks!!!!!!

[kylix34]

Changed:

1. In ds18b20.c:

   //os_delay_us( 1000000 );

   for( i = 0; i < 75; i++ )
   os_delay_us( 1000 ); // 750ms for 12 bit

2. In user_main.c:
   added in the function void ICACHE_FLASH_ATTR user_init(void) {
   int i;
   //os_delay_us(100000);
   for( i = 0; i < 1000; i++ )
   os_delay_us( 1000 );

[mharizanov]

#2 will result in 1000000 , probably watchdog will kick in before it ends