Revert "external/boringssl: sync with upstream."

This reverts commit 1e4884f615b20946411a74e41eb9c6aa65e2d5f3.

This breaks some x86 builds.

Change-Id: I4d4310663ce52bc0a130e6b9dbc22b868ff4fb25

1 files changed, 6 insertions, 21 deletions

diff --git a/src/crypto/rand/rand.c b/src/crypto/rand/rand.c
index e76a120..a96ac48 100644
--- a/src/crypto/rand/rand.c
+++ b/src/crypto/rand/rand.c
@@ -17,7 +17,6 @@
 #include <limits.h>
 #include <string.h>
 
-#include <openssl/chacha.h>
 #include <openssl/mem.h>
 
 #include "internal.h"
@@ -70,12 +69,17 @@ static void rand_thread_state_free(void *state) {
   OPENSSL_free(state);
 }
 
+extern void CRYPTO_chacha_20(uint8_t *out, const uint8_t *in, size_t in_len,
+                             const uint8_t key[32], const uint8_t nonce[8],
+                             size_t counter);
+
 int RAND_bytes(uint8_t *buf, size_t len) {
   if (len == 0) {
     return 1;
   }
 
-  if (!CRYPTO_hwrand(buf, len)) {
+  if (!CRYPTO_have_hwrand() ||
+      !CRYPTO_hwrand(buf, len)) {
     /* Without a hardware RNG to save us from address-space duplication, the OS
      * entropy is used directly. */
     CRYPTO_sysrand(buf, len);
@@ -158,10 +162,6 @@ int RAND_load_file(const char *path, long num) {
 
 void RAND_add(const void *buf, int num, double entropy) {}
 
-int RAND_egd(const char *path) {
-  return 255;
-}
-
 int RAND_poll(void) {
   return 1;
 }
@@ -169,18 +169,3 @@ int RAND_poll(void) {
 int RAND_status(void) {
   return 1;
 }
-
-static const struct rand_meth_st kSSLeayMethod = {
-  RAND_seed,
-  RAND_bytes,
-  RAND_cleanup,
-  RAND_add,
-  RAND_pseudo_bytes,
-  RAND_status,
-};
-
-RAND_METHOD *RAND_SSLeay(void) {
-  return (RAND_METHOD*) &kSSLeayMethod;
-}
-
-void RAND_set_rand_method(const RAND_METHOD *method) {}