isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add tests for arc4random_buf() and an implementation for those without.

Browse Source
This commit is contained in:
Todd C. Miller
2020-01-30 13:12:25 -07:00
parent df2e3f7c7f
commit dc45c4d4ea
7 changed files with 116 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/util/arc4random.c
View File

@@ -148,7 +148,6 @@ _rs_rekey(unsigned char *dat, size_t datlen)
rs_have = sizeof(rs_buf) - KEYSZ - IVSZ;
}
#ifdef notdef
static inline void
_rs_random_buf(void *_buf, size_t n)
{
@@ -171,7 +170,6 @@ _rs_random_buf(void *_buf, size_t n)
_rs_rekey(NULL, 0);
}
}
#endif
static inline void
_rs_random_u32(uint32_t *val)
@@ -198,7 +196,6 @@ sudo_arc4random(void)
return val;
}
#ifdef notdef
void
sudo_arc4random_buf(void *buf, size_t n)
{
@@ -206,6 +203,5 @@ sudo_arc4random_buf(void *buf, size_t n)
_rs_random_buf(buf, n);
_ARC4_UNLOCK();
}
#endif
#endif /* HAVE_ARC4RANDOM */

69
lib/util/arc4random_buf.c Normal file
View File

@@ -0,0 +1,69 @@
/*
* SPDX-License-Identifier: ISC
*
* Copyright (c) 2020 Todd C. Miller <Todd.Miller@sudo.ws>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*
* This is an open source non-commercial project. Dear PVS-Studio, please check it.
* PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
*/
#include <config.h>
#ifndef HAVE_ARC4RANDOM_BUF
#include <sys/types.h>
#include <stdlib.h>
#if defined(HAVE_STDINT_H)
# include <stdint.h>
#elif defined(HAVE_INTTYPES_H)
# include <inttypes.h>
#endif
#include "sudo_compat.h"
#include "sudo_rand.h"
/*
* Call arc4random() repeatedly to fill buf with n bytes of random data.
*/
void
sudo_arc4random_buf(void *buf, size_t n)
{
char *cp = buf;
while (n != 0) {
size_t m = minimum(n, 4);
uint32_t val = arc4random();
switch (m) {
case 4:
*cp++ = (val >> 24) & 0xff;
/* FALLTHROUGH */
case 3:
*cp++ = (val >> 16) & 0xff;
/* FALLTHROUGH */
case 2:
*cp++ = (val >> 8) & 0xff;
/* FALLTHROUGH */
case 1:
*cp++ = val & 0xff;
break;
}
n -= m;
}
}
#endif /* HAVE_ARC4RANDOM_BUF */