diff options
67 files changed, 8 insertions, 4921 deletions
diff --git a/.travis.yml b/.travis.yml index f180a446ac..abdfe0807e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,6 @@ env: - CONFIG_OPTS="" - CONFIG_OPTS="--debug no-shared enable-crypto-mdebug enable-rc5 enable-md2" - CONFIG_OPTS="--strict-warnings no-shared" BUILDONLY="yes" - - CONFIG_OPTS="--classic no-shared" BUILDONLY="yes" - - CONFIG_OPTS="--classic" BUILDONLY="yes" - CONFIG_OPTS="no-pic --strict-warnings" BUILDONLY="yes" - CONFIG_OPTS="no-engine no-shared --strict-warnings" BUILDONLY="yes" @@ -60,34 +58,24 @@ matrix: before_script: - sh .travis-create-release.sh $TRAVIS_OS_NAME - tar -xvzf _srcdist.tar.gz - - if echo "$CONFIG_OPTS" | grep -e "--classic" >/dev/null; then - srcdir=.; - cd _srcdist; - else - srcdir=../_srcdist; - mkdir _build; - cd _build; - fi + - mkdir _build; + - cd _build; - if [ "$CC" == i686-w64-mingw32-gcc ]; then export CROSS_COMPILE=${CC%%gcc}; unset CC; - $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format; + ../_srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format; elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then export CROSS_COMPILE=${CC%%gcc}; unset CC; - $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format; + ../_srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format; else if which ccache >/dev/null && [ "$CC" != clang-3.6 ]; then CC="ccache $CC"; fi; - $srcdir/config $CONFIG_OPTS; + ../_srcdir/config $CONFIG_OPTS; fi - cd .. script: - - if echo "$CONFIG_OPTS" | grep -e "--classic" >/dev/null; then - cd _srcdist; - else - cd _build; - fi + - cd _build; - make - if [ -z "$BUILDONLY" ]; then if [ -n "$CROSS_COMPILE" ]; then diff --git a/Configurations/README b/Configurations/README index a5a006e46a..a05e02c097 100644 --- a/Configurations/README +++ b/Configurations/README @@ -99,8 +99,7 @@ In each table entry, the following keys are significant: some options. In this case, the first string in the list is the name of the build scheme. - Currently recognised build schemes are - "unixmake" and "unified". + Currently recognised build scheme is "unified". For the "unified" build scheme, this item *must* be an array with the first being the word "unified" and the second being a word @@ -458,8 +458,6 @@ my $target=""; $config{options}=""; $config{build_type} = "release"; -my $classic = 0; - my @argvcopy=@ARGV; if (grep /^reconf(igure)?$/, @argvcopy) { @@ -644,11 +642,7 @@ foreach (@argvcopy) } elsif (/^[-+]/) { - if (/^--classic$/) - { - $classic=1; - } - elsif (/^--prefix=(.*)$/) + if (/^--prefix=(.*)$/) { $config{prefix}=$1; die "Directory given with --prefix MUST be absolute\n" @@ -904,22 +898,6 @@ $config{shared_ldflag} = ""; $target{build_scheme} = [ $target{build_scheme} ] if ref($target{build_scheme}) ne "ARRAY"; -###### TO BE REMOVED WHEN CLASSIC BUILD IS REMOVED -###### -###### If the user has chosen --classic, we give it to them. -###### If they try that with an out-of-source config, we complain. -if ($target{build_scheme}->[0] eq "unified" && $classic) { - die "Can't perform a classic build out of source tree\n" - if $srcdir ne $blddir; - - $target{build_scheme} = { unix => [ "unixmake" ], - windows => undef, - VMS => undef } -> {$target{build_scheme}->[1]}; - - die "Classic mode unavailable on this platform\n" - unless defined($target{build_scheme}); -} - my ($builder, $builder_platform, @builder_opts) = @{$target{build_scheme}}; diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index baaaf84432..0000000000 --- a/Makefile.in +++ /dev/null @@ -1,798 +0,0 @@ -## -## Makefile for OpenSSL -## -## {- join("\n## ", @autowarntext) -} - -VERSION={- $config{version} -} -MAJOR={- $config{major} -} -MINOR={- $config{minor} -} -SHLIB_VERSION_NUMBER={- $config{shlib_version_number} -} -SHLIB_VERSION_HISTORY={- $config{shlib_version_history} -} -SHLIB_MAJOR={- $config{shlib_major} -} -SHLIB_MINOR={- $config{shlib_minor} -} -SHLIB_EXT={- $target{shared_extension} || ".so" -} -SHLIB_EXT_SIMPLE={- $target{shared_extension_simple} || ".so" -} -SHLIB_EXT_IMPORT={- $target{shared_import_extension} || "" -} -DSO_EXT={- $target{dso_extension} || ".so" -} -PLATFORM={- $config{target} -} -OPTIONS={- $config{options} -} -CONFIGURE_ARGS=({- join(", ",quotify_l(@{$config{perlargv}})) -}) -SHLIB_TARGET={- $target{shared_target} -} - -# HERE indicates where this Makefile lives. This can be used to indicate -# where sub-Makefiles are expected to be. Currently has very limited usage, -# and should probably not be bothered with at all. -HERE=. - -# DESTDIR is for package builders so that they can configure -# for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/. -# Normally it is left empty. -DESTDIR= - -# Do not edit these manually. Use Configure with --prefix or --openssldir -# to change this! Short explanation in the top comment in Configure -INSTALLTOP={- # $prefix is used in the OPENSSLDIR perl snippet - # - our $prefix = $config{prefix} || "/usr/local"; - $prefix -} -OPENSSLDIR={- # - # The logic here is that if no --openssldir was given, - # OPENSSLDIR will get the value from $prefix plus "/ssl". - # If --openssldir was given and the value is an absolute - # path, OPENSSLDIR will get its value without change. - # If the value from --openssldir is a relative path, - # OPENSSLDIR will get $prefix with the --openssldir - # value appended as a subdirectory. - # - use File::Spec::Functions; - our $openssldir = - $config{openssldir} ? - (file_name_is_absolute($config{openssldir}) ? - $config{openssldir} - : catdir($prefix, $config{openssldir})) - : catdir($prefix, "ssl"); - $openssldir -} -LIBDIR={- # - # if $prefix/lib$target{multilib} is not an existing - # directory, then assume that it's not searched by linker - # automatically, in which case adding $target{multilib} suffix - # causes more grief than we're ready to tolerate, so don't... - our $multilib = - -d "$prefix/lib$target{multilib}" ? $target{multilib} : ""; - our $libdir = $config{libdir} || "lib$multilib"; - $libdir -} -ENGINESDIR={- use File::Spec::Functions; - catdir($prefix,$libdir,"engines") -} - -# NO_IDEA - Define to build without the IDEA algorithm -# NO_RC4 - Define to build without the RC4 algorithm -# NO_RC2 - Define to build without the RC2 algorithm -# THREADS - Define when building with threads, you will probably also need any -# system defines as well, i.e. _REENTRANT for Solaris 2.[34] -# TERMIO - Define the termio terminal subsystem, needed if sgtty is missing. -# TERMIOS - Define the termios terminal subsystem, Silicon Graphics. -# LONGCRYPT - Define to use HPUX 10.x's long password modification to crypt(3). -# DEVRANDOM - Give this the value of the 'random device' if your OS supports -# one. 32 bytes will be read from this when the random -# number generator is initalised. -# SSL_FORBID_ENULL - define if you want the server to be not able to use the -# NULL encryption ciphers. -# -# LOCK_DEBUG - turns on lots of lock debug output :-) -# REF_DEBUG - turn on some xyz_free() assertions. -# REF_PRINT - prints some stuff on structure free. -# MFUNC - Make all Malloc/Free/Realloc calls call -# CRYPTO_malloc/CRYPTO_free/CRYPTO_realloc which can be setup to -# call application defined callbacks via CRYPTO_set_mem_functions() -# MD5_ASM needs to be defined to use the x86 assembler for MD5 -# SHA1_ASM needs to be defined to use the x86 assembler for SHA1 -# RMD160_ASM needs to be defined to use the x86 assembler for RIPEMD160 -# Do not define B_ENDIAN or L_ENDIAN if 'unsigned long' == 8. It must -# equal 4. -# PKCS1_CHECK - pkcs1 tests. - -CROSS_COMPILE= {- $config{cross_compile_prefix} -} -CC= $(CROSS_COMPILE){- $target{cc} -} -CFLAG={- our $cflags2 = join(" ",(map { "-D".$_} @{$target{defines}}, @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"") -} {- $target{cflags} -} {- $config{cflags} -} -CFLAG_Q={- $cflags2 =~ s|([\\"])|\\$1|g; $cflags2 -} {- $config{cflags} -} -LDFLAG= {- $target{lflags} -} {- $config{lflags} -} -PLIB_LDFLAG= {- $target{plib_lflags} -} {- $config{plib_lflags} -} -EX_LIBS= {- $target{ex_libs} -} {- $config{ex_libs} -} -EXE_EXT= {- $target{exe_extension} -} -ARFLAGS= {- $target{arflags} -} -AR=$(CROSS_COMPILE){- $target{ar} -} $(ARFLAGS) r -RANLIB= {- $target{ranlib} -} -NM= $(CROSS_COMPILE){- $target{nm} -} -PERL= {- $config{perl} -} -#RM= echo -- -RM= rm -f -TAR= tar -TARFLAGS= --no-recursion -MAKEDEPPROG=$(CROSS_COMPILE){- $config{makedepprog} -} - -# We let the C compiler driver to take care of .s files. This is done in -# order to be excused from maintaining a separate set of architecture -# dependent assembler flags. E.g. if you throw -mcpu=ultrasparc at SPARC -# gcc, then the driver will automatically translate it to -xarch=v8plus -# and pass it down to assembler. -AS=$(CC) -c -ASFLAG=$(CFLAG) - -# For x86 assembler: Set PROCESSOR to 386 if you want to support -# the 80386. -PROCESSOR= {- $config{processor} -} - -# CPUID module collects small commonly used assembler snippets -APPS_OBJ={- $target{apps_obj} -} -CPUID_OBJ= {- $target{cpuid_obj} -} -UPLINK_OBJ= {- $target{uplink_obj} -} -BN_ASM= {- $target{bn_obj} -} -EC_ASM= {- $target{ec_obj} -} -DES_ENC= {- $target{des_obj} -} -AES_ENC= {- $target{aes_obj} -} -BF_ENC= {- $target{bf_obj} -} -CAST_ENC= {- $target{cast_obj} -} -RC4_ENC= {- $target{rc4_obj} -} -RC5_ENC= {- $target{rc5_obj} -} -MD5_ASM_OBJ= {- $target{md5_obj} -} -SHA1_ASM_OBJ= {- $target{sha1_obj} -} -RMD160_ASM_OBJ= {- $target{rmd160_obj} -} -BLAKE2_OBJ= {- $target{blake2_obj} -} -WP_ASM_OBJ= {- $target{wp_obj} -} -CMLL_ENC= {- $target{cmll_obj} -} -MODES_ASM_OBJ= {- $target{modes_obj} -} -PADLOCK_ASM_OBJ= {- $target{padlock_obj} -} -CHACHA_ENC= {- $target{chacha_obj} -} -POLY1305_ASM_OBJ= {- $target{poly1305_obj} -} -PERLASM_SCHEME= {- $target{perlasm_scheme} -} - -# Zlib stuff -ZLIB_INCLUDE={- $withargs{zlib_include} -} -LIBZLIB={- $withargs{zlib_lib} -} - -# This is the location of fipscanister.o and friends. -# The FIPS module build will place it $(INSTALLTOP)/lib -# but since $(INSTALLTOP) can only take the default value -# when the module is built it will be in /usr/local/ssl/lib -# $(INSTALLTOP) for this build may be different so hard -# code the path. - -FIPSLIBDIR={- $config{fipslibdir} -} - -# The location of the library which contains fipscanister.o -# normally it will be libcrypto. If not compiling in FIPS mode -# at all this is empty making it a useful test for a FIPS compile. - -FIPSCANLIB={- $config{fips} ? "libcrypto" : "" -} - -# Shared library base address. Currently only used on Windows. -# - -BASEADDR={- $config{baseaddr} -} - -DIRS= {- join(" ", @{$config{dirs}}) -} -SHLIBDIRS= crypto ssl -INSTALL_SUBS= engines apps tools - -# dirs in crypto to build -SDIRS= {- join(" ", @{$config{sdirs}}) -} - -# tests to perform. "alltests" is a special word indicating that all tests -# should be performed. -TESTS = alltests - -MAKEFILE= Makefile - -MANDIR=$(INSTALLTOP)/share/man -MAN1=1 -MAN3=3 -MANSUFFIX= -HTMLSUFFIX=html -HTMLDIR=$(INSTALLTOP)/share/doc/$(BASENAME)/html -SHELL=/bin/sh - -TOP= . -LIBS= libcrypto.a libssl.a -SHARED_CRYPTO=libcrypto$(SHLIB_EXT) -SHARED_SSL=libssl$(SHLIB_EXT) -SHARED_LIBS={- $disabled{shared} ? '' : '$(SHARED_CRYPTO) $(SHARED_SSL)' -} -SHARED_CFLAG={- $target{shared_cflag} -} -SHARED_LDFLAG={- $target{shared_ldflag}." ".$config{shared_ldflag} - # Unlike other OSes (like Solaris, Linux, Tru64, - # IRIX) BSD run-time linkers (tested OpenBSD, NetBSD - # and FreeBSD) "demand" RPATH set on .so objects. - # Apparently application RPATH is not global and - # does not apply to .so linked with other .so. - # Problem manifests itself when libssl.so fails to - # load libcrypto.so. One can argue that we should - # engrave this into Makefile.shared rules or into - # BSD-* config lines above. Meanwhile let's try to - # be cautious and pass -rpath to linker only when - # $prefix is not /usr. - . ($config{target} =~ m|^BSD-| && $prefix !~ m|^/usr/.*$| - ? " -Wl,-rpath,\$\$(LIBRPATH)" : "") -} -SHARED_RCFLAG={- $target{shared_rcflag} -} -DYNAMIC_ENGINES={- $config{dynamic_engines} -} - -GENERAL= Makefile -BASENAME= openssl -NAME= $(BASENAME)-$(VERSION) -TARFILE= ../$(NAME).tar -HEADER= e_os.h - -# Directories created on install if they don't exist. -INSTALLDIRS= \ - $(DESTDIR)$(INSTALLTOP)/bin \ - $(DESTDIR)$(INSTALLTOP)/$(LIBDIR) \ - $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines \ - $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \ - $(DESTDIR)$(INSTALLTOP)/include/openssl \ - $(DESTDIR)$(OPENSSLDIR)/misc \ - $(DESTDIR)$(OPENSSLDIR)/certs \ - $(DESTDIR)$(OPENSSLDIR)/private - -ENGDIRS={- join(" ", @{$config{engdirs}}) -} - -all: Makefile build_all_but_tests - -# as we stick to -e, CLEARENV ensures that local variables in lower -# Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn -# shell, which [annoyingly enough] terminates unset with error if VAR -# is not present:-( TOP= && unset TOP is tribute to HP-UX /bin/sh, -# which terminates unset with error if no variable was present:-( -CLEARENV= TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS} \ - $${INCLUDE+INCLUDE} $${INCLUDES+INCLUDES} \ - $${DIR+DIR} $${DIRS+DIRS} $${SRC+SRC} \ - $${LIBSRC+LIBSRC} $${LIBOBJ+LIBOBJ} $${ALL+ALL} \ - $${HEADER+HEADER} \ - $${GENERAL+GENERAL} $${CFLAGS+CFLAGS} \ - $${ASFLAGS+ASFLAGS} $${AFLAGS+AFLAGS} \ - $${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS} $${SCRIPTS+SCRIPTS} \ - $${SHAREDCMD+SHAREDCMD} $${SHAREDFLAGS+SHAREDFLAGS} \ - $${SHARED_LIB+SHARED_LIB} $${LIBEXTRAS+LIBEXTRAS} - -# LC_ALL=C ensures that error [and other] messages are delivered in -# same language for uniform treatment. -BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\ - CC='$(CC)' CFLAG='$(CFLAG)' CFLAG_Q='$(CFLAG_Q)' \ - SHARED_CFLAG='$(SHARED_CFLAG)' \ - AS='$(CC)' ASFLAG='$(CFLAG) -c' \ - AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)' \ - CROSS_COMPILE='$(CROSS_COMPILE)' \ - PERL='$(PERL)' DYNAMIC_ENGINES='$(DYNAMIC_ENGINES)' \ - SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)' \ - DESTDIR='$(DESTDIR)' \ - INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)' \ - LIBDIR='$(LIBDIR)' \ - SHARED_LDFLAG='$(SHARED_LDFLAG)' \ - SHARED_RCFLAG='$(SHARED_RCFLAG)' \ - ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)' \ - EXE_EXT='$(EXE_EXT)' SHARED_LIBS='$(SHARED_LIBS)' \ - SHLIB_EXT='$(SHLIB_EXT)' DSO_EXT='$(DSO_EXT)' \ - SHLIB_TARGET='$(SHLIB_TARGET)' \ - LDFLAG='$(LDFLAG)' \ - PLIB_LDFLAG='$(PLIB_LDFLAG)' EX_LIBS='$(EX_LIBS)' \ - APPS_OBJ='$(APPS_OBJ)' UPLINK_OBJ='$(UPLINK_OBJ)' \ - CPUID_OBJ='$(CPUID_OBJ)' BN_ASM='$(BN_ASM)' \ - EC_ASM='$(EC_ASM)' DES_ENC='$(DES_ENC)' \ - AES_ENC='$(AES_ENC)' CMLL_ENC='$(CMLL_ENC)' \ - BF_ENC='$(BF_ENC)' CAST_ENC='$(CAST_ENC)' \ - RC4_ENC='$(RC4_ENC)' RC5_ENC='$(RC5_ENC)' \ - ENGDIRS='$(ENGDIRS)' \ - SHA1_ASM_OBJ='$(SHA1_ASM_OBJ)' \ - MD5_ASM_OBJ='$(MD5_ASM_OBJ)' \ - RMD160_ASM_OBJ='$(RMD160_ASM_OBJ)' \ - BLAKE2_OBJ='$(BLAKE2_OBJ)' \ - WP_ASM_OBJ='$(WP_ASM_OBJ)' \ - MODES_ASM_OBJ='$(MODES_ASM_OBJ)' \ - PADLOCK_ASM_OBJ='$(PADLOCK_ASM_OBJ)' \ - CHACHA_ENC='$(CHACHA_ENC)' \ - POLY1305_ASM_OBJ='$(POLY1305_ASM_OBJ)' \ - PERLASM_SCHEME='$(PERLASM_SCHEME)' \ - FIPSLIBDIR='${FIPSLIBDIR}' \ - FIPSCANLIB="$${FIPSCANLIB:-$(FIPSCANLIB)}" \ - THIS=$${THIS:-$@} MAKEFILE=Makefile MAKEOVERRIDES= -# MAKEOVERRIDES= effectively "equalizes" GNU-ish and SysV-ish make flavors, -# which in turn eliminates ambiguities in variable treatment with -e. - -# BUILD_CMD is a generic macro to build a given target in a given -# subdirectory. The target must be given through the shell variable -# `target' and the subdirectory to build in must be given through `dir'. -# This macro shouldn't be used directly, use RECURSIVE_BUILD_CMD or -# BUILD_ONE_CMD instead. -# -# RECURSIVE_BUILD_CMD is a macro to build a given target in all -# subdirectories defined in $(DIRS). It requires that the target -# is given through the shell variable `target'. -# -# BUILD_ONE_CMD is a macro to build a given target in a given -# subdirectory if that subdirectory is part of $(DIRS). It requires -# exactly the same shell variables as BUILD_CMD. -BUILD_CMD= if [ -d "$$dir" ]; then \ - ( cd $$dir && echo "making $$target in $$dir..." && \ - $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. DIR=$$dir $$target \ - ) || exit 1; \ - fi -RECURSIVE_BUILD_CMD=for dir in $(DIRS); do $(BUILD_CMD); done -BUILD_ONE_CMD=\ - if expr " $(DIRS) " : ".* $$dir " >/dev/null 2>&1; then \ - $(BUILD_CMD); \ - fi - -reflect: - @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV) - -sub_all: build_all - -build_all_but_tests: build_libs build_apps build_tools -build_all: build_all_but_tests build_tests - -build_libs: build_libcrypto build_libssl openssl.pc - -build_libcrypto: build_crypto build_engines libcrypto.pc -build_libssl: build_ssl libssl.pc - -build_crypto: - @dir=crypto; target=all; $(BUILD_ONE_CMD) -build_ssl: build_crypto - @dir=ssl; target=all; $(BUILD_ONE_CMD) -build_engines: build_crypto - @dir=engines; target=all; AS='$(CC) -c'; export AS; $(BUILD_ONE_CMD) - -build_apps: build_libs - @dir=apps; target=all; $(BUILD_ONE_CMD) -build_tests: build_libs - @dir=test; target=all; $(BUILD_ONE_CMD) -build_tools: build_libs - @dir=tools; target=all; $(BUILD_ONE_CMD) - -all_testapps: build_libs build_testapps -build_testapps: - @dir=crypto; target=testapps; $(BUILD_ONE_CMD) - -libcrypto$(SHLIB_EXT): libcrypto.a - @if [ "$(SHLIB_TARGET)" != "" ]; then \ - if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \ - FIPSLD_CC="$(CC)"; CC=fips/fipsld; \ - export CC FIPSLD_CC; \ - fi; \ - $(MAKE) -e SHLIBDIRS=crypto CC="$${CC:-$(CC)}" build-shared; \ - else \ - echo "There's no support for shared libraries on this platform" >&2; \ - exit 1; \ - fi - -libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a - @if [ "$(SHLIB_TARGET)" != "" ]; then \ - $(MAKE) SHLIBDIRS=ssl SHLIBD |