[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  63f483e10d4e04158be234ed431e9f03d707ad82 (commit)
      from  f2766f753ef72dd1b0cfae9bd3b54b18795a49e4 (commit)


- Log -----------------------------------------------------------------
commit 63f483e10d4e04158be234ed431e9f03d707ad82
Author: Rich Salz <rsalz at openssl.org>
Date:   Thu Jul 20 10:20:47 2017 -0400

    Rename internal rand.h file
    
    Replacement fix for #3975
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3979)

-----------------------------------------------------------------------

Summary of changes:
 crypto/include/internal/{rand.h => rand_int.h} | 0
 crypto/init.c                                  | 2 +-
 crypto/rand/rand_lib.c                         | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename crypto/include/internal/{rand.h => rand_int.h} (100%)

diff --git a/crypto/include/internal/rand.h b/crypto/include/internal/rand_int.h
similarity index 100%
rename from crypto/include/internal/rand.h
rename to crypto/include/internal/rand_int.h
diff --git a/crypto/init.c b/crypto/init.c
index a2634d9..b7c7715 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -9,7 +9,7 @@
 
 #include <internal/cryptlib_int.h>
 #include <openssl/err.h>
-#include <internal/rand.h>
+#include <internal/rand_int.h>
 #include <internal/bio.h>
 #include <openssl/evp.h>
 #include <internal/evp_int.h>
diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index c021486..3168d84 100644
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -11,7 +11,7 @@
 #include <time.h>
 #include "internal/cryptlib.h"
 #include <openssl/opensslconf.h>
-#include "internal/rand.h"
+#include "internal/rand_int.h"
 #include <openssl/engine.h>
 #include "internal/thread_once.h"
 #include "rand_lcl.h"