Commit a46c7052 authored by Bodo Moeller's avatar Bodo Moeller
Browse files

Support TLS_FALLBACK_SCSV. 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent dc7bca8b

CHANGES

+6 −0
Original line number Diff line number Diff line
@@ -4,6 +4,12 @@ 


 Changes between 1.0.1i and 1.0.2 [xx XXX xxxx]



  *) Add support for TLS_FALLBACK_SCSV.

     Client applications doing fallback retries should call

     SSL_set_mode(s, SSL_MODE_SEND_FALLBACK_SCSV).

     (CVE-2014-3566)

     [Adam Langley, Bodo Moeller]



  *) Accelerated NIST P-256 elliptic curve implementation for x86_64

     (other platforms pending).

     [Shay Gueron (Intel Corp), Andy Polyakov]

Makefile.org

deleted100644 → 0
+0 −686
Original line number Diff line number Diff line 
##

## Makefile for OpenSSL

##



VERSION=

MAJOR=

MINOR=

SHLIB_VERSION_NUMBER=

SHLIB_VERSION_HISTORY=

SHLIB_MAJOR=

SHLIB_MINOR=

SHLIB_EXT=

PLATFORM=dist

OPTIONS=

CONFIGURE_ARGS=

SHLIB_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=.



# INSTALL_PREFIX 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.

INSTALL_PREFIX=

INSTALLTOP=/usr/local/ssl



# Do not edit this manually. Use Configure --openssldir=DIR do change this!

OPENSSLDIR=/usr/local/ssl



# 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. _REENTERANT 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_CHECK - turn on some xyz_free() assertions.

# REF_PRINT - prints some stuff on structure free.

# CRYPTO_MDEBUG - turns on my 'memory leak' detecting stuff

# 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.



CC= cc

CFLAG= -O

DEPFLAG= 

PEX_LIBS= 

EX_LIBS= 

EXE_EXT= 

ARFLAGS=

AR=ar $(ARFLAGS) r

RANLIB= ranlib

NM= nm

PERL= perl

TAR= tar

TARFLAGS= --no-recursion

MAKEDEPPROG=makedepend

LIBDIR=lib



# 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=



# CPUID module collects small commonly used assembler snippets

CPUID_OBJ= 

BN_ASM= bn_asm.o

EC_ASM=

DES_ENC= des_enc.o fcrypt_b.o

AES_ENC= aes_core.o aes_cbc.o

BF_ENC= bf_enc.o

CAST_ENC= c_enc.o

RC4_ENC= rc4_enc.o

RC5_ENC= rc5_enc.o

MD5_ASM_OBJ= 

SHA1_ASM_OBJ= 

RMD160_ASM_OBJ= 

WP_ASM_OBJ=

CMLL_ENC=

MODES_ASM_OBJ=

ENGINES_ASM_OBJ=

PERLASM_SCHEME=



# KRB5 stuff

KRB5_INCLUDES=

LIBKRB5=



# Zlib stuff

ZLIB_INCLUDE=

LIBZLIB=



# TOP level FIPS install directory.

FIPSDIR=



# 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=



# The location of the library which contains fipscanister.o

# normally it will be libcrypto unless fipsdso is set in which

# case it will be libfips. If not compiling in FIPS mode at all

# this is empty making it a useful test for a FIPS compile.



FIPSCANLIB=



# Shared library base address. Currently only used on Windows.

#



BASEADDR=



DIRS=   crypto ssl engines apps test tools

ENGDIRS= ccgost

SHLIBDIRS= crypto ssl



# dirs in crypto to build

SDIRS=  \

	objects \

	md2 md4 md5 sha mdc2 hmac ripemd whrlpool \

	des aes rc2 rc4 rc5 idea bf cast camellia seed modes \

	bn ec rsa dsa ecdsa dh ecdh dso engine \

	buffer bio stack lhash rand err \

	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \

	cms pqueue ts jpake srp store cmac

# keep in mind that the above list is adjusted by ./Configure

# according to no-xxx arguments...



# tests to perform.  "alltests" is a special word indicating that all tests

# should be performed.

TESTS = alltests



MAKEFILE= Makefile



MANDIR=$(OPENSSLDIR)/man

MAN1=1

MAN3=3

MANSUFFIX=

HTMLSUFFIX=html

HTMLDIR=$(OPENSSLDIR)/html

SHELL=/bin/sh



TOP=    .

ONEDIRS=out tmp

EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep VMS

WDIRS=  windows

LIBS=   libcrypto.a libssl.a

SHARED_CRYPTO=libcrypto$(SHLIB_EXT)

SHARED_SSL=libssl$(SHLIB_EXT)

