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

feat(wpa_supplicant): sync SHA1Final with idf and keep 8266 code

Browse Source
This commit is contained in:
Li Jingyi
2020-08-04 12:33:37 +08:00
parent 38f284e981
commit abd829dd1e
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/wpa_supplicant/src/crypto/sha1-internal.c
View File

@ -332,7 +332,9 @@ void
SHA1Final(unsigned char digest[20], SHA1_CTX* context) SHA1Final(unsigned char digest[20], SHA1_CTX* context)
{ {
u32 i; u32 i;
#if CONFIG_IDF_TARGET_ESP8266
unsigned long index; unsigned long index;
#endif
unsigned char finalcount[8]; unsigned char finalcount[8];
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
@ -340,13 +342,19 @@ SHA1Final(unsigned char digest[20], SHA1_CTX* context)
((context->count[(i >= 4 ? 0 : 1)] >> ((context->count[(i >= 4 ? 0 : 1)] >>
((3-(i & 3)) * 8) ) & 255); /* Endian independent */ ((3-(i & 3)) * 8) ) & 255); /* Endian independent */
} }
#if CONFIG_IDF_TARGET_ESP8266
index = 0x80; index = 0x80;
SHA1Update(context, (unsigned char *)&index, 1); SHA1Update(context, (unsigned char *)&index, 1);
#else
SHA1Update(context, (unsigned char *) "\200", 1);
#endif
while ((context->count[0] & 504) != 448) { while ((context->count[0] & 504) != 448) {
#if CONFIG_IDF_TARGET_ESP8266
index = 0; index = 0;
SHA1Update(context, (unsigned char *)&index, 1); SHA1Update(context, (unsigned char *)&index, 1);
#else
SHA1Update(context, (unsigned char *) "\0", 1);
#endif
} }
SHA1Update(context, finalcount, 8); /* Should cause a SHA1Transform() SHA1Update(context, finalcount, 8); /* Should cause a SHA1Transform()
*/ */