From bd2d1aaa16474202b1a2c1edbf62e6782fa2dc36 Mon Sep 17 00:00:00 2001 From: Michael Pratt Date: Fri, 15 Jun 2018 15:35:09 -0700 Subject: Replace crypto/rand with internal rand package PiperOrigin-RevId: 200784607 Change-Id: I39aa6ee632936dcbb00fc298adccffa606e9f4c0 --- pkg/sentry/fs/dev/BUILD | 1 + pkg/sentry/fs/dev/random.go | 3 +-- pkg/sentry/loader/BUILD | 1 + pkg/sentry/loader/loader.go | 2 +- pkg/sentry/syscalls/linux/BUILD | 1 + pkg/sentry/syscalls/linux/sys_random.go | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) (limited to 'pkg/sentry') diff --git a/pkg/sentry/fs/dev/BUILD b/pkg/sentry/fs/dev/BUILD index 42049ecb5..d33a19c2f 100644 --- a/pkg/sentry/fs/dev/BUILD +++ b/pkg/sentry/fs/dev/BUILD @@ -33,6 +33,7 @@ go_library( "//pkg/abi/linux", "//pkg/amutex", "//pkg/log", + "//pkg/rand", "//pkg/sentry/context", "//pkg/sentry/device", "//pkg/sentry/fs", diff --git a/pkg/sentry/fs/dev/random.go b/pkg/sentry/fs/dev/random.go index 0402f9355..33a045a05 100644 --- a/pkg/sentry/fs/dev/random.go +++ b/pkg/sentry/fs/dev/random.go @@ -15,9 +15,8 @@ package dev import ( - "crypto/rand" - "gvisor.googlesource.com/gvisor/pkg/abi/linux" + "gvisor.googlesource.com/gvisor/pkg/rand" "gvisor.googlesource.com/gvisor/pkg/sentry/context" "gvisor.googlesource.com/gvisor/pkg/sentry/fs" "gvisor.googlesource.com/gvisor/pkg/sentry/fs/ramfs" diff --git a/pkg/sentry/loader/BUILD b/pkg/sentry/loader/BUILD index 08cb3a777..b7aebd9ec 100644 --- a/pkg/sentry/loader/BUILD +++ b/pkg/sentry/loader/BUILD @@ -39,6 +39,7 @@ go_library( "//pkg/binary", "//pkg/cpuid", "//pkg/log", + "//pkg/rand", "//pkg/refs", "//pkg/sentry/arch", "//pkg/sentry/context", diff --git a/pkg/sentry/loader/loader.go b/pkg/sentry/loader/loader.go index a68ab33e7..3cda0fe6f 100644 --- a/pkg/sentry/loader/loader.go +++ b/pkg/sentry/loader/loader.go @@ -17,13 +17,13 @@ package loader import ( "bytes" - "crypto/rand" "io" "path" "gvisor.googlesource.com/gvisor/pkg/abi" "gvisor.googlesource.com/gvisor/pkg/abi/linux" "gvisor.googlesource.com/gvisor/pkg/cpuid" + "gvisor.googlesource.com/gvisor/pkg/rand" "gvisor.googlesource.com/gvisor/pkg/sentry/arch" "gvisor.googlesource.com/gvisor/pkg/sentry/context" "gvisor.googlesource.com/gvisor/pkg/sentry/fs" diff --git a/pkg/sentry/syscalls/linux/BUILD b/pkg/sentry/syscalls/linux/BUILD index f9e0a4be3..7cfd37fb1 100644 --- a/pkg/sentry/syscalls/linux/BUILD +++ b/pkg/sentry/syscalls/linux/BUILD @@ -70,6 +70,7 @@ go_library( "//pkg/eventchannel", "//pkg/log", "//pkg/metric", + "//pkg/rand", "//pkg/sentry/arch", "//pkg/sentry/context", "//pkg/sentry/fs", diff --git a/pkg/sentry/syscalls/linux/sys_random.go b/pkg/sentry/syscalls/linux/sys_random.go index 2dd59b1c3..be31e6b17 100644 --- a/pkg/sentry/syscalls/linux/sys_random.go +++ b/pkg/sentry/syscalls/linux/sys_random.go @@ -15,10 +15,10 @@ package linux import ( - "crypto/rand" "io" "math" + "gvisor.googlesource.com/gvisor/pkg/rand" "gvisor.googlesource.com/gvisor/pkg/sentry/arch" "gvisor.googlesource.com/gvisor/pkg/sentry/kernel" "gvisor.googlesource.com/gvisor/pkg/sentry/safemem" -- cgit v1.2.3