Upgrade chrome's OpenSSL to same version Android ships with.

openssl/Makefile.org

 ##
 ## Makefile for OpenSSL
 ##
 
 VERSION=
 MAJOR=
 MINOR=
 SHLIB_VERSION_NUMBER=
 SHLIB_VERSION_HISTORY=
 SHLIB_MAJOR=
@@ skipping 47 matching lines @@
 # PKCS1_CHECK - pkcs1 tests.
 
 CC= cc
 CFLAG= -O
 DEPFLAG= 
 PEX_LIBS= 
 EX_LIBS= 
 EXE_EXT= 
 ARFLAGS=
 AR=ar $(ARFLAGS) r
-ARD=ar $(ARFLAGS) d
 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
 DES_ENC= des_enc.o fcrypt_b.o
-AES_ASM_OBJ=aes_core.o aes_cbc.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=
+PERLASM_SCHEME=
 
 # KRB5 stuff
 KRB5_INCLUDES=
 LIBKRB5=
 
 # Zlib stuff
 ZLIB_INCLUDE=
 LIBZLIB=
 
-# 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 make be different so hard
-# code the path.
-
-FIPSLIBDIR=/usr/local/ssl/$(LIBDIR)/
-
-# This is set to "y" if fipscanister.o is compiled internally as
-# opposed to coming from an external validated location.
-
-FIPSCANISTERINTERNAL=n
-
-# 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 fips ssl engines apps test tools
-SHLIBDIRS= crypto ssl fips
+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 \
-        des aes rc2 rc4 rc5 idea bf cast camellia seed \
+        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 \
-        store cms pqueue jpake
+        cms pqueue ts jpake store
 # 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_FIPS=
 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
@@ skipping 10 matching lines @@
                 $${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}             \
                 $${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}' PERL='${PERL}' RANLIB='${RANLIB}'    \
-                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}'   \
-                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}' DES_ENC='${DES_ENC}'         \
-                AES_ASM_OBJ='${AES_ASM_OBJ}'                    \
-                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}'              \
-                FIPSLIBDIR='${FIPSLIBDIR}'                      \
-                FIPSCANLIB="$${FIPSCANLIB:-$(FIPSCANLIB)}"      \
-                FIPSCANISTERINTERNAL='${FIPSCANISTERINTERNAL}'  \
-                FIPS_EX_OBJ='${FIPS_EX_OBJ}'    \
+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)' 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)'                      \
+                PERLASM_SCHEME='$(PERLASM_SCHEME)'              \
                 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 \
