Commit ec577822 authored by Bodo Möller's avatar Bodo Möller
Browse files

Change #include filenames from <foo.h> to <openssl.h>. 

Submitted by:
Reviewed by:
PR:
parent 80611577

Configure

+25 −0
Original line number Diff line number Diff line
@@ -542,6 +542,31 @@ if($IsWindows) { 


system 'make -f Makefile.ssl links' if !$IsWindows;



my $pwd=`pwd`;

chop($pwd);

print <<EOF;



NOTE: The OpenSSL header files have been moved from include/*.h

to include/openssl/*.h.  To include OpenSSL header files, now

directives of the form

     #include <openssl/foo.h>

should be used instead of #include <foo.h>.

These new file locations allow installing the OpenSSL header

files in /usr/local/include/openssl/ and should help avoid

conflicts with other libraries.



To compile programs that use the old form <foo.h>,

usually an additional compiler option will suffice: E.g., add

     -I/usr/local/include/openssl

or

     -I$pwd/include/openssl

to the CFLAGS in the Makefile of the program that you want to compile.



Please make sure that no old OpenSSL header files are around:

The include directory should now be empty except for the openssl

subdirectory.

EOF



exit(0);



sub bad_target

Makefile.org

+3 −1
Original line number Diff line number Diff line
@@ -215,7 +215,8 @@ files: 


links:

	@$(TOP)/util/point.sh Makefile.ssl Makefile

	@$(TOP)/util/mklink.sh include $(EXHEADER)

	@-mkdir -p include/openssl 2>/dev/null

	@$(TOP)/util/mklink.sh include/openssl $(EXHEADER)

	@for i in $(DIRS); do \

	(cd $$i && echo "making links in $$i..." && \

	$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' links ) || exit 1; \
@@ -290,6 +291,7 @@ install: all 
	@-mkdir -p $(INSTALLTOP)/bin 2>/dev/null

	@-mkdir -p $(INSTALLTOP)/lib 2>/dev/null

	@-mkdir -p $(INSTALLTOP)/include 2>/dev/null

	@-mkdir -p $(INSTALLTOP)/include/openssl 2>/dev/null

	@-mkdir -p $(INSTALLTOP)/certs 2>/dev/null

	@-mkdir -p $(INSTALLTOP)/private 2>/dev/null

	@for i in $(DIRS) ;\

apps/apps.h

+5 −5
Original line number Diff line number Diff line
@@ -59,11 +59,11 @@ 
#ifndef HEADER_APPS_H

#define HEADER_APPS_H



#include "e_os.h"

#include <openssl/e_os.h>



#include "buffer.h"

#include "bio.h"

#include "crypto.h"

#include <openssl/buffer.h>

#include <openssl/bio.h>

#include <openssl/crypto.h>

#include "progs.h"



#ifdef NO_STDIO
@@ -88,7 +88,7 @@ extern BIO *bio_err; 
#else



#define MAIN(a,v)	PROG(a,v)

#include "conf.h"

#include <openssl/conf.h>

extern LHASH *config;

extern char *default_config_file;

extern BIO *bio_err;

apps/asn1pars.c

+4 −4
Original line number Diff line number Diff line
@@ -64,10 +64,10 @@ 
#include <stdlib.h>

#include <string.h>

#include "apps.h"

#include "err.h"

#include "evp.h"

#include "x509.h"

#include "pem.h"

#include <openssl/err.h>

#include <openssl/evp.h>

#include <openssl/x509.h>

#include <openssl/pem.h>



/* -inform arg	- input format - default PEM (DER or PEM)

 * -in arg	- input file - default stdin

apps/ca.c

+10 −10
Original line number Diff line number Diff line
@@ -64,16 +64,16 @@ 
#include <sys/types.h>

#include <sys/stat.h>

#include "apps.h"

#include "conf.h"

#include "bio.h"

#include "err.h"

#include "bn.h"

#include "txt_db.h"

#include "evp.h"

#include "x509.h"

#include "x509v3.h"

#include "objects.h"

#include "pem.h"

#include <openssl/conf.h>

#include <openssl/bio.h>

#include <openssl/err.h>

#include <openssl/bn.h>

#include <openssl/txt_db.h>

#include <openssl/evp.h>

#include <openssl/x509.h>

#include <openssl/x509v3.h>

#include <openssl/objects.h>

#include <openssl/pem.h>



#ifndef W_OK

#include <sys/file.h>