Deleted Added
full compact
ivy.c (257491) ivy.c (268519)
1/*-
2 * Copyright (c) 2013 The FreeBSD Foundation
3 * Copyright (c) 2013 David E. O'Brien <obrien@NUXI.org>
4 * Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
5 * All rights reserved.
6 *
7 * Portions of this software were developed by Konstantin Belousov
8 * under sponsorship from the FreeBSD Foundation.

--- 17 unchanged lines hidden (view full) ---

26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
29 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 *
31 */
32
33#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2013 The FreeBSD Foundation
3 * Copyright (c) 2013 David E. O'Brien <obrien@NUXI.org>
4 * Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
5 * All rights reserved.
6 *
7 * Portions of this software were developed by Konstantin Belousov
8 * under sponsorship from the FreeBSD Foundation.

--- 17 unchanged lines hidden (view full) ---

26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
29 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 *
31 */
32
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: stable/10/sys/dev/random/ivy.c 257491 2013-11-01 06:26:37Z kib $");
34__FBSDID("$FreeBSD: stable/10/sys/dev/random/ivy.c 268519 2014-07-11 00:26:57Z delphij $");
35
36#include <sys/param.h>
37#include <sys/kernel.h>
38#include <sys/lock.h>
39#include <sys/malloc.h>
40#include <sys/module.h>
41#include <sys/random.h>
42#include <sys/selinfo.h>

--- 8 unchanged lines hidden (view full) ---

51#include <dev/random/live_entropy_sources.h>
52#include <dev/random/random_adaptors.h>
53
54#define RETRY_COUNT 10
55
56static int random_ivy_read(void *, int);
57
58static struct random_hardware_source random_ivy = {
35
36#include <sys/param.h>
37#include <sys/kernel.h>
38#include <sys/lock.h>
39#include <sys/malloc.h>
40#include <sys/module.h>
41#include <sys/random.h>
42#include <sys/selinfo.h>

--- 8 unchanged lines hidden (view full) ---

51#include <dev/random/live_entropy_sources.h>
52#include <dev/random/random_adaptors.h>
53
54#define RETRY_COUNT 10
55
56static int random_ivy_read(void *, int);
57
58static struct random_hardware_source random_ivy = {
59 .ident = "Hardware, Intel IvyBridge+ RNG",
59 .ident = "Hardware, Intel Secure Key RNG",
60 .source = RANDOM_PURE_RDRAND,
61 .read = random_ivy_read
62};
63
64static inline int
65ivy_rng_store(long *buf)
66{
67#ifdef __GNUCLIKE_ASM

--- 70 unchanged lines hidden ---
60 .source = RANDOM_PURE_RDRAND,
61 .read = random_ivy_read
62};
63
64static inline int
65ivy_rng_store(long *buf)
66{
67#ifdef __GNUCLIKE_ASM

--- 70 unchanged lines hidden ---