Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

px5g-mbedtls: Use getrandom()

Browse Source 
Instead of accessing /dev/urandom use the getrandom syscall. This way we
do not have to keep the file open all the time.
This also fixes a compile error with glibc:

--------
px5g-mbedtls.c: In function '_urandom':
px5g-mbedtls.c:48:9: error: ignoring return value of 'read' declared with attribute 'warn_unused_result' [-Werror=unused-result]
   48 |         read(urandom_fd, out, len);
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
--------

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens 2022-12-28 00:11:00 +01:00
parent 39e4f03fd3
commit d1893f1c88
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/utils/px5g-mbedtls/px5g-mbedtls.c
View File

@ -20,6 +20,7 @@
*/ */
#include <sys/types.h> #include <sys/types.h>
#include <sys/random.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -31,6 +32,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <mbedtls/bignum.h> #include <mbedtls/bignum.h>
#include <mbedtls/entropy.h>
#include <mbedtls/x509_crt.h> #include <mbedtls/x509_crt.h>
#include <mbedtls/ecp.h> #include <mbedtls/ecp.h>
#include <mbedtls/rsa.h> #include <mbedtls/rsa.h>
@ -40,12 +42,16 @@
#define PX5G_COPY "Copyright (c) 2009 Steven Barth <steven@midlink.org>" #define PX5G_COPY "Copyright (c) 2009 Steven Barth <steven@midlink.org>"
#define PX5G_LICENSE "Licensed under the GNU Lesser General Public License v2.1" #define PX5G_LICENSE "Licensed under the GNU Lesser General Public License v2.1"
static int urandom_fd;
static char buf[16384]; static char buf[16384];
static int _urandom(void *ctx, unsigned char *out, size_t len) static int _urandom(void *ctx, unsigned char *out, size_t len)
{ {
read(urandom_fd, out, len); ssize_t ret;
ret = getrandom(out, len, 0);
if (ret < 0 || (size_t)ret != len)
return MBEDTLS_ERR_ENTROPY_SOURCE_FAILED;
return 0; return 0;
} }
@ -306,8 +312,6 @@ int selfsigned(char **arg)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
urandom_fd = open("/dev/urandom", O_RDONLY);
if (!argv[1]) { if (!argv[1]) {
//Usage //Usage
} else if (!strcmp(argv[1], "eckey")) { } else if (!strcmp(argv[1], "eckey")) {