From: Pauli <paul.dale@oracle.com>
Date: Wed, 23 Aug 2017 23:14:10 +0000 (+1000)
Subject: Move OPENSSL_CONF from e_os.h to cryptlib.h
X-Git-Tag: OpenSSL_1_1_1-pre1~741
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=198c42f5af0d2cc0eb4789c7597b68b6b10cc97a;p=oweals%2Fopenssl.git

Move OPENSSL_CONF from e_os.h to cryptlib.h

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

diff --git a/apps/openssl.c b/apps/openssl.c
index c23cd4b216..3b347ba11e 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -7,6 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
+#include <internal/cryptlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/e_os.h b/e_os.h
index bf317ce6c0..c1b9350d62 100644
--- a/e_os.h
+++ b/e_os.h
@@ -53,8 +53,6 @@ extern "C" {
                              * stand for in ILP32 and LP64 */
 # endif
 
-# define OPENSSL_CONF        "openssl.cnf"
-
 # ifndef DEVRANDOM
 /*
  * set this to a comma-separated list of 'random' device files to try out. By
diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h
index 3d348008e2..5f2cb44dce 100644
--- a/include/internal/cryptlib.h
+++ b/include/internal/cryptlib.h
@@ -55,6 +55,8 @@ typedef struct app_mem_info_st APP_INFO;
 typedef struct mem_st MEM;
 DEFINE_LHASH_OF(MEM);
 
+# define OPENSSL_CONF             "openssl.cnf"
+
 # ifndef OPENSSL_SYS_VMS
 #  define X509_CERT_AREA          OPENSSLDIR
 #  define X509_CERT_DIR           OPENSSLDIR "/certs"
diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index d171ece2a0..0f3452216f 100644
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "e_os.h"
+#include "internal/cryptlib.h"
 #include <openssl/rand.h>
 #include "../ssl_locl.h"
 #include "statem_locl.h"