From f31c6fa33bcc9a608ce6f9ffd671ffc2b65a30ef Mon Sep 17 00:00:00 2001 From: Robert Mustacchi Date: Fri, 26 Dec 2014 02:46:52 +0000 Subject: OS-3845 want arc4random(3C) suite OS-3846 want getentropy(3C) OS-3847 want getrandom(2) OS-3848 want explicit_bzero(3C) OS-3843 want MC_INHERIT_ZERO OS-3844 uuid_generate can leak its cache in edge conditions Reviewed by: Jerry Jelinek Reviewed by: Joshua M. Clulow --- usr/src/uts/common/crypto/api/kcf_random.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'usr/src/uts/common/crypto') diff --git a/usr/src/uts/common/crypto/api/kcf_random.c b/usr/src/uts/common/crypto/api/kcf_random.c index 7766d8ba7a..75072fb686 100644 --- a/usr/src/uts/common/crypto/api/kcf_random.c +++ b/usr/src/uts/common/crypto/api/kcf_random.c @@ -21,6 +21,7 @@ /* * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2012 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2015, Joyent, Inc. */ /* @@ -1096,3 +1097,13 @@ random_get_bytes(uint8_t *ptr, size_t len) return (0); return (kcf_rnd_get_bytes(ptr, len, B_TRUE)); } + +int +random_get_blocking_bytes(uint8_t *ptr, size_t len) +{ + ASSERT(!mutex_owned(&rndpool_lock)); + + if (len < 1) + return (0); + return (kcf_rnd_get_bytes(ptr, len, B_FALSE)); +} -- cgit v1.2.3