From: Rich Salz <rsalz@openssl.org>
Date: Thu, 20 Jul 2017 14:20:47 +0000 (-0400)
Subject: Rename internal rand.h file
X-Git-Tag: OpenSSL_1_1_1-pre1~1006
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=63f483e10d4e04158be234ed431e9f03d707ad82;p=oweals%2Fopenssl.git

Rename internal rand.h file

Replacement fix for #3975

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3979)
---

diff --git a/crypto/include/internal/rand.h b/crypto/include/internal/rand.h
deleted file mode 100644
index 30887c4a7c..0000000000
--- a/crypto/include/internal/rand.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-/*
- * Licensed under the OpenSSL licenses, (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * https://www.openssl.org/source/license.html
- * or in the file LICENSE in the source distribution.
- */
-
-#include <openssl/rand.h>
-
-void rand_cleanup_int(void);
diff --git a/crypto/include/internal/rand_int.h b/crypto/include/internal/rand_int.h
new file mode 100644
index 0000000000..30887c4a7c
--- /dev/null
+++ b/crypto/include/internal/rand_int.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+/*
+ * Licensed under the OpenSSL licenses, (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * https://www.openssl.org/source/license.html
+ * or in the file LICENSE in the source distribution.
+ */
+
+#include <openssl/rand.h>
+
+void rand_cleanup_int(void);
diff --git a/crypto/init.c b/crypto/init.c
index a2634d9653..b7c77154b4 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 c021486c9f..3168d84b47 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"