SHARED_LIBS=

SHARED_LIBS_LINK_EXTS=

SHARED_LDFLAGS=



GENERAL=        Makefile

BASENAME=       openssl

NAME=           $(BASENAME)-$(VERSION)

TARFILE=        $(NAME).tar

WTARFILE=       $(NAME)-win.tar

EXHEADER=       e_os2.h

HEADER=         e_os.h



all: Makefile build_all openssl.pc libssl.pc libcrypto.pc



# 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}	\

		$${EXHEADER+EXHEADER} $${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}



BUILDENV=	PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \

		CC='$(CC)' CFLAG='$(CFLAG)' 			\

		AS='$(CC)' ASFLAG='$(CFLAG) -c'			\

		AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'	\

		CROSS_COMPILE='$(CROSS_COMPILE)'	\

		PERL='$(PERL)' ENGDIRS='$(ENGDIRS)'		\

		SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)'	\

		INSTALL_PREFIX='$(INSTALL_PREFIX)'		\

		INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)'	\

		LIBDIR='$(LIBDIR)'				\

		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \

		DEPFLAG='-DOPENSSL_NO_DEPRECATED $(DEPFLAG)'	\

		MAKEDEPPROG='$(MAKEDEPPROG)'			\

		SHARED_LDFLAGS='$(SHARED_LDFLAGS)'		\

		KRB5_INCLUDES='$(KRB5_INCLUDES)' LIBKRB5='$(LIBKRB5)'	\

		ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)'	\

		EXE_EXT='$(EXE_EXT)' SHARED_LIBS='$(SHARED_LIBS)'	\

		SHLIB_EXT='$(SHLIB_EXT)' SHLIB_TARGET='$(SHLIB_TARGET)'	\

		PEX_LIBS='$(PEX_LIBS)' EX_LIBS='$(EX_LIBS)'	\

		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)'	\

		SHA1_ASM_OBJ='$(SHA1_ASM_OBJ)'			\

		MD5_ASM_OBJ='$(MD5_ASM_OBJ)'			\

		RMD160_ASM_OBJ='$(RMD160_ASM_OBJ)'		\

		WP_ASM_OBJ='$(WP_ASM_OBJ)'			\

		MODES_ASM_OBJ='$(MODES_ASM_OBJ)'		\

		ENGINES_ASM_OBJ='$(ENGINES_ASM_OBJ)'		\

		PERLASM_SCHEME='$(PERLASM_SCHEME)'		\

		FIPSLIBDIR='${FIPSLIBDIR}'			\

		FIPSDIR='${FIPSDIR}'				\

		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.

#

# 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.

#

# 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_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: build_libs build_apps build_tests build_tools



build_libs: build_crypto build_ssl build_engines



build_crypto:

	@dir=crypto; target=all; $(BUILD_ONE_CMD)

build_ssl:

	@dir=ssl; target=all; $(BUILD_ONE_CMD)

build_engines:

	@dir=engines; target=all; $(BUILD_ONE_CMD)

build_apps:

	@dir=apps; target=all; $(BUILD_ONE_CMD)

build_tests:

	@dir=test; target=all; $(BUILD_ONE_CMD)

build_tools:

	@dir=tools; target=all; $(BUILD_ONE_CMD)



all_testapps: build_libs build_testapps

build_testapps:

	@dir=crypto; target=testapps; $(BUILD_ONE_CMD)



fips_premain_dso$(EXE_EXT): libcrypto.a

	[ -z "$(FIPSCANLIB)" ] || $(CC) $(CFLAG) -Iinclude \

		-DFINGERPRINT_PREMAIN_DSO_LOAD -o $@  \

		$(FIPSLIBDIR)fips_premain.c $(FIPSLIBDIR)fipscanister.o \

		libcrypto.a $(EX_LIBS)



libcrypto$(SHLIB_EXT): libcrypto.a fips_premain_dso$(EXE_EXT)

	@if [ "$(SHLIB_TARGET)" != "" ]; then \

		if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \

			FIPSLD_LIBCRYPTO=libcrypto.a ; \

			FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; \

			export CC FIPSLD_CC FIPSLD_LIBCRYPTO; \

		fi; \

		$(MAKE) -e SHLIBDIRS=crypto  CC="$${CC:-$(CC)}" build-shared && \

		(touch -c fips_premain_dso$(EXE_EXT) || :); \

	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 SHLIBDEPS='-lcrypto' build-shared; \

	else \

		echo "There's no support for shared libraries on this platform" >&2; \

		exit 1; \

	fi



