Commit 198c42f5 authored by Pauli's avatar Pauli
Browse files

Move OPENSSL_CONF from e_os.h to cryptlib.h 



Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4188)
parent 07016a8a

apps/openssl.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 * https://www.openssl.org/source/license.html

 */



#include <internal/cryptlib.h>

#include <stdio.h>

#include <string.h>

#include <stdlib.h>

e_os.h

+0 −2
Original line number Diff line number Diff line
@@ -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

include/internal/cryptlib.h

+2 −0
Original line number Diff line number Diff line
@@ -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"

ssl/statem/statem.c

+1 −1
Original line number Diff line number Diff line
@@ -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"