Browse Source

better match proposed syscall api

OPENBSD_5_6
bcook 10 years ago
parent
commit
aca9f895fe
2 changed files with 4 additions and 16 deletions
  1. +2
    -8
      src/lib/libcrypto/arc4random/getentropy_linux.c
  2. +2
    -8
      src/lib/libcrypto/crypto/getentropy_linux.c

+ 2
- 8
src/lib/libcrypto/arc4random/getentropy_linux.c View File

@ -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 <deraadt@openbsd.org> * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@ -197,15 +197,9 @@ getentropy_getrandom(void *buf, size_t len)
#define SYS__getrandom 354 #define SYS__getrandom 354
#endif #endif
#endif #endif
struct __getrandom_args args = {
.buf = buf;
.len = len;
.flags = 0;
};
if (len > 256) if (len > 256)
return (-1); return (-1);
ret = syscall(SYS__getrandom, &args);
ret = syscall(SYS__getrandom, buf, len, 0);
if (ret == len) if (ret == len)
return (0); return (0);
#endif #endif


+ 2
- 8
src/lib/libcrypto/crypto/getentropy_linux.c View File

@ -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 <deraadt@openbsd.org> * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@ -197,15 +197,9 @@ getentropy_getrandom(void *buf, size_t len)
#define SYS__getrandom 354 #define SYS__getrandom 354
#endif #endif
#endif #endif
struct __getrandom_args args = {
.buf = buf;
.len = len;
.flags = 0;
};
if (len > 256) if (len > 256)
return (-1); return (-1);
ret = syscall(SYS__getrandom, &args);
ret = syscall(SYS__getrandom, buf, len, 0);
if (ret == len) if (ret == len)
return (0); return (0);
#endif #endif


Loading…
Cancel
Save