Non-SFI mode: Implement nacl_irt_random only for nacl_helper_nonsfi.

src/nonsfi/irt/irt_interfaces.c

 /*
  * Copyright (c) 2013 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "native_client/src/nonsfi/irt/irt_interfaces.h"
 
 #include <assert.h>
 #include <errno.h>
@@ skipping 19 matching lines @@
 #include "native_client/src/nonsfi/linux/irt_exception_handling.h"
 #include "native_client/src/public/irt_core.h"
 #include "native_client/src/trusted/service_runtime/include/machine/_types.h"
 #include "native_client/src/trusted/service_runtime/include/sys/mman.h"
 #include "native_client/src/trusted/service_runtime/include/sys/stat.h"
 #include "native_client/src/trusted/service_runtime/include/sys/time.h"
 #include "native_client/src/trusted/service_runtime/include/sys/unistd.h"
 #include "native_client/src/untrusted/irt/irt.h"
 #include "native_client/src/untrusted/irt/irt_dev.h"
 #include "native_client/src/untrusted/irt/irt_interfaces.h"
+#include "native_client/src/untrusted/nacl/nacl_random.h"
 
 /*
  * This is an implementation of NaCl's IRT interfaces that runs
  * outside of the NaCl sandbox.
  *
  * This allows PNaCl to be used as a portability layer without the
  * SFI-based sandboxing.  PNaCl pexes can be translated to
  * non-SFI-sandboxed native code and linked against this IRT
  * implementation.
  */
@@ skipping 374 matching lines @@
 static int futex_wake(volatile int *addr, int nwake, int *count) {
   int result = syscall(__NR_futex, addr, FUTEX_WAKE | FUTEX_PRIVATE_FLAG,
                        nwake, 0, 0, 0);
   if (result < 0)
     return errno;
   *count = result;
   return 0;
 }
 #endif
 
+

[Mark Seaborn, 2014/11/04 01:19:52]

Nit: don't add empty line here

[hidehiko, 2014/11/04 11:16:58]

Oops. Removed.

 #if defined(__linux__) || defined(__native_client__)
 static int irt_clock_getres(nacl_irt_clockid_t clk_id,
                             struct timespec *time_nacl) {
   struct timespec time;
   int result = check_error(clock_getres(clk_id, &time));
   /*
    * The timespec pointer is allowed to be NULL for clock_getres() though
    * not for clock_gettime().
    */
   if (time_nacl != NULL)
@@ skipping 148 matching lines @@
 };
 #elif !defined(__native_client__)
 DEFINE_STUB(futex_wait_abs)
 DEFINE_STUB(futex_wake)
 const struct nacl_irt_futex nacl_irt_futex = {
   USE_STUB(nacl_irt_futex, futex_wait_abs),
   USE_STUB(nacl_irt_futex, futex_wake),
 };
 #endif
 
+const struct nacl_irt_random nacl_irt_random = {

[Mark Seaborn, 2014/11/04 01:19:52]

Please run the PNaCl toolchain trybots to check that this works there.

I suspect you need to update toolchain_build/pnacl_targetlibs.py to avoid
breaking the test for unsandboxed-PNaCl mode.

[hidehiko, 2014/11/04 11:16:59]

Good catch! Fixed.

+  nacl_secure_random,
+};
+
 #if defined(__linux__) || defined(__native_client__)
 const struct nacl_irt_clock nacl_irt_clock = {
   irt_clock_getres,
   irt_clock_gettime,
 };
 #endif
 
 DEFINE_STUB(utimes)
 const struct nacl_irt_dev_filename nacl_irt_dev_filename = {
   irt_open,
@@ skipping 31 matching lines @@
 };
 #endif
 
 static const struct nacl_irt_interface irt_interfaces[] = {
   { NACL_IRT_BASIC_v0_1, &nacl_irt_basic, sizeof(nacl_irt_basic), NULL },
   { NACL_IRT_FDIO_v0_1, &nacl_irt_fdio, sizeof(nacl_irt_fdio), NULL },
   { NACL_IRT_MEMORY_v0_3, &nacl_irt_memory, sizeof(nacl_irt_memory), NULL },
   { NACL_IRT_TLS_v0_1, &nacl_irt_tls, sizeof(nacl_irt_tls), NULL },
   { NACL_IRT_THREAD_v0_1, &nacl_irt_thread, sizeof(nacl_irt_thread), NULL },
   { NACL_IRT_FUTEX_v0_1, &nacl_irt_futex, sizeof(nacl_irt_futex), NULL },
+  { NACL_IRT_RANDOM_v0_1, &nacl_irt_random, sizeof(nacl_irt_random), NULL },
 #if defined(__linux__) || defined(__native_client__)
   { NACL_IRT_CLOCK_v0_1, &nacl_irt_clock, sizeof(nacl_irt_clock), NULL },
 #endif
   { NACL_IRT_DEV_FILENAME_v0_3, &nacl_irt_dev_filename,
     sizeof(nacl_irt_dev_filename), NULL },
   { NACL_IRT_DEV_GETPID_v0_1, &nacl_irt_dev_getpid,
     sizeof(nacl_irt_dev_getpid), NULL },
 #if defined(__native_client__)
   { NACL_IRT_EXCEPTION_HANDLING_v0_1, &nacl_irt_exception_handling,
     sizeof(nacl_irt_exception_handling), NULL},
@@ skipping 60 matching lines @@
   nacl_entry_func_t entry_func =
 #if defined(__APPLE__)
     _start;
 #else
     _user_start;
 #endif
 
   return nacl_irt_nonsfi_entry(argc, argv, environ, entry_func);
 }
 #endif