clean-shared:

	@set -e; for i in $(SHLIBDIRS); do \

		if [ -n "$(SHARED_LIBS_LINK_EXTS)" ]; then \

			tmp="$(SHARED_LIBS_LINK_EXTS)"; \

			for j in $${tmp:-x}; do \

				( set -x; rm -f lib$$i$$j ); \

			done; \

		fi; \

		( set -x; rm -f lib$$i$(SHLIB_EXT) ); \

		if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \

			( set -x; rm -f cyg$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \

		fi; \

	done



link-shared:

	@ set -e; for i in $(SHLIBDIRS); do \

		$(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \

			LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \

			LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \

			symlink.$(SHLIB_TARGET); \

		libs="$$libs -l$$i"; \

	done



build-shared: do_$(SHLIB_TARGET) link-shared



do_$(SHLIB_TARGET):

	@ set -e; libs='-L. $(SHLIBDEPS)'; for i in $(SHLIBDIRS); do \

		if [ "$$i" = "ssl" -a -n "$(LIBKRB5)" ]; then \

			libs="$(LIBKRB5) $$libs"; \

		fi; \

		$(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \

			LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \

			LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \

			LIBDEPS="$$libs $(EX_LIBS)" \

			link_a.$(SHLIB_TARGET); \

		libs="-l$$i $$libs"; \

	done



libcrypto.pc: Makefile

	@ ( echo 'prefix=$(INSTALLTOP)'; \

	    echo 'exec_prefix=$${prefix}'; \

	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \

	    echo 'includedir=$${prefix}/include'; \

	    echo ''; \

	    echo 'Name: OpenSSL-libcrypto'; \

	    echo 'Description: OpenSSL cryptography library'; \

	    echo 'Version: '$(VERSION); \

	    echo 'Requires: '; \

	    echo 'Libs: -L$${libdir} -lcrypto'; \

	    echo 'Libs.private: $(EX_LIBS)'; \

	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc



libssl.pc: Makefile

	@ ( echo 'prefix=$(INSTALLTOP)'; \

	    echo 'exec_prefix=$${prefix}'; \

	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \

	    echo 'includedir=$${prefix}/include'; \

	    echo ''; \

	    echo 'Name: OpenSSL-libssl'; \

	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \

	    echo 'Version: '$(VERSION); \

	    echo 'Requires.private: libcrypto'; \

	    echo 'Libs: -L$${libdir} -lssl'; \

	    echo 'Libs.private: $(EX_LIBS)'; \

	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc



openssl.pc: Makefile

	@ ( echo 'prefix=$(INSTALLTOP)'; \

	    echo 'exec_prefix=$${prefix}'; \

	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \

	    echo 'includedir=$${prefix}/include'; \

	    echo ''; \

	    echo 'Name: OpenSSL'; \

	    echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \

	    echo 'Version: '$(VERSION); \

	    echo 'Requires: libssl libcrypto' ) > openssl.pc



Makefile: Makefile.org Configure config

	@echo "Makefile is older than Makefile.org, Configure or config."

	@echo "Reconfigure the source tree (via './config' or 'perl Configure'), please."

	@false



libclean:

	rm -f *.map *.so *.so.* *.dylib *.dll engines/*.so engines/*.dll engines/*.dylib *.a engines/*.a */lib */*/lib



clean:	libclean

	rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c

	@set -e; target=clean; $(RECURSIVE_BUILD_CMD)

	rm -f $(LIBS)

	rm -f openssl.pc libssl.pc libcrypto.pc

	rm -f speed.* .pure

	rm -f $(TARFILE)

	@set -e; for i in $(ONEDIRS) ;\

	do \

	rm -fr $$i/*; \

	done



makefile.one: files

	$(PERL) util/mk1mf.pl >makefile.one; \

	sh util/do_ms.sh



files:

	$(PERL) $(TOP)/util/files.pl Makefile > $(TOP)/MINFO

	@set -e; target=files; $(RECURSIVE_BUILD_CMD)



links:

	@$(PERL) $(TOP)/util/mkdir-p.pl include/openssl

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

	@set -e; target=links; $(RECURSIVE_BUILD_CMD)



gentests:

	@(cd test && echo "generating dummy tests (if needed)..." && \

	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on generate );



dclean:

	rm -rf *.bak include/openssl certs/.0

	@set -e; target=dclean; $(RECURSIVE_BUILD_CMD)



rehash: rehash.time

rehash.time: certs apps

	@if [ -z "$(CROSS_COMPILE)" ]; then \

		(OPENSSL="`pwd`/util/opensslwrap.sh"; \

		[ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe" || :; \

		OPENSSL_DEBUG_MEMORY=on; \

		export OPENSSL OPENSSL_DEBUG_MEMORY; \

		$(PERL) tools/c_rehash certs/demo) && \

		touch rehash.time; \

	else :; fi



test:   tests



tests: rehash

	@(cd test && echo "testing..." && \

	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests );

	OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a



report:

	@$(PERL) util/selftest.pl



depend:

	@set -e; target=depend; $(RECURSIVE_BUILD_CMD)



lint:

	@set -e; target=lint; $(RECURSIVE_BUILD_CMD)



tags:

	rm -f TAGS

	find . -name '[^.]*.[ch]' | xargs etags -a



errors:

	$(PERL) util/ck_errf.pl -strict */*.c */*/*.c

	$(PERL) util/mkerr.pl -recurse -write

	(cd engines; $(MAKE) PERL=$(PERL) errors)



stacks:

	$(PERL) util/mkstack.pl -write



util/libeay.num::

	$(PERL) util/mkdef.pl crypto update



util/ssleay.num::

	$(PERL) util/mkdef.pl ssl update



crypto/objects/obj_dat.h: crypto/objects/obj_dat.pl crypto/objects/obj_mac.h

	$(PERL) crypto/objects/obj_dat.pl crypto/objects/obj_mac.h crypto/objects/obj_dat.h

crypto/objects/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num

	$(PERL) crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num crypto/objects/obj_mac.h

crypto/objects/obj_xref.h: crypto/objects/objxref.pl crypto/objects/obj_xref.txt crypto/objects/obj_mac.num

	$(PERL) crypto/objects/objxref.pl crypto/objects/obj_mac.num crypto/objects/obj_xref.txt >crypto/objects/obj_xref.h



apps/openssl-vms.cnf: apps/openssl.cnf

	$(PERL) VMS/VMSify-conf.pl < apps/openssl.cnf > apps/openssl-vms.cnf



crypto/bn/bn_prime.h: crypto/bn/bn_prime.pl

	$(PERL) crypto/bn/bn_prime.pl >crypto/bn/bn_prime.h





TABLE: Configure

	(echo 'Output of `Configure TABLE'"':"; \

	$(PERL) Configure TABLE) > TABLE



update: errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h crypto/objects/obj_xref.h apps/openssl-vms.cnf crypto/bn/bn_prime.h TABLE depend



# Build distribution tar-file. As the list of files returned by "find" is

# pretty long, on several platforms a "too many arguments" error or similar

# would occur. Therefore the list of files is temporarily stored into a file

# and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal

# tar does not support the --files-from option.

tar:

	find . -type d -print | xargs chmod 755

	find . -type f -print | xargs chmod a+r

	find . -type f -perm -0100 -print | xargs chmod a+x

	find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \

	$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \

	tardy --user_number=0  --user_name=openssl \

	      --group_number=0 --group_name=openssl \

	      --prefix=openssl-$(VERSION) - |\

	gzip --best >../$(TARFILE).gz; \

	rm -f ../$(TARFILE).list; \

	ls -l ../$(TARFILE).gz



tar-snap:

	@$(TAR) $(TARFLAGS) -cvf - \

		`find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \! -name '*test' \! -name '.#*' \! -name '*~' | sort` |\

	tardy --user_number=0  --user_name=openssl \

	      --group_number=0 --group_name=openssl \

	      --prefix=openssl-$(VERSION) - > ../$(TARFILE);\

	ls -l ../$(TARFILE)



dist:   

	$(PERL) Configure dist

	@$(MAKE) dist_pem_h

	@$(MAKE) SDIRS='$(SDIRS)' clean

	@$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' tar



dist_pem_h:

	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)



install: all install_docs install_sw



install_sw:

	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \

		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \

		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \

		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \

		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \

		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \

		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \

		$(INSTALL_PREFIX)$(OPENSSLDIR)/private

	@set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\

	do \

	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \

	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \

	done;

	@set -e; target=install; $(RECURSIVE_BUILD_CMD)

	@set -e; liblist="$(LIBS)"; for i in $$liblist ;\

	do \

		if [ -f "$$i" ]; then \

		(       echo installing $$i; \

			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \

			$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \

			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \

			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \

		fi; \

	done;

	@set -e; if [ -n "$(SHARED_LIBS)" ]; then \

		tmp="$(SHARED_LIBS)"; \

		for i in $${tmp:-x}; \

		do \

			if [ -f "$$i" -o -f "$$i.a" ]; then \

			(       echo installing $$i; \

				if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \

					c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \

					cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \

					chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \

					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \

					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \

					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \

					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \

				else \

					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \

					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \

					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \

				fi ); \

				if expr $(PLATFORM) : 'mingw' > /dev/null; then \

				(	case $$i in \

						*crypto*) i=libeay32.dll;; \

						*ssl*)    i=ssleay32.dll;; \

					esac; \

					echo installing $$i; \

	 				cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \

	 				chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \

	 				mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i ); \

				fi; \

			fi; \

		done; \

		(	here="`pwd`"; \

			cd $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR); \

			$(MAKE) -f $$here/Makefile HERE="$$here" link-shared ); \

		if [ "$(INSTALLTOP)" != "/usr" ]; then \

			echo 'OpenSSL shared libraries have been installed in:'; \

			echo '  $(INSTALLTOP)'; \

			echo ''; \

			sed -e '1,/^$$/d' doc/openssl-shared.txt; \

		fi; \

	fi

	cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig

	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc

	cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig

	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc

	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig

	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc



install_html_docs:

	here="`pwd`"; \

	filecase=; \

	case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \

		filecase=-i; \

	esac; \

	for subdir in apps crypto ssl; do \

		mkdir -p $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir; \

		for i in doc/$$subdir/*.pod; do \

			fn=`basename $$i .pod`; \

			echo "installing html/$$fn.$(HTMLSUFFIX)"; \

			cat $$i \

			| sed -r 's/L<([^)]*)(\([0-9]\))?\|([^)]*)(\([0-9]\))?>/L<\1|\3>/g' \

			| pod2html --podroot=doc --htmlroot=.. --podpath=apps:crypto:ssl \

			| sed -r 's/<!DOCTYPE.*//g' \

			> $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir/$$fn.$(HTMLSUFFIX); \

			$(PERL) util/extract-names.pl < $$i | \

				grep -v $$filecase "^$$fn\$$" | \

				(cd $(INSTALL_PREFIX)$(HTMLDIR)/$$subdir; \

				 while read n; do \

					PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$(HTMLSUFFIX) "$$n".$(HTMLSUFFIX); \

				 done); \

		done; \

	done



install_docs:

	@$(PERL) $(TOP)/util/mkdir-p.pl \

		$(INSTALL_PREFIX)$(MANDIR)/man1 \

		$(INSTALL_PREFIX)$(MANDIR)/man3 \

		$(INSTALL_PREFIX)$(MANDIR)/man5 \

		$(INSTALL_PREFIX)$(MANDIR)/man7

	@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \

	here="`pwd`"; \

	filecase=; \

	case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \

		filecase=-i; \

	esac; \

	set -e; for i in doc/apps/*.pod; do \

		fn=`basename $$i .pod`; \

		sec=`$(PERL) util/extract-section.pl 1 < $$i`; \

		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \

		(cd `$(PERL) util/dirname.pl $$i`; \

		sh -c "$$pod2man \

			--section=$$sec --center=OpenSSL \

			--release=$(VERSION) `basename $$i`") \

			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \

		$(PERL) util/extract-names.pl < $$i | \

			(grep -v $$filecase "^$$fn\$$"; true) | \

			(grep -v "[	]"; true) | \

			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \

			 while read n; do \

				PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \

			 done); \

	done; \

	set -e; for i in doc/crypto/*.pod doc/ssl/*.pod; do \

		fn=`basename $$i .pod`; \

		sec=`$(PERL) util/extract-section.pl 3 < $$i`; \

		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \

		(cd `$(PERL) util/dirname.pl $$i`; \

		sh -c "$$pod2man \

			--section=$$sec --center=OpenSSL \

			--release=$(VERSION) `basename $$i`") \

			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \

		$(PERL) util/extract-names.pl < $$i | \

			(grep -v $$filecase "^$$fn\$$"; true) | \

			(grep -v "[	]"; true) | \

			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \

			 while read n; do \

				PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \

			 done); \

	done



# DO NOT DELETE THIS LINE -- make depend depends on it.

apps/s_client.c

+10 −0

File changed.

Preview size limit exceeded, changes collapsed.

crypto/err/openssl.ec

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ R SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION 1060 
R SSL_R_TLSV1_ALERT_PROTOCOL_VERSION		1070

R SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY	1071

R SSL_R_TLSV1_ALERT_INTERNAL_ERROR		1080

R SSL_R_SSLV3_ALERT_INAPPROPRIATE_FALLBACK	1086

R SSL_R_TLSV1_ALERT_USER_CANCELLED		1090

R SSL_R_TLSV1_ALERT_NO_RENEGOTIATION		1100

R SSL_R_TLSV1_UNSUPPORTED_EXTENSION		1110

ssl/d1_lib.c

+19 −0

File changed.

Preview size limit exceeded, changes collapsed.