WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed scope of stack variables (found via asan)

pull/327/head
Daniele Lacamera 2021-03-17 08:49:51 +01:00
parent a36d91bc93
commit 801ac2d656
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/internal.c
View File

@ -715,6 +715,9 @@ int wolfSSH_ProcessBuffer(WOLFSSH_CTX* ctx,
byte* der; byte* der;
word32 derSz, scratch = 0; word32 derSz, scratch = 0;
union wolfSSH_key *key_ptr = NULL; union wolfSSH_key *key_ptr = NULL;
#ifndef WOLFSSH_SMALL_STACK
union wolfSSH_key key;
#endif
(void)dynamicType; (void)dynamicType;
(void)heap; (void)heap;
@ -770,7 +773,6 @@ int wolfSSH_ProcessBuffer(WOLFSSH_CTX* ctx,
return WS_MEMORY_E; return WS_MEMORY_E;
} }
#else #else
union wolfSSH_key key;
key_ptr = &key; key_ptr = &key;
#endif /* WOLFSSH_SMALL_STACK */ #endif /* WOLFSSH_SMALL_STACK */
@ -2831,6 +2833,7 @@ static int DoKexDhReply(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
ecc_key *key_ptr; ecc_key *key_ptr;
#ifndef WOLFSSH_SMALL_STACK #ifndef WOLFSSH_SMALL_STACK
struct wolfSSH_sigKeyBlock s_sigKeyBlock; struct wolfSSH_sigKeyBlock s_sigKeyBlock;
ecc_key key_s;
#endif #endif
WLOG(WS_LOG_DEBUG, "Entering DoKexDhReply()"); WLOG(WS_LOG_DEBUG, "Entering DoKexDhReply()");
@ -3035,7 +3038,6 @@ static int DoKexDhReply(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
#else /* ! WOLFSSH_SMALL_STACK */ #else /* ! WOLFSSH_SMALL_STACK */
#ifndef WOLFSSH_NO_ECDSA #ifndef WOLFSSH_NO_ECDSA
ecc_key key_s;
key_ptr = &key_s; key_ptr = &key_s;
#endif #endif
sigKeyBlock_ptr = &s_sigKeyBlock; sigKeyBlock_ptr = &s_sigKeyBlock;