10000 Move BearSSL from STACK_PROXY to a real, thunked 2nd stack by earlephilhower · Pull Request #5168 · esp8266/Arduino · GitHub
[go: up one dir, main page]

Skip to content

Move BearSSL from STACK_PROXY to a real, thunked 2nd stack #5168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 33 commits into from
Nov 15, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
12e666e
Update to BearSSL 0.6+ release, add AES_CCM modes
earlephilhower Sep 25, 2018
167a11a
Merge branch 'master' into bssl0.6updt
earlephilhower Sep 25, 2018
f771d23
Merge branch 'master' into bssl0.6updt
d-a-v Sep 25, 2018
8fd3938
Enable the aes_ccm initialization in client/server
earlephilhower Sep 25, 2018
416660c
Initial attempt
earlephilhower Sep 25, 2018
ff9cbef
Working code with second stack thunking
earlephilhower Sep 26, 2018
edda69e
Remove #ifdefs in .S file, not needed.
earlephilhower Sep 26, 2018
3dfdfe9
Clean up thunks and remove separate stack flag
earlephilhower Sep 26, 2018
137ba8f
Fix PIO assembler errors
earlephilhower Sep 26, 2018
c34779b
Merge branch 'master' into thunks
earlephilhower Sep 26, 2018
40d17b5
Remove #ifdef code changes, ensure same code as PC
earlephilhower Sep 27, 2018
e908bc6
Merge branch 'thunks' of https://github.com/earlephilhower/Arduino in…
earlephilhower Sep 27, 2018
913b87e
Merge branch 'master' into thunks
earlephilhower Sep 27, 2018
d17fa23
Move to latest BearSSL w/EC progmem savings
earlephilhower Sep 27, 2018
37be1db
Merge with master
earlephilhower Sep 28, 2018
0ebf6e6
Merge branch 'master' of https://github.com/esp8266/Arduino into thunks
earlephilhower Sep 28, 2018
39b6d36
Merge branch 'master' into thunks
earlephilhower Sep 30, 2018
2f83ca9
Add br_thunk_* calls to do ref counting, painting
earlephilhower Sep 30, 2018
1789579
Merge branch 'master' into thunks
earlephilhower Oct 1, 2018
ec6ccdc
Add in postmortem stack dump hooks
earlephilhower Oct 1, 2018
bd4851a
Update stack dump to match decoder expectations
earlephilhower Oct 2, 2018
72362c7
Merge branch 'master' into thunks
earlephilhower Oct 2, 2018
5ee8015
Move thunk to code core for linkiage
earlephilhower Oct 2, 2018
5583696
Add 2nd stack dump utility routine
earlephilhower Oct 2, 2018
3e4de76
Merge branch 'master' into thunks
d-a-v Oct 8, 2018
e6bbf7f
Merge branch 'master' into thunks
earlephilhower Oct 27, 2018
a25f023
Refactor once more, update stack size, add stress
earlephilhower Oct 27, 2018
934f743
Merge branch 'master' into thunks
earlephilhower Oct 31, 2018
36d6fb2
Update to latest to-thunks branch
earlephilhower Oct 31, 2018
65962f4
Add BearSSL device test using stack stress
earlephilhower Oct 31, 2018
17f1548
Use bearssl/master branch, not /to-thunks branch
earlephilhower Oct 31, 2018
a499de2
Merge branch 'master' into thunks
earlephilhower Nov 12, 2018
717169b
Merge branch 'master' into thunks
devyte Nov 13, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Clean up thunks and remove separate stack flag
  • Loading branch information
earlephilhower committed Sep 26, 2018
commit 3dfdfe92befd0ff8603923a1919a7d3daebdecec
14 changes: 7 additions & 7 deletions libraries/ESP8266WiFi/src/BearSSLThunks.S
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ _saveStack: .word 0x00000000


/* void SetThunkStackEnd(unsigned int *end);
*
*
* Stores the address of the user-allocated thunking stack (be sure to pass
* in the *end* of the stack (highest value) since stacks move down on this
* architecture.
Expand Down Expand Up @@ -62,21 +62,21 @@ SetThunkStackEnd:
.align 4
thunk_\fcnName:
addi a1, a1, -16 /* Allocate space for saved registers on stack */

s32i a0, a1, 12 /* Store A0, trounced by calls */
s32i a15, a1, 8 /* Store A15 (our temporary one) */

movi a15, _saveStack /* Store A1(SP) in temp space */
s32i a1, a15, 0

movi a15, _stackEnd /* Load A1(SP) with thunk stack */
l32i.n a1, a15, 0

call0 \fcnName /* Do the call */

movi a15, _saveStack /* Restore A1(SP) */
l32i.n a1, a15, 0

l32i.n a15, a1, 8 /* Restore the saved registers */
l32i.n a0, a1, 12

Expand Down
1 change: 0 additions & 1 deletion libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ void WiFiClientSecure::_clearAuthenticationSettings() {


WiFiClientSecure::WiFiClientSecure() : WiFiClient() {
disable_extra4k_at_link_time();
_cipher_list = NULL;
_cipher_cnt = 0;
_clear();
Expand Down
0