diff options
| author | Pauli <paul.dale@oracle.com> | 2017-08-24 09:14:10 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2017-08-30 07:20:44 +1000 |
| commit | 198c42f5af0d2cc0eb4789c7597b68b6b10cc97a (patch) | |
| tree | 2743404f5671bb169e363f101f7ac4e44ddc27a4 | |
| parent | 07016a8a3174db5caf07182930533cf88ad9b0ad (diff) | |
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)
| -rw-r--r-- | apps/openssl.c | 1 | ||||
| -rw-r--r-- | e_os.h | 2 | ||||
| -rw-r--r-- | include/internal/cryptlib.h | 2 | ||||
| -rw-r--r-- | ssl/statem/statem.c | 2 |
4 files changed, 4 insertions, 3 deletions
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> @@ -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" |