tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-23 22:05:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

re-merge arc4random.c

Browse Source
This commit is contained in:
Tess Gauthier 2023-02-03 11:04:25 -05:00
parent ad06455ff1
commit df042422cd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openbsd-compat/arc4random.c
View File

@ -98,11 +98,6 @@ _rs_init(u_char *buf, size_t n)
if (n < KEYSZ + IVSZ) if (n < KEYSZ + IVSZ)
return; return;
if (rs == NULL) {
if (_rs_allocate(&rs, &rsx) == -1)
_exit(1);
}
#ifndef WITH_OPENSSL #ifndef WITH_OPENSSL
#ifdef WINDOWS #ifdef WINDOWS
#include <Wincrypt.h> #include <Wincrypt.h>
@ -139,11 +134,17 @@ getrnd(u_char *s, size_t len)
return; return;
fatal("Couldn't open %s: %s", SSH_RANDOM_DEV, fatal("Couldn't open %s: %s", SSH_RANDOM_DEV,
strerror(save_errno)); strerror(save_errno));
if (rs == NULL) {
if (_rs_allocate(&rs, &rsx) == -1)
_exit(1);
} }
chacha_keysetup(&rsx->rs_chacha, buf, KEYSZ * 8); chacha_keysetup(&rsx->rs_chacha, buf, KEYSZ * 8);
chacha_ivsetup(&rsx->rs_chacha, buf + KEYSZ); chacha_ivsetup(&rsx->rs_chacha, buf + KEYSZ);
} }
#endif /* !WINDOWS */
#endif /* WITH_OPENSSL */
static void static void
_rs_stir(void) _rs_stir(void)
@ -289,4 +290,3 @@ arc4random_buf(void *_buf, size_t n)
explicit_bzero(&r, sizeof(r)); explicit_bzero(&r, sizeof(r));
} }
#endif /* !defined(HAVE_ARC4RANDOM_BUF) && defined(HAVE_ARC4RANDOM) */ #endif /* !defined(HAVE_ARC4RANDOM_BUF) && defined(HAVE_ARC4RANDOM) */