Move OPENSSL_CONF from e_os.h to cryptlib.h
authorPauli <paul.dale@oracle.com>
Wed, 23 Aug 2017 23:14:10 +0000 (09:14 +1000)
committerPauli <paul.dale@oracle.com>
Tue, 29 Aug 2017 21:20:44 +0000 (07:20 +1000)
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4188)

apps/openssl.c
e_os.h
include/internal/cryptlib.h
ssl/statem/statem.c

index c23cd4b..3b347ba 100644 (file)
@@ -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 bf317ce..c1b9350 100644 (file)
--- 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
index 3d34800..5f2cb44 100644 (file)
@@ -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"
index d171ece..0f34522 100644 (file)
@@ -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"