arno/simplesshd
1
0
Fork 0
mirror of http://galexander.org/git/simplesshd.git synced 2024-11-14 02:59:05 +00:00
Code Issues Releases Wiki Activity

Preserve the commit 60fcaa6 hack even though the hack it's embedded

Browse Source 
within was deemed unworthy by dropbear maintainers.
This commit is contained in:
Greg Alexander 2020-12-28 20:23:27 -05:00
parent 5f12050fde
commit ec37382a5c
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dropbear/dbrandom.c
View File

@ -56,6 +56,7 @@ process_file(hash_state *hs, const char *filename,
int readfd = -1;
unsigned int readcount;
int ret = DROPBEAR_FAILURE;
int already_blocked = 0;
if (prngd) {
#if DROPBEAR_USE_PRNGD
@ -73,7 +74,13 @@ process_file(hash_state *hs, const char *filename,
while (wantlen == 0 || readcount < wantlen) {
int readlen, wantread;
unsigned char readbuf[4096];
<<<<<<< HEAD
/* <<<<<<< HEAD
* dropbear removed this code between 2019.78 and 2020.81, I guess they didn't
* really care because all it does is print a warning (I added the break that
* makes already_blocked non-optional). I think somebody went through here with
* a mind towards guaranteeing there is always sufficient entropy to prevent
* obvious attacks, but I don't care. My change (commit 60fcaa6) solved a real
* problem so I'm preserving this hack. - Greg 2020/12/28 */
if (!already_blocked && !prngd)
{
int res;
@ -94,12 +101,10 @@ process_file(hash_state *hs, const char *filename,
}
if (already_blocked) break;
/* =======
* >>>>>>> dropbear */
if (len == 0)
{
=======
if (wantlen == 0) {
>>>>>>> dropbear
wantread = sizeof(readbuf);
} else {
wantread = MIN(sizeof(readbuf), wantlen-readcount);