-            (   [ $$target != all -a -z "$(FIPSCANLIB)" ] && FIPSCANLIB=/dev/null; \
-                cd $$dir && echo "making $$target in $$dir..." && \
+            (   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 echo " $(DIRS) " | grep " $$dir " >/dev/null 2>/dev/null; then \
+        if expr " $(DIRS) " : ".* $$dir " >/dev/null 2>&1; then \
                 $(BUILD_CMD); \
         fi
 
 reflect:
         @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
 
-FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
-        ../crypto/aes/aes_ecb.o \
-        ../crypto/aes/aes_ofb.o \
-        ../crypto/bn/bn_add.o \
-        ../crypto/bn/bn_blind.o \
-        ../crypto/bn/bn_ctx.o \
-        ../crypto/bn/bn_div.o \
-        ../crypto/bn/bn_exp2.o \
-        ../crypto/bn/bn_exp.o \
-        ../crypto/bn/bn_gcd.o \
-        ../crypto/bn/bn_lib.o \
-        ../crypto/bn/bn_mod.o \
-        ../crypto/bn/bn_mont.o \
-        ../crypto/bn/bn_mul.o \
-        ../crypto/bn/bn_prime.o \
-        ../crypto/bn/bn_rand.o \
-        ../crypto/bn/bn_recp.o \
-        ../crypto/bn/bn_shift.o \
-        ../crypto/bn/bn_sqr.o \
-        ../crypto/bn/bn_word.o \
-        ../crypto/bn/bn_x931p.o \
-        ../crypto/buffer/buf_str.o \
-        ../crypto/cryptlib.o \
-        ../crypto/des/cfb64ede.o \
-        ../crypto/des/cfb64enc.o \
-        ../crypto/des/cfb_enc.o \
-        ../crypto/des/ecb3_enc.o \
-        ../crypto/des/ecb_enc.o \
-        ../crypto/des/ofb64ede.o \
-        ../crypto/des/ofb64enc.o \
-        ../crypto/des/fcrypt.o \
-        ../crypto/des/set_key.o \
-        ../crypto/dsa/dsa_utl.o \
-        ../crypto/dsa/dsa_sign.o \
-        ../crypto/dsa/dsa_vrf.o \
-        ../crypto/err/err.o \
-        ../crypto/evp/digest.o \
-        ../crypto/evp/enc_min.o \
-        ../crypto/evp/e_aes.o \
-        ../crypto/evp/e_des3.o \
-        ../crypto/evp/p_sign.o \
-        ../crypto/evp/p_verify.o \
-        ../crypto/mem_clr.o \
-        ../crypto/mem.o \
-        ../crypto/rand/md_rand.o \
-        ../crypto/rand/rand_egd.o \
-        ../crypto/rand/randfile.o \
-        ../crypto/rand/rand_lib.o \
-        ../crypto/rand/rand_os2.o \
-        ../crypto/rand/rand_unix.o \
-        ../crypto/rand/rand_win.o \
-        ../crypto/rsa/rsa_lib.o \
-        ../crypto/rsa/rsa_none.o \
-        ../crypto/rsa/rsa_oaep.o \
-        ../crypto/rsa/rsa_pk1.o \
-        ../crypto/rsa/rsa_pss.o \
-        ../crypto/rsa/rsa_ssl.o \
-        ../crypto/rsa/rsa_x931.o \
-        ../crypto/sha/sha1dgst.o \
-        ../crypto/sha/sha256.o \
-        ../crypto/sha/sha512.o \
-        ../crypto/uid.o
-
 sub_all: build_all
 build_all: build_libs build_apps build_tests build_tools
 
-build_libs: build_crypto build_fips build_ssl build_shared build_engines
+build_libs: build_crypto build_ssl build_engines
 
 build_crypto:
-        if [ -n "$(FIPSCANLIB)" ]; then \
-                EXCL_OBJ='$(AES_ASM_OBJ) $(BN_ASM) $(DES_ENC) $(CPUID_OBJ) $(SHA1_ASM_OBJ) $(FIPS_EX_OBJ)' ; export EXCL_OBJ ; \
-                ARX='$(PERL) $${TOP}/util/arx.pl $(AR)' ; \
-        else \
-                ARX='${AR}' ; \
-        fi ; export ARX ; \
-                dir=crypto; target=all; $(BUILD_ONE_CMD)
-build_fips:
-        @dir=fips; target=all; [ -z "$(FIPSCANLIB)" ] || $(BUILD_ONE_CMD)
-build_ssl: build_crypto
+        @dir=crypto; target=all; $(BUILD_ONE_CMD)
+build_ssl:
         @dir=ssl; target=all; $(BUILD_ONE_CMD)
-build_engines: build_crypto
+build_engines:
         @dir=engines; target=all; $(BUILD_ONE_CMD)
-build_apps: build_libs
+build_apps:
         @dir=apps; target=all; $(BUILD_ONE_CMD)
-build_tests: build_libs
+build_tests:
         @dir=test; target=all; $(BUILD_ONE_CMD)
-build_tools: build_libs
+build_tools:
         @dir=tools; target=all; $(BUILD_ONE_CMD)
 
 all_testapps: build_libs build_testapps
 build_testapps:
         @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
 
-build_shared:   $(SHARED_LIBS)
-libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS)
+libcrypto$(SHLIB_EXT): libcrypto.a
         @if [ "$(SHLIB_TARGET)" != "" ]; then \
-                if [ "$(FIPSCANLIB)" = "libfips" ]; then \
-                        $(ARD) libcrypto.a fipscanister.o ; \
-                        $(MAKE) SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \
-                        $(AR) libcrypto.a fips/fipscanister.o ; \
-                else \
-                        if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
-                                FIPSLD_CC="$(CC)"; CC=fips/fipsld; \
-                                export CC FIPSLD_CC; \
-                        fi; \
-                        $(MAKE) -e SHLIBDIRS='crypto' build-shared; \
-                fi \
+                $(MAKE) SHLIBDIRS=crypto 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 \
-                shlibdeps=-lcrypto; \
-                [ "$(FIPSCANLIB)" = "libfips" ] && shlibdeps="$$shlibdeps -lfips"; \
-                $(MAKE) SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \
-        else \
-                echo "There's no support for shared libraries on this platform" >&2 ; \
-                exit 1; \
-        fi
-
-fips/fipscanister.o:    build_fips
-libfips$(SHLIB_EXT):            fips/fipscanister.o
-        @if [ "$(SHLIB_TARGET)" != "" ]; then \
-                FIPSLD_CC="$(CC)"; CC=fips/fipsld; export CC FIPSLD_CC; \
-                $(MAKE) -f Makefile.shared -e $(BUILDENV) \
-                        CC=$${CC} LIBNAME=fips THIS=$@ \
-                        LIBEXTRAS=fips/fipscanister.o \
-                        LIBDEPS="$(EX_LIBS)" \
-                        LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
-                        link_o.$(SHLIB_TARGET) || { rm -f $@; exit 1; } \
+                $(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \
         else \
                 echo "There's no support for shared libraries on this platform" >&2; \
                 exit 1; \
         fi
 
-libfips.a:
-        dir=fips; target=all; $(BUILD_ONE_CMD)
-
 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 [ "$(PLATFORM)" = "Cygwin" ]; 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 \
+        @ 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}" \
+                        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 [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \
+        @ 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}" \
+                        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'; \
@@ skipping 56 matching lines @@
         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)
-        @if [ -z "$(FIPSCANLIB)" ]; then \
-                set -e; target=links; dir=fips ; $(BUILD_CMD) ; \
-        fi
 
 gentests:
         @(cd test && echo "generating dummy tests (if needed)..." && \
-        $(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on generate );
+        $(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on generate );
 
 dclean:
-        rm -f *.bak
+        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) && \
                 touch rehash.time; \
-        fi
+        else :; fi
 
 test:   tests
 
 tests: rehash
         @(cd test && echo "testing..." && \
-        $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests );
-        util/opensslwrap.sh version -a
+        $(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)
 
@@ skipping 12 matching lines @@
 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 apps/openssl-vms.cnf crypto/bn/bn_prime.h TABLE depend
+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
@@ skipping 10 matching lines @@
         @$(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
+        @$(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 \
@@ skipping 30 matching lines @@
                                         mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
                                 else \
                                         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; \
                                 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`"; \
+        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=; \
         if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \
                 filecase=-i; \
         fi; \
         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 \
-                                $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
+                                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 \
-                                $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
+                                PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
                          done); \
         done
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.