diff options
63 files changed, 72 insertions, 1024 deletions
diff --git a/Makefile.org b/Makefile.org index 5e510f279d..de08a47c20 100644 --- a/Makefile.org +++ b/Makefile.org @@ -181,7 +181,6 @@ BASENAME= openssl NAME= $(BASENAME)-$(VERSION) TARFILE= $(NAME).tar WTARFILE= $(NAME)-win.tar -EXHEADER= e_os2.h HEADER= e_os.h # Directories created on install if they don't exist. @@ -206,7 +205,7 @@ CLEARENV= TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS} \ $${INCLUDE+INCLUDE} $${INCLUDES+INCLUDES} \ $${DIR+DIR} $${DIRS+DIRS} $${SRC+SRC} \ $${LIBSRC+LIBSRC} $${LIBOBJ+LIBOBJ} $${ALL+ALL} \ - $${EXHEADER+EXHEADER} $${HEADER+HEADER} \ + $${HEADER+HEADER} \ $${GENERAL+GENERAL} $${CFLAGS+CFLAGS} \ $${ASFLAGS+ASFLAGS} $${AFLAGS+AFLAGS} \ $${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS} $${SCRIPTS+SCRIPTS} \ diff --git a/apps/Makefile b/apps/Makefile index ac2663aefe..25e197fb46 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -68,12 +68,10 @@ E_SRC= verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c ca. SRC=$(E_SRC) -EXHEADER= HEADER= apps.h progs.h s_apps.h \ - testdsa.h testrsa.h \ - $(EXHEADER) + testdsa.h testrsa.h -ALL= $(GENERAL) $(SRC) $(HEADER) +ALL= $(GENERAL) $(SRC) $(HEADER) top: @(cd ..; $(MAKE) DIRS=$(DIR) all) @@ -135,8 +133,6 @@ tags: tests: -links: - lint: lint -DLINT $(INCLUDES) $(SRC)>fluff diff --git a/crypto/Makefile b/crypto/Makefile index 5eddc5ad6c..ec5af47a37 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -31,7 +31,6 @@ CPUID_OBJ=mem_clr.o LIBS= GENERAL=Makefile README crypto-lib.com install.com -TEST=constant_time_test.c LIB= $(TOP)/libcrypto.a SHARED_LIB= libcrypto$(SHLIB_EXT) @@ -44,12 +43,10 @@ LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o \ SRC= $(LIBSRC) -EXHEADER= crypto.h opensslv.h opensslconf.h ebcdic.h symhacks.h \ - ossl_typ.h HEADER= cryptlib.h buildinf.h md32_common.h o_str.h o_dir.h \ - constant_time_locl.h $(EXHEADER) + constant_time_locl.h -ALL= $(GENERAL) $(SRC) $(HEADER) +ALL= $(GENERAL) $(SRC) $(HEADER) top: @(cd ..; $(MAKE) DIRS=$(DIR) all) @@ -95,12 +92,6 @@ files: $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO @target=files; $(RECURSIVE_MAKE) -links: - @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS) - @target=links; $(RECURSIVE_MAKE) - # lib: $(LIB): are splitted to avoid end-less loop lib: $(LIB) @touch lib @@ -116,17 +107,6 @@ shared: buildinf.h lib subdirs libs: @target=lib; $(RECURSIVE_MAKE) -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ;\ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - @target=install; $(RECURSIVE_MAKE) - -uninstall: - lint: @target=lint; $(RECURSIVE_MAKE) diff --git a/crypto/aes/Makefile b/crypto/aes/Makefile index 2defcb195f..5c3b2d38fb 100644 --- a/crypto/aes/Makefile +++ b/crypto/aes/Makefile @@ -18,9 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile -#TEST=aestest.c -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=aes_core.c aes_misc.c aes_ecb.c aes_cbc.c aes_cfb.c aes_ofb.c \ @@ -30,8 +27,7 @@ LIBOBJ=aes_misc.o aes_ecb.o aes_cfb.o aes_ofb.o aes_ige.o aes_wrap.o \ SRC= $(LIBSRC) -EXHEADER= aes.h -HEADER= aes_locl.h $(EXHEADER) +HEADER= aes_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -104,19 +100,6 @@ bsaes-armv7.o: bsaes-armv7.S files: $(PERL) $(TOP)/util/files.pl "AES_ENC=$(AES_ENC)" Makefile >> $(TOP)/MINFO -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - tags: ctags $(SRC) diff --git a/crypto/asn1/Makefile b/crypto/asn1/Makefile index 2a15f16450..ff5e3ba679 100644 --- a/crypto/asn1/Makefile +++ b/crypto/asn1/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile README -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \ @@ -48,8 +46,7 @@ LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \ SRC= $(LIBSRC) -EXHEADER= asn1.h asn1_mac.h asn1t.h -HEADER= $(EXHEADER) asn1_locl.h +HEADER= asn1_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -74,19 +71,6 @@ lib: $(LIBOBJ) files: $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - tags: ctags $(SRC) diff --git a/crypto/bf/Makefile b/crypto/bf/Makefile index dd2c2c708e..928e94d326 100644 --- a/crypto/bf/Makefile +++ b/crypto/bf/Makefile @@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile -TEST=bftest.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=bf_skey.c bf_ecb.c bf_enc.c bf_cfb64.c bf_ofb64.c @@ -27,8 +25,7 @@ LIBOBJ=bf_skey.o bf_ecb.o $(BF_ENC) bf_cfb64.o bf_ofb64.o SRC= $(LIBSRC) -EXHEADER= blowfish.h -HEADER= bf_pi.h bf_locl.h $(EXHEADER) +HEADER= bf_pi.h bf_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -48,22 +45,6 @@ bf-586.s: asm/bf-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl files: $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -# We need to use force because 'install' matches 'INSTALL' on case -# insensitive systems -FRC.install: -install: FRC.install - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - tags: ctags $(SRC) diff --git a/crypto/bio/Makefile b/crypto/bio/Makefile index c395d80496..5477ffb480 100644 --- a/crypto/bio/Makefile +++ b/crypto/bio/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= bio_lib.c bio_cb.c bio_err.c \ @@ -34,8 +32,7 @@ LIBOBJ= bio_lib.o bio_cb.o bio_err.o \ SRC= $(LIBSRC) -EXHEADER= bio.h -HEADER= bio_lcl.h $(EXHEADER) +HEADER= bio_lcl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -52,19 +49,6 @@ lib: $(LIBOBJ) files: $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - tags: ctags $(SRC) diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile index d1019c9f73..5b45f11851 100644 --- a/crypto/bn/Makefile +++ b/crypto/bn/Makefile @@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile -TEST=bntest.c exptest.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c bn_mod.c \ @@ -36,8 +34,7 @@ LIBOBJ= bn_add.o bn_div.o bn_exp.o bn_lib.o bn_ctx.o bn_mul.o bn_mod.o \ SRC= $(LIBSRC) -EXHEADER= bn.h -HEADER= bn_lcl.h bn_prime.h $(EXHEADER) +HEADER= bn_lcl.h bn_prime.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -148,19 +145,6 @@ armv4-gf2m.o: armv4-gf2m.S files: $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - div: rm -f a.out gcc -I.. -g div.c ../../libcrypto.a diff --git a/crypto/buffer/Makefile b/crypto/buffer/Makefile index 2efba47f07..d87738ccb2 100644 --- a/crypto/buffer/Makefile +++ b/crypto/buffer/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= buffer.c buf_str.c buf_err.c @@ -22,8 +20,7 @@ LIBOBJ= buffer.o buf_str.o buf_err.o SRC= $(LIBSRC) -EXHEADER= buffer.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -40,19 +37,6 @@ lib: $(LIBOBJ) files: $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - tags: ctags $(SRC) diff --git a/crypto/camellia/Makefile b/crypto/camellia/Makefile index a5b983b6cb..2602dbf965 100644 --- a/crypto/camellia/Makefile +++ b/crypto/camellia/Makefile @@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile -#TEST=camelliatest.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=camellia.c cmll_misc.c cmll_ecb.c cmll_cbc.c cmll_ofb.c \ @@ -29,8 +27,7 @@ LIBOBJ= cmll_ecb.o cmll_ofb.o cmll_cfb.o cmll_ctr.o $(CMLL_ENC) SRC= $(LIBSRC) -EXHEADER= camellia.h -HEADER= cmll_locl.h $(EXHEADER) +HEADER= cmll_locl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -54,19 +51,6 @@ cmllt4-sparcv9.s: asm/cmllt4-sparcv9.pl ../perlasm/sparcv9_modes.pl files: $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - tags: ctags $(SRC) diff --git a/crypto/cast/Makefile b/crypto/cast/Makefile index 0acc38f28d..08d24b04fb 100644 --- a/crypto/cast/Makefile +++ b/crypto/cast/Makefile @@ -18,8 +18,6 @@ ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) GENERAL=Makefile -TEST=casttest.c -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c @@ -27,8 +25,7 @@ LIBOBJ=c_skey.o c_ecb.o $(CAST_ENC) c_cfb64.o c_ofb64.o SRC= $(LIBSRC) -EXHEADER= cast.h -HEADER= cast_s.h cast_lcl.h $(EXHEADER) +HEADER= cast_s.h cast_lcl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -48,19 +45,6 @@ cast-586.s: asm/cast-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl files: $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - tags: ctags $(SRC) diff --git a/crypto/cmac/Makefile b/crypto/cmac/Makefile index 2e92a14fae..87a20fcdd9 100644 --- a/crypto/cmac/Makefile +++ b/crypto/cmac/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC=cmac.c cm_ameth.c cm_pmeth.c @@ -22,8 +20,7 @@ LIBOBJ=cmac.o cm_ameth.o cm_pmeth.o SRC= $(LIBSRC) -EXHEADER= cmac.h -HEADER= $(EXHEADER) +HEADER= ALL= $(GENERAL) $(SRC) $(HEADER) @@ -40,19 +37,6 @@ lib: $(LIBOBJ) files: $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - tags: ctags $(SRC) diff --git a/crypto/cms/Makefile b/crypto/cms/Makefile index b767e250ad..47aec7cc2b 100644 --- a/crypto/cms/Makefile +++ b/crypto/cms/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile -TEST= -APPS= LIB=$(TOP)/libcrypto.a LIBSRC= cms_lib.c cms_asn1.c cms_att.c cms_io.c cms_smime.c cms_err.c \ @@ -26,8 +24,7 @@ LIBOBJ= cms_lib.o cms_asn1.o cms_att.o cms_io.o cms_smime.o cms_err.o \ SRC= $(LIBSRC) -EXHEADER= cms.h -HEADER= cms_lcl.h $(EXHEADER) +HEADER= cms_lcl.h ALL= $(GENERAL) $(SRC) $(HEADER) @@ -46,19 +43,6 @@ lib: $(LIBOBJ) files: $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO -links: - @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) - @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) - @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) - -install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... - @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; - tags: ctags $(SRC) diff --git a/crypto/comp/Makefile b/crypto/comp/Makefile index efda832dce..4d1ef529f5 100644 --- a/crypto/comp/Makefile +++ b/crypto/comp/Makefile @@ -13,8 +13,6 @@ AR= ar r CFLAGS= $(INCLUDES) $(CFLAG) |