From aca9f895fe6366846ee12710604e0dfc13d6efbe Mon Sep 17 00:00:00 2001 From: bcook <> Date: Tue, 22 Jul 2014 01:15:58 +0000 Subject: [PATCH] better match proposed syscall api --- src/lib/libcrypto/arc4random/getentropy_linux.c | 10 ++-------- src/lib/libcrypto/crypto/getentropy_linux.c | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/lib/libcrypto/arc4random/getentropy_linux.c b/src/lib/libcrypto/arc4random/getentropy_linux.c index 539a71af..59bc3628 100644 --- a/src/lib/libcrypto/arc4random/getentropy_linux.c +++ b/src/lib/libcrypto/arc4random/getentropy_linux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getentropy_linux.c,v 1.31 2014/07/21 23:34:54 deraadt Exp $ */ +/* $OpenBSD: getentropy_linux.c,v 1.32 2014/07/22 01:15:58 bcook Exp $ */ /* * Copyright (c) 2014 Theo de Raadt @@ -197,15 +197,9 @@ getentropy_getrandom(void *buf, size_t len) #define SYS__getrandom 354 #endif #endif - struct __getrandom_args args = { - .buf = buf; - .len = len; - .flags = 0; - }; - if (len > 256) return (-1); - ret = syscall(SYS__getrandom, &args); + ret = syscall(SYS__getrandom, buf, len, 0); if (ret == len) return (0); #endif diff --git a/src/lib/libcrypto/crypto/getentropy_linux.c b/src/lib/libcrypto/crypto/getentropy_linux.c index 539a71af..59bc3628 100644 --- a/src/lib/libcrypto/crypto/getentropy_linux.c +++ b/src/lib/libcrypto/crypto/getentropy_linux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getentropy_linux.c,v 1.31 2014/07/21 23:34:54 deraadt Exp $ */ +/* $OpenBSD: getentropy_linux.c,v 1.32 2014/07/22 01:15:58 bcook Exp $ */ /* * Copyright (c) 2014 Theo de Raadt @@ -197,15 +197,9 @@ getentropy_getrandom(void *buf, size_t len) #define SYS__getrandom 354 #endif #endif - struct __getrandom_args args = { - .buf = buf; - .len = len; - .flags = 0; - }; - if (len > 256) return (-1); - ret = syscall(SYS__getrandom, &args); + ret = syscall(SYS__getrandom, buf, len, 0); if (ret == len) return (0); #endif