Synchronised line endinge with release branch

3 files changed, 2226 insertions, 2226 deletions

diff --git a/openssl/util/mk1mf.pl b/openssl/util/mk1mf.pl
index 2387cebb3..e3db14b62 100644
--- a/openssl/util/mk1mf.pl
+++ b/openssl/util/mk1mf.pl
@@ -1,1224 +1,1224 @@
-#!/usr/local/bin/perl

-# A bit of an evil hack but it post processes the file ../MINFO which

-# is generated by `make files` in the top directory.

-# This script outputs one mega makefile that has no shell stuff or any

-# funny stuff

-#

-

-$INSTALLTOP="/usr/local/ssl";

-$OPENSSLDIR="/usr/local/ssl";

-$OPTIONS="";

-$ssl_version="";

-$banner="\t\@echo Building OpenSSL";

-

-my $no_static_engine = 1;

-my $engines = "";

-my $otherlibs = "";

-local $zlib_opt = 0;	# 0 = no zlib, 1 = static, 2 = dynamic

-local $zlib_lib = "";

-local $perl_asm = 0;	# 1 to autobuild asm files from perl scripts

-

-# Options to import from top level Makefile

-

-my %mf_import = (

-	VERSION	       => \$ssl_version,

-	OPTIONS        => \$OPTIONS,

-	INSTALLTOP     => \$INSTALLTOP,

-	OPENSSLDIR     => \$OPENSSLDIR,

-	PLATFORM       => \$mf_platform,

-	CFLAG	       => \$mf_cflag,

-	DEPFLAG	       => \$mf_depflag,

-	CPUID_OBJ      => \$mf_cpuid_asm,

-	BN_ASM	       => \$mf_bn_asm,

-	DES_ENC	       => \$mf_des_asm,

-	AES_ENC        => \$mf_aes_asm,

-	BF_ENC	       => \$mf_bf_asm,

-	CAST_ENC       => \$mf_cast_asm,

-	RC4_ENC	       => \$mf_rc4_asm,

-	RC5_ENC        => \$mf_rc5_asm,

-	MD5_ASM_OBJ    => \$mf_md5_asm,

-	SHA1_ASM_OBJ   => \$mf_sha_asm,

-	RMD160_ASM_OBJ => \$mf_rmd_asm,

-	WP_ASM_OBJ     => \$mf_wp_asm,

-	CMLL_ENC       => \$mf_cm_asm

-);

-

-

-open(IN,"<Makefile") || die "unable to open Makefile!\n";

-while(<IN>) {

-    my ($mf_opt, $mf_ref);

-    while (($mf_opt, $mf_ref) = each %mf_import) {

-    	if (/^$mf_opt\s*=\s*(.*)$/) {

-	   $$mf_ref = $1;

-	}

-    }

-}

-close(IN);

-

-$debug = 1 if $mf_platform =~ /^debug-/;

-

-die "Makefile is not the toplevel Makefile!\n" if $ssl_version eq "";

-

-$infile="MINFO";

-

-%ops=(

-	"VC-WIN32",   "Microsoft Visual C++ [4-6] - Windows NT or 9X",

-	"VC-WIN64I",  "Microsoft C/C++ - Win64/IA-64",

-	"VC-WIN64A",  "Microsoft C/C++ - Win64/x64",

-	"VC-CE",   "Microsoft eMbedded Visual C++ 3.0 - Windows CE ONLY",

-	"VC-NT",   "Microsoft Visual C++ [4-6] - Windows NT ONLY",

-	"Mingw32", "GNU C++ - Windows NT or 9x",

-	"Mingw32-files", "Create files with DOS copy ...",

-	"BC-NT",   "Borland C++ 4.5 - Windows NT",

-	"linux-elf","Linux elf",

-	"ultrix-mips","DEC mips ultrix",

-	"FreeBSD","FreeBSD distribution",

-	"OS2-EMX", "EMX GCC OS/2",

-	"netware-clib", "CodeWarrior for NetWare - CLib - with WinSock Sockets",

-	"netware-clib-bsdsock", "CodeWarrior for NetWare - CLib - with BSD Sockets",

-	"netware-libc", "CodeWarrior for NetWare - LibC - with WinSock Sockets",

-	"netware-libc-bsdsock", "CodeWarrior for NetWare - LibC - with BSD Sockets",

-	"default","cc under unix",

-	"auto", "auto detect from top level Makefile"

-	);

-

-$platform="";

-my $xcflags="";

-foreach (@ARGV)

-	{

-	if (!&read_options && !defined($ops{$_}))

-		{

-		print STDERR "unknown option - $_\n";

-		print STDERR "usage: perl mk1mf.pl [options] [system]\n";

-		print STDERR "\nwhere [system] can be one of the following\n";

-		foreach $i (sort keys %ops)

-		{ printf STDERR "\t%-10s\t%s\n",$i,$ops{$i}; }

-		print STDERR <<"EOF";

-and [options] can be one of

-	no-md2 no-md4 no-md5 no-sha no-mdc2	- Skip this digest

-	no-ripemd

-	no-rc2 no-rc4 no-rc5 no-idea no-des     - Skip this symetric cipher

-	no-bf no-cast no-aes no-camellia no-seed

-	no-rsa no-dsa no-dh			- Skip this public key cipher

-	no-ssl2 no-ssl3				- Skip this version of SSL

-	just-ssl				- remove all non-ssl keys/digest

-	no-asm 					- No x86 asm

-	no-krb5					- No KRB5

-	no-ec					- No EC

-	no-ecdsa				- No ECDSA

-	no-ecdh					- No ECDH

-	no-engine				- No engine

-	no-hw					- No hw

-	nasm 					- Use NASM for x86 asm

-	nw-nasm					- Use NASM x86 asm for NetWare

-	nw-mwasm				- Use Metrowerks x86 asm for NetWare

-	gaswin					- Use GNU as with Mingw32

-	no-socks				- No socket code

-	no-err					- No error strings

-	dll/shlib				- Build shared libraries (MS)

-	debug					- Debug build

-        profile                                 - Profiling build

-	gcc					- Use Gcc (unix)

-

-Values that can be set

-TMP=tmpdir OUT=outdir SRC=srcdir BIN=binpath INC=header-outdir CC=C-compiler

-

--L<ex_lib_path> -l<ex_lib>			- extra library flags (unix)

--<ex_cc_flags>					- extra 'cc' flags,

-						  added (MS), or replace (unix)

-EOF

-		exit(1);

-		}

-	$platform=$_;

-	}

-foreach (grep(!/^$/, split(/ /, $OPTIONS)))

-	{

-	print STDERR "unknown option - $_\n" if !&read_options;

-	}

-

-$no_static_engine = 0 if (!$shlib);

-

-$no_mdc2=1 if ($no_des);

-

-$no_ssl3=1 if ($no_md5 || $no_sha);

-$no_ssl3=1 if ($no_rsa && $no_dh);

-

-$no_ssl2=1 if ($no_md5);

-$no_ssl2=1 if ($no_rsa);

-

-$out_def="out";

-$inc_def="outinc";

-$tmp_def="tmp";

-

-$perl="perl" unless defined $perl;

-$mkdir="-mkdir" unless defined $mkdir;

-

-($ssl,$crypto)=("ssl","crypto");

-$ranlib="echo ranlib";

-

-$cc=(defined($VARS{'CC'}))?$VARS{'CC'}:'cc';

-$src_dir=(defined($VARS{'SRC'}))?$VARS{'SRC'}:'.';

-$bin_dir=(defined($VARS{'BIN'}))?$VARS{'BIN'}:'';

-

-# $bin_dir.=$o causes a core dump on my sparc :-(

-

-

-$NT=0;

-

-push(@INC,"util/pl","pl");

-

-if ($platform eq "auto") {

-	$platform = $mf_platform;

-	print STDERR "Imported platform $mf_platform\n";

-}

-

-if (($platform =~ /VC-(.+)/))

-	{

-	$FLAVOR=$1;

-	$NT = 1 if $1 eq "NT";

-	require 'VC-32.pl';

-	}

-elsif ($platform eq "Mingw32")

-	{

-	require 'Mingw32.pl';

-	}

-elsif ($platform eq "Mingw32-files")

-	{

-	require 'Mingw32f.pl';

-	}

-elsif ($platform eq "BC-NT")

-	{

-	$bc=1;

-	require 'BC-32.pl';

-	}

-elsif ($platform eq "FreeBSD")

-	{

-	require 'unix.pl';

-	$cflags='-DTERMIO -D_ANSI_SOURCE -O2 -fomit-frame-pointer';

-	}

-elsif ($platform eq "linux-elf")

-	{

-	require "unix.pl";

-	require "linux.pl";

-	$unix=1;

-	}

-elsif ($platform eq "ultrix-mips")

-	{

-	require "unix.pl";

-	require "ultrix.pl";

-	$unix=1;

-	}

-elsif ($platform eq "OS2-EMX")

-	{

-	$wc=1;

-	require 'OS2-EMX.pl';

-	}

-elsif (($platform eq "netware-clib") || ($platform eq "netware-libc") ||

-       ($platform eq "netware-clib-bsdsock") || ($platform eq "netware-libc-bsdsock"))

-	{

-	$LIBC=1 if $platform eq "netware-libc" || $platform eq "netware-libc-bsdsock";

-	$BSDSOCK=1 if ($platform eq "netware-libc-bsdsock") || ($platform eq "netware-clib-bsdsock");

-	require 'netware.pl';

-	}

-else

-	{

-	require "unix.pl";

-

-	$unix=1;

-	$cflags.=' -DTERMIO';

-	}

-

-$out_dir=(defined($VARS{'OUT'}))?$VARS{'OUT'}:$out_def.($debug?".dbg":"");

-$tmp_dir=(defined($VARS{'TMP'}))?$VARS{'TMP'}:$tmp_def.($debug?".dbg":"");

-$inc_dir=(defined($VARS{'INC'}))?$VARS{'INC'}:$inc_def;

-

-$bin_dir=$bin_dir.$o unless ((substr($bin_dir,-1,1) eq $o) || ($bin_dir eq ''));

-

-$cflags= "$xcflags$cflags" if $xcflags ne "";

-$cdflags= "$xcflags$cflags" if $xcdflags ne "";

-

-$cflags.=" -DOPENSSL_NO_IDEA" if $no_idea;

-$cdflags.=" -DOPENSSL_NO_IDEA" if $no_idea;

-$cflags.=" -DOPENSSL_NO_AES"  if $no_aes;

-$cdflags.=" -DOPENSSL_NO_AES"  if $no_aes;

-$cflags.=" -DOPENSSL_NO_CAMELLIA"  if $no_camellia;

-$cdflags.=" -DOPENSSL_NO_CAMELLIA"  if $no_camellia;

-$cflags.=" -DOPENSSL_NO_SEED" if $no_seed;

-$cdflags.=" -DOPENSSL_NO_SEED" if $no_seed;

-$cflags.=" -DOPENSSL_NO_RC2"  if $no_rc2;

-$cdflags.=" -DOPENSSL_NO_RC2"  if $no_rc2;

-$cflags.=" -DOPENSSL_NO_RC4"  if $no_rc4;

-$cdflags.=" -DOPENSSL_NO_RC4"  if $no_rc4;

-$cflags.=" -DOPENSSL_NO_RC5"  if $no_rc5;

-$cdflags.=" -DOPENSSL_NO_RC5"  if $no_rc5;

-$cflags.=" -DOPENSSL_NO_MD2"  if $no_md2;

-$cdflags.=" -DOPENSSL_NO_MD2"  if $no_md2;

-$cflags.=" -DOPENSSL_NO_MD4"  if $no_md4;

-$cdflags.=" -DOPENSSL_NO_MD4"  if $no_md4;

-$cflags.=" -DOPENSSL_NO_MD5"  if $no_md5;

-$cdflags.=" -DOPENSSL_NO_MD5"  if $no_md5;

-$cflags.=" -DOPENSSL_NO_SHA"  if $no_sha;

-$cdflags.=" -DOPENSSL_NO_SHA"  if $no_sha;

-$cflags.=" -DOPENSSL_NO_SHA1" if $no_sha1;

-$cdflags.=" -DOPENSSL_NO_SHA1" if $no_sha1;

-$cflags.=" -DOPENSSL_NO_RIPEMD" if $no_ripemd;

-$cdflags.=" -DOPENSSL_NO_RIPEMD" if $no_ripemd;

-$cflags.=" -DOPENSSL_NO_MDC2" if $no_mdc2;

-$cdflags.=" -DOPENSSL_NO_MDC2" if $no_mdc2;

-$cflags.=" -DOPENSSL_NO_BF"  if $no_bf;

-$cdflags.=" -DOPENSSL_NO_BF"  if $no_bf;

-$cflags.=" -DOPENSSL_NO_CAST" if $no_cast;

-$cdflags.=" -DOPENSSL_NO_CAST" if $no_cast;

-$cflags.=" -DOPENSSL_NO_DES"  if $no_des;

-$cdflags.=" -DOPENSSL_NO_DES"  if $no_des;

-$cflags.=" -DOPENSSL_NO_RSA"  if $no_rsa;

-$cdflags.=" -DOPENSSL_NO_RSA"  if $no_rsa;

-$cflags.=" -DOPENSSL_NO_DSA"  if $no_dsa;

-$cdflags.=" -DOPENSSL_NO_DSA"  if $no_dsa;

-$cflags.=" -DOPENSSL_NO_DH"   if $no_dh;

-$cdflags.=" -DOPENSSL_NO_DH"   if $no_dh;

-$cflags.=" -DOPENSSL_NO_WHIRLPOOL"   if $no_whirlpool;

-$cdflags.=" -DOPENSSL_NO_WHIRLPOOL"   if $no_whirlpool;

-$cflags.=" -DOPENSSL_NO_SOCK" if $no_sock;

-$cdflags.=" -DOPENSSL_NO_SOCK" if $no_sock;

-$cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2;

-$cdflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2;

-$cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3;

-$cdflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3;

-$cflags.=" -DOPENSSL_NO_TLSEXT" if $no_tlsext;

-$cdflags.=" -DOPENSSL_NO_TLSEXT" if $no_tlsext;

-$cflags.=" -DOPENSSL_NO_CMS" if $no_cms;

-$cdflags.=" -DOPENSSL_NO_CMS" if $no_cms;

-$cflags.=" -DOPENSSL_NO_ERR"  if $no_err;

-$cdflags.=" -DOPENSSL_NO_ERR"  if $no_err;

-$cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5;

-$cdflags.=" -DOPENSSL_NO_KRB5" if $no_krb5;

-$cflags.=" -DOPENSSL_NO_EC"   if $no_ec;

-$cdflags.=" -DOPENSSL_NO_EC"   if $no_ec;

-$cflags.=" -DOPENSSL_NO_ECDSA" if $no_ecdsa;

-$cdflags.=" -DOPENSSL_NO_ECDSA" if $no_ecdsa;

-$cflags.=" -DOPENSSL_NO_ECDH" if $no_ecdh;

-$cdflags.=" -DOPENSSL_NO_ECDH" if $no_ecdh;

-$cflags.=" -DOPENSSL_NO_GOST" if $no_gost;

-$cdflags.=" -DOPENSSL_NO_GOST" if $no_gost;

-$cflags.=" -DOPENSSL_NO_ENGINE"   if $no_engine;

-$cdflags.=" -DOPENSSL_NO_ENGINE"   if $no_engine;

-$cflags.=" -DOPENSSL_NO_HW"   if $no_hw;

-$cdflags.=" -DOPENSSL_NO_HW"   if $no_hw;

-$cflags.=" -DOPENSSL_NO_JPAKE"    if $no_jpake;

-$cdflags.=" -DOPENSSL_NO_JPAKE"    if $no_jpake;

-$cflags.= " -DZLIB" if $zlib_opt;

-$cdflags.= " -DZLIB" if $zlib_opt;

-$cflags.= " -DZLIB_SHARED" if $zlib_opt == 2;

-$cdflags.= " -DZLIB_SHARED" if $zlib_opt == 2;

-

-if ($no_static_engine)

-	{

-	$cflags .= " -DOPENSSL_NO_STATIC_ENGINE";

-	$cdflags .= " -DOPENSSL_NO_STATIC_ENGINE";

-	}

-else

-	{

-	$cflags .= " -DOPENSSL_NO_DYNAMIC_ENGINE";

-	$cdflags .= " -DOPENSSL_NO_DYNAMIC_ENGINE";

-	}

-

-#$cflags.=" -DRSAref"  if $rsaref ne "";

-

-## if ($unix)

-##	{ $cflags="$c_flags" if ($c_flags ne ""); }

-##else

-	{ $cflags="$c_flags$cflags" if ($c_flags ne ""); }

-

-$ex_libs="$l_flags$ex_libs" if ($l_flags ne "");

-

-

-%shlib_ex_cflags=("SSL" => " -DOPENSSL_BUILD_SHLIBSSL",

-		  "CRYPTO" => " -DOPENSSL_BUILD_SHLIBCRYPTO");

-

-if ($msdos)

-	{

-	$banner ="\t\@echo Make sure you have run 'perl Configure $platform' in the\n";

-	$banner.="\t\@echo top level directory, if you don't have perl, you will\n";

-	$banner.="\t\@echo need to probably edit crypto/bn/bn.h, check the\n";

-	$banner.="\t\@echo documentation for details.\n";

-	}

-

-# have to do this to allow $(CC) under unix

-$link="$bin_dir$link" if ($link !~ /^\$/);

-

-$INSTALLTOP =~ s|/|$o|g;

-$OPENSSLDIR =~ s|/|$o|g;

-

-#############################################

-# We parse in input file and 'store' info for later printing.

-open(IN,"<$infile") || die "unable to open $infile:$!\n";

-$_=<IN>;

-for (;;)

-	{

-	chop;

-

-	($key,$val)=/^([^=]+)=(.*)/;

-	if ($key eq "RELATIVE_DIRECTORY")

-		{

-		if ($lib ne "")

-			{

-			$uc=$lib;

-			$uc =~ s/^lib(.*)\.a/$1/;

-			$uc =~ tr/a-z/A-Z/;

-			$lib_nam{$uc}=$uc;

-			$lib_obj{$uc}.=$libobj." ";

-			}

-		last if ($val eq "FINISHED");

-		$lib="";

-		$libobj="";

-		$dir=$val;

-		}

-

-	if ($key eq "KRB5_INCLUDES")

-		{ $cflags .= " $val";}

-

-	if ($key eq "ZLIB_INCLUDE")

-		{ $cflags .= " $val" if $val ne "";}

-

-	if ($key eq "LIBZLIB")

-		{ $zlib_lib = "$val" if $val ne "";}

-

-	if ($key eq "LIBKRB5")

-		{ $ex_libs .= " $val" if $val ne "";}

-

-	if ($key eq "TEST")

-		{ $test.=&var_add($dir,$val, 0); }

-

-	if (($key eq "PROGS") || ($key eq "E_OBJ"))

-		{ $e_exe.=&var_add($dir,$val, 0); }

-

-	if ($key eq "LIB")

-		{

-		$lib=$val;

-		$lib =~ s/^.*\/([^\/]+)$/$1/;

-		}

-	if ($key eq "LIBNAME" && $no_static_engine)

-		{

-		$lib=$val;

-		$lib =~ s/^.*\/([^\/]+)$/$1/;

-		$otherlibs .= " $lib";

-		}

-

-	if ($key eq "EXHEADER")

-		{ $exheader.=&var_add($dir,$val, 1); }

-

-	if ($key eq "HEADER")

-		{ $header.=&var_add($dir,$val, 1); }

-

-	if ($key eq "LIBOBJ" && ($dir ne "engines" || !$no_static_engine))

-		{ $libobj=&var_add($dir,$val, 0); }

-	if ($key eq "LIBNAMES" && $dir eq "engines" && $no_static_engine)

- 		{ $engines.=$val }

-

-	if (!($_=<IN>))

-		{ $_="RELATIVE_DIRECTORY=FINISHED\n"; }

-	}

-close(IN);

-

-if ($shlib)

-	{

-	$extra_install= <<"EOF";

-	\$(CP) \"\$(O_SSL)\" \"\$(INSTALLTOP)${o}bin\"

-	\$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}bin\"

-	\$(CP) \"\$(L_SSL)\" \"\$(INSTALLTOP)${o}lib\"

-	\$(CP) \"\$(L_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"

-EOF

-	if ($no_static_engine)

-		{

-		$extra_install .= <<"EOF"

-	\$(MKDIR) \"\$(INSTALLTOP)${o}lib${o}engines\"

-	\$(CP) \"\$(E_SHLIB)\" \"\$(INSTALLTOP)${o}lib${o}engines\"

-EOF

-		}

-	}

-else

-	{

-	$extra_install= <<"EOF";

-	\$(CP) \"\$(O_SSL)\" \"\$(INSTALLTOP)${o}lib\"

-	\$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"

-EOF

-	$ex_libs .= " $zlib_lib" if $zlib_opt == 1;

-	}

-

-$defs= <<"EOF";

-# This makefile has been automatically generated from the OpenSSL distribution.

-# This single makefile will build the complete OpenSSL distribution and

-# by default leave the 'intertesting' output files in .${o}out and the stuff

-# that needs deleting in .${o}tmp.

-# The file was generated by running 'make makefile.one', which

-# does a 'make files', which writes all the environment variables from all

-# the makefiles to the file call MINFO.  This file is used by

-# util${o}mk1mf.pl to generate makefile.one.

-# The 'makefile per directory' system suites me when developing this

-# library and also so I can 'distribute' indervidual library sections.

-# The one monster makefile better suits building in non-unix

-# environments.

-

-EOF

-

-$defs .= $preamble if defined $preamble;

-

-$defs.= <<"EOF";

-INSTALLTOP=$INSTALLTOP

-OPENSSLDIR=$OPENSSLDIR

-

-!ifdef DEBUG

-# The output directory for everything intersting

-OUT_D=out32_d

-# The output directory for all the temporary muck

-TMP_D=tmp32_d

-!else

-# The output directory for everything intersting

-OUT_D=out32

-# The output directory for all the temporary muck

-TMP_D=tmp32

-!endif

-

-# Set your compiler options

-PLATFORM=$platform

-CC=$bin_dir${cc}

-!ifdef DEBUG

-CFLAG=$cdflags

-!else

-CFLAG=$cflags

-!endif

-APP_CFLAG=$app_cflag

-LIB_CFLAG=$lib_cflag

-SHLIB_CFLAG=$shl_cflag

-APP_EX_OBJ=$app_ex_obj

-SHLIB_EX_OBJ=$shlib_ex_obj

-# add extra libraries to this define, for solaris -lsocket -lnsl would

-# be added

-EX_LIBS=$ex_libs

-

-# The OpenSSL directory

-SRC_D=$src_dir

-

-LINK=$link

-!ifdef DEBUG

-LFLAGS=$lflagsd

-!else

-LFLAGS=$lflags

-!endif

-RSC=$rsc

-

-# The output directory for the header files

-INC_D=$inc_dir

-INCO_D=$inc_dir${o}openssl

-

-PERL=$perl

-CP=$cp

-RM=$rm

-RANLIB=$ranlib

-MKDIR=$mkdir

-!ifdef DEBUG

-MKLIB=$bin_dir$mklibd

-!else

-MKLIB=$bin_dir$mklib

-!endif

-MLFLAGS=$mlflags

-ASM=$bin_dir$asm

-

-######################################################

-# You should not need to touch anything below this point

-######################################################

-

-E_EXE=openssl

-SSL=$ssl

-CRYPTO=$crypto

-

-# BIN_D  - Binary output directory

-# TEST_D - Binary test file output directory

-# LIB_D  - library output directory

-# ENG_D  - dynamic engine output directory

-# Note: if you change these point to different directories then uncomment out

-# the lines around the 'NB' comment below.

-# 

-BIN_D=\$(OUT_D)

-TEST_D=\$(OUT_D)

-LIB_D=\$(OUT_D)

-ENG_D=\$(OUT_D)

-

-# INCL_D - local library directory

-# OBJ_D  - temp object file directory

-OBJ_D=\$(TMP_D)

-INCL_D=\$(TMP_D)

-

-O_SSL=     \$(LIB_D)$o$plib\$(SSL)$shlibp

-O_CRYPTO=  \$(LIB_D)$o$plib\$(CRYPTO)$shlibp

-SO_SSL=    $plib\$(SSL)$so_shlibp

-SO_CRYPTO= $plib\$(CRYPTO)$so_shlibp

-L_SSL=     \$(LIB_D)$o$plib\$(SSL)$libp

-L_CRYPTO=  \$(LIB_D)$o$plib\$(CRYPTO)$libp

-

-L_LIBS= \$(L_SSL) \$(L_CRYPTO)

-

-######################################################

-# Don't touch anything below this point

-######################################################

-

-INC=-I\$(INC_D) -I\$(INCL_D)

-APP_CFLAGS=\$(INC) \$(CFLAG) \$(APP_CFLAG)

-LIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG)

-SHLIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG) \$(SHLIB_CFLAG)

-LIBS_DEP=\$(O_CRYPTO) \$(O_SSL)

-

-#############################################

-EOF

-

-$rules=<<"EOF";

-all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers lib exe

-

-banner:

-$banner

-

-\$(TMP_D):

-	\$(MKDIR) \"\$(TMP_D)\"

-# NB: uncomment out these lines if BIN_D, TEST_D and LIB_D are different

-#\$(BIN_D):

-#	\$(MKDIR) \$(BIN_D)

-#

-#\$(TEST_D):

-#	\$(MKDIR) \$(TEST_D)

-

-\$(LIB_D):

-	\$(MKDIR) \"\$(LIB_D)\"

-

-\$(INCO_D): \$(INC_D)

-	\$(MKDIR) \"\$(INCO_D)\"

-

-\$(INC_D):

-	\$(MKDIR) \"\$(INC_D)\"

-

-headers: \$(HEADER) \$(EXHEADER)

-	@

-

-lib: \$(LIBS_DEP) \$(E_SHLIB)

-

-exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep

-

-install: all

-	\$(MKDIR) \"\$(INSTALLTOP)\"

-	\$(MKDIR) \"\$(INSTALLTOP)${o}bin\"

-	\$(MKDIR) \"\$(INSTALLTOP)${o}include\"

-	\$(MKDIR) \"\$(INSTALLTOP)${o}include${o}openssl\"

-	\$(MKDIR) \"\$(INSTALLTOP)${o}lib\"

-	\$(CP) \"\$(INCO_D)${o}*.\[ch\]\" \"\$(INSTALLTOP)${o}include${o}openssl\"

-	\$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin\"

-	\$(MKDIR) \"\$(OPENSSLDIR)\"

-	\$(CP) apps${o}openssl.cnf \"\$(OPENSSLDIR)\"

-$extra_install

-

-

-test: \$(T_EXE)

-	cd \$(BIN_D)

-	..${o}ms${o}test

-

-clean:

-	\$(RM) \$(TMP_D)$o*.*

-

-vclean:

-	\$(RM) \$(TMP_D)$o*.*

-	\$(RM) \$(OUT_D)$o*.*

-

-EOF

-    

-my $platform_cpp_symbol = "MK1MF_PLATFORM_$platform";

-$platform_cpp_symbol =~ s/-/_/g;

-if (open(IN,"crypto/buildinf.h"))

-	{

-	# Remove entry for this platform in existing file buildinf.h.

-

-	my $old_buildinf_h = "";

-	while (<IN>)

-		{

-		if (/^\#ifdef $platform_cpp_symbol$/)

-			{

-			while (<IN>) { last if (/^\#endif/); }

-			}

-		else

-			{

-			$old_buildinf_h .= $_;

-			}

-		}

-	close(IN);

-

-	open(OUT,">crypto/buildinf.h") || die "Can't open buildinf.h";

-	print OUT $old_buildinf_h;

-	close(OUT);

-	}

-

-open (OUT,">>crypto/buildinf.h") || die "Can't open buildinf.h";

-printf OUT <<EOF;

-#ifdef $platform_cpp_symbol

-  /* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */

-  #define CFLAGS "$cc $cflags"

-  #define PLATFORM "$platform"

-EOF

-printf OUT "  #define DATE \"%s\"\n", scalar gmtime();

-printf OUT "#endif\n";

-close(OUT);

-

-# Strip of trailing ' '

-foreach (keys %lib_obj) { $lib_obj{$_}=&clean_up_ws($lib_obj{$_}); }

-$test=&clean_up_ws($test);

-$e_exe=&clean_up_ws($e_exe);

-$exheader=&clean_up_ws($exheader);

-$header=&clean_up_ws($header);

-

-# First we strip the exheaders from the headers list

-foreach (split(/\s+/,$exheader)){ $h{$_}=1; }

-foreach (split(/\s+/,$header))	{ $h.=$_." " unless $h{$_}; }

-chop($h); $header=$h;

-

-$defs.=&do_defs("HEADER",$header,"\$(INCL_D)","");

-$rules.=&do_copy_rule("\$(INCL_D)",$header,"");

-

-$defs.=&do_defs("EXHEADER",$exheader,"\$(INCO_D)","");

-$rules.=&do_copy_rule("\$(INCO_D)",$exheader,"");

-

-$defs.=&do_defs("T_OBJ",$test,"\$(OBJ_D)",$obj);

-$rules.=&do_compile_rule("\$(OBJ_D)",$test,"\$(APP_CFLAGS)");

-

-$defs.=&do_defs("E_OBJ",$e_exe,"\$(OBJ_D)",$obj);

-$rules.=&do_compile_rule("\$(OBJ_D)",$e_exe,'-DMONOLITH $(APP_CFLAGS)');

-

-foreach (values %lib_nam)

-	{

-	$lib_obj=$lib_obj{$_};

-	local($slib)=$shlib;

-

-	if (($_ eq "SSL") && $no_ssl2 && $no_ssl3)

-		{

-		$rules.="\$(O_SSL):\n\n"; 

-		next;

-		}

-

-	$defs.=&do_defs(${_}."OBJ",$lib_obj,"\$(OBJ_D)",$obj);

-	$lib=($slib)?" \$(SHLIB_CFLAGS)".$shlib_ex_cflags{$_}:" \$(LIB_CFLAGS)";

-	$rules.=&do_compile_rule("\$(OBJ_D)",$lib_obj{$_},$lib);

-	}

-

-# hack to add version info on MSVC

-if (($platform eq "VC-WIN32") || ($platform eq "VC-WIN64A")

-	|| ($platform eq "VC-WIN64I") || ($platform eq "VC-NT")) {

-    $rules.= <<"EOF";

-\$(OBJ_D)\\\$(CRYPTO).res: ms\\version32.rc

-	\$(RSC) /fo"\$(OBJ_D)\\\$(CRYPTO).res" /d CRYPTO ms\\version32.rc

-

-\$(OBJ_D)\\\$(SSL).res: ms\\version32.rc

-	\$(RSC) /fo"\$(OBJ_D)\\\$(SSL).res" /d SSL ms\\version32.rc

-

-EOF

-}

-

-$defs.=&do_defs("T_EXE",$test,"\$(TEST_D)",$exep);

-foreach (split(/\s+/,$test))

-	{

-	$t=&bname($_);

-	$tt="\$(OBJ_D)${o}$t${obj}";

-	$rules.=&do_link_rule("\$(TEST_D)$o$t$exep",$tt,"\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)");

-	}

-

-$defs.=&do_defs("E_SHLIB",$engines . $otherlibs,"\$(ENG_D)",$shlibp);

-

-foreach (split(/\s+/,$engines))

-	{

-	$rules.=&do_compile_rule("\$(OBJ_D)","engines${o}e_$_",$lib);

-	$rules.= &do_lib_rule("\$(OBJ_D)${o}e_${_}.obj","\$(ENG_D)$o$_$shlibp","",$shlib,"");

-	}

-

-

-

-$rules.= &do_lib_rule("\$(SSLOBJ)","\$(O_SSL)",$ssl,$shlib,"\$(SO_SSL)");

-$rules.= &do_lib_rule("\$(CRYPTOOBJ)","\$(O_CRYPTO)",$crypto,$shlib,"\$(SO_CRYPTO)");

-

-foreach (split(" ",$otherlibs))

-	{

-	my $uc = $_;

-	$uc =~ tr /a-z/A-Z/;	

-	$rules.= &do_lib_rule("\$(${uc}OBJ)","\$(ENG_D)$o$_$shlibp", "", $shlib, "");

-

-	}

-

-$rules.=&do_link_rule("\$(BIN_D)$o\$(E_EXE)$exep","\$(E_OBJ)","\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)");

-

-print $defs;

-

-if ($platform eq "linux-elf") {

-    print <<"EOF";

-# Generate perlasm output files

-%.cpp:

-	(cd \$(\@D)/..; PERL=perl make -f Makefile asm/\$(\@F))

-EOF

-}

-print "###################################################################\n";

-print $rules;

-

-###############################################

-# strip off any trailing .[och] and append the relative directory

-# also remembering to do nothing if we are in one of the dropped

-# directories

-sub var_add

-	{

-	local($dir,$val,$keepext)=@_;

-	local(@a,$_,$ret);

-

-	return("") if $no_engine && $dir =~ /\/engine/;

-	return("") if $no_hw   && $dir =~ /\/hw/;

-	return("") if $no_idea && $dir =~ /\/idea/;

-	return("") if $no_aes  && $dir =~ /\/aes/;

-	return("") if $no_camellia  && $dir =~ /\/camellia/;

-	return("") if $no_seed && $dir =~ /\/seed/;

-	return("") if $no_rc2  && $dir =~ /\/rc2/;

-	return("") if $no_rc4  && $dir =~ /\/rc4/;

-	return("") if $no_rc5  && $dir =~ /\/rc5/;

-	return("") if $no_rsa  && $dir =~ /\/rsa/;

-	return("") if $no_rsa  && $dir =~ /^rsaref/;

-	return("") if $no_dsa  && $dir =~ /\/dsa/;

-	return("") if $no_dh   && $dir =~ /\/dh/;

-	return("") if $no_ec   && $dir =~ /\/ec/;

-	return("") if $no_gost   && $dir =~ /\/ccgost/;

-	return("") if $no_cms  && $dir =~ /\/cms/;

-	return("") if $no_jpake  && $dir =~ /\/jpake/;

-	if ($no_des && $dir =~ /\/des/)

-		{

-		if ($val =~ /read_pwd/)

-			{ return("$dir/read_pwd "); }

-		else

-			{ return(""); }

-		}

-	return("") if $no_mdc2 && $dir =~ /\/mdc2/;

-	return("") if $no_sock && $dir =~ /\/proxy/;

-	return("") if $no_bf   && $dir =~ /\/bf/;

-	return("") if $no_cast && $dir =~ /\/cast/;

-	return("") if $no_whirlpool && $dir =~ /\/whrlpool/;

-

-	$val =~ s/^\s*(.*)\s*$/$1/;

-	@a=split(/\s+/,$val);

-	grep(s/\.[och]$//,@a) unless $keepext;

-

-	@a=grep(!/^e_.*_3d$/,@a) if $no_des;

-	@a=grep(!/^e_.*_d$/,@a) if $no_des;

-	@a=grep(!/^e_.*_ae$/,@a) if $no_idea;

-	@a=grep(!/^e_.*_i$/,@a) if $no_aes;

-	@a=grep(!/^e_.*_r2$/,@a) if $no_rc2;

-	@a=grep(!/^e_.*_r5$/,@a) if $no_rc5;

-	@a=grep(!/^e_.*_bf$/,@a) if $no_bf;

-	@a=grep(!/^e_.*_c$/,@a) if $no_cast;

-	@a=grep(!/^e_rc4$/,@a) if $no_rc4;

-	@a=grep(!/^e_camellia$/,@a) if $no_camellia;

-	@a=grep(!/^e_seed$/,@a) if $no_seed;

-

-	#@a=grep(!/(^s2_)|(^s23_)/,@a) if $no_ssl2;

-	#@a=grep(!/(^s3_)|(^s23_)/,@a) if $no_ssl3;

-

-	@a=grep(!/(_sock$)|(_acpt$)|(_conn$)|(^pxy_)/,@a) if $no_sock;

-

-	@a=grep(!/(^md2)|(_md2$)/,@a) if $no_md2;

-	@a=grep(!/(^md4)|(_md4$)/,@a) if $no_md4;

-	@a=grep(!/(^md5)|(_md5$)/,@a) if $no_md5;

-	@a=grep(!/(rmd)|(ripemd)/,@a) if $no_ripemd;

-

-	@a=grep(!/(^d2i_r_)|(^i2d_r_)/,@a) if $no_rsa;

-	@a=grep(!/(^p_open$)|(^p_seal$)/,@a) if $no_rsa;

-	@a=grep(!/(^pem_seal$)/,@a) if $no_rsa;

-

-	@a=grep(!/(m_dss$)|(m_dss1$)/,@a) if $no_dsa;

-	@a=grep(!/(^d2i_s_)|(^i2d_s_)|(_dsap$)/,@a) if $no_dsa;

-

-	@a=grep(!/^n_pkey$/,@a) if $no_rsa || $no_rc4;

-

-	@a=grep(!/_dhp$/,@a) if $no_dh;

-

-	@a=grep(!/(^sha[^1])|(_sha$)|(m_dss$)/,@a) if $no_sha;

-	@a=grep(!/(^sha1)|(_sha1$)|(m_dss1$)/,@a) if $no_sha1;

-	@a=grep(!/_mdc2$/,@a) if $no_mdc2;

-

-	@a=grep(!/^engine$/,@a) if $no_engine;

-	@a=grep(!/^hw$/,@a) if $no_hw;

-	@a=grep(!/(^rsa$)|(^genrsa$)/,@a) if $no_rsa;

-	@a=grep(!/(^dsa$)|(^gendsa$)|(^dsaparam$)/,@a) if $no_dsa;

-	@a=grep(!/^gendsa$/,@a) if $no_sha1;

-	@a=grep(!/(^dh$)|(^gendh$)/,@a) if $no_dh;

-

-	@a=grep(!/(^dh)|(_sha1$)|(m_dss1$)/,@a) if $no_sha1;

-

-	grep($_="$dir/$_",@a);

-	@a=grep(!/(^|\/)s_/,@a) if $no_sock;

-	@a=grep(!/(^|\/)bio_sock/,@a) if $no_sock;

-	$ret=join(' ',@a)." ";

-	return($ret);

-	}

-

-# change things so that each 'token' is only separated by one space

-sub clean_up_ws

-	{

-	local($w)=@_;

-

-	$w =~ s/^\s*(.*)\s*$/$1/;

-	$w =~ s/\s+/ /g;

-	return($w);

-	}

-

-sub do_defs

-	{

-	local($var,$files,$location,$postfix)=@_;

-	local($_,$ret,$pf);

-	local(*OUT,$tmp,$t);

-

-	$files =~ s/\//$o/g if $o ne '/';

-	$ret="$var="; 

-	$n=1;

-	$Vars{$var}.="";

-	foreach (split(/ /,$files))

-		{

-		$orig=$_;

-		$_=&bname($_) unless /^\$/;

-		if ($n++ == 2)

-			{

-			$n=0;

-			$ret.="\\\n\t";

-			}

-		if (($_ =~ /bss_file/) && ($postfix eq ".h"))

-			{ $pf=".c"; }

-		else	{ $pf=$postfix; }

-		if ($_ =~ /BN_ASM/)	{ $t="$_ "; }

-		elsif ($_ =~ /BNCO_ASM/){ $t="$_ "; }

-		elsif ($_ =~ /AES_ASM/){ $t="$_ "; }

-		elsif ($_ =~ /DES_ENC/)	{ $t="$_ "; }

-		elsif ($_ =~ /BF_ENC/)	{ $t="$_ "; }

-		elsif ($_ =~ /CAST_ENC/){ $t="$_ "; }

-		elsif ($_ =~ /RC4_ENC/)	{ $t="$_ "; }

-		elsif ($_ =~ /RC5_ENC/)	{ $t="$_ "; }

-		elsif ($_ =~ /MD5_ASM/)	{ $t="$_ "; }

-		elsif ($_ =~ /SHA1_ASM/){ $t="$_ "; }

-		elsif ($_ =~ /RMD160_ASM/){ $t="$_ "; }

-		elsif ($_ =~ /WHIRLPOOL_ASM/){ $t="$_ "; }

-		elsif ($_ =~ /CPUID_ASM/){ $t="$_ "; }

-		else	{ $t="$location${o}$_$pf "; }

-

-		$Vars{$var}.="$t ";

-		$ret.=$t;

-		}

-	# hack to add version info on MSVC

-	if ($shlib && (($platform eq "VC-WIN32") || ($platfrom eq "VC-WIN64I") || ($platform eq "VC-WIN64A") || ($platform eq "VC-NT")))

-		{

-		if ($var eq "CRYPTOOBJ")

-			{ $ret.="\$(OBJ_D)\\\$(CRYPTO).res "; }

-		elsif ($var eq "SSLOBJ")

-			{ $ret.="\$(OBJ_D)\\\$(SSL).res "; }

-		}

-	chomp($ret);

-	$ret.="\n\n";

-	return($ret);

-	}

-

-# return the name with the leading path removed

-sub bname

-	{

-	local($ret)=@_;

-	$ret =~ s/^.*[\\\/]([^\\\/]+)$/$1/;

-	return($ret);

-	}

-

-# return the leading path

-sub dname

-	{

-	my $ret=shift;

-	$ret =~ s/(^.*)[\\\/][^\\\/]+$/$1/;

-	return($ret);

-	}

-

-##############################################################

-# do a rule for each file that says 'compile' to new direcory

-# compile the files in '$files' into $to

-sub do_compile_rule

-	{

-	local($to,$files,$ex)=@_;

-	local($ret,$_,$n,$d,$s);

-

-	$files =~ s/\//$o/g if $o ne '/';

-	foreach (split(/\s+/,$files))

-		{

-		$n=&bname($_);

-		$d=&dname($_);

-		if (-f "${_}.c")

-			{

-			$ret.=&cc_compile_target("$to${o}$n$obj","${_}.c",$ex)

-			}

-		elsif (-f ($s="${d}${o}asm${o}${n}.pl") or

-		       ($s=~s/sha256/sha512/ and -f $s) or

-		       -f ($s="${d}${o}${n}.pl"))

-			{

-			$ret.=&perlasm_compile_target("$to${o}$n$obj",$s,$n);

-			}

-		elsif (-f ($s="${d}${o}asm${o}${n}.S") or

-		       -f ($s="${d}${o}${n}.S"))

-			{

-			$ret.=&Sasm_compile_target("$to${o}$n$obj",$s,$n);

-			}

-		else	{ die "no rule for $_"; }

-		}

-	return($ret);

-	}

-

-##############################################################

-# do a rule for each file that says 'compile' to new direcory

-sub perlasm_compile_target

-	{

-	my($target,$source,$bname)=@_;

-	my($ret);

-

-	$bname =~ s/(.*)\.[^\.]$/$1/;

-	$ret ="\$(TMP_D)$o$bname.asm: $source\n";

-	$ret.="\t\$(PERL) $source $asmtype \$(CFLAG) >\$\@\n\n";

-	$ret.="$target: \$(TMP_D)$o$bname.asm\n";

-	$ret.="\t\$(ASM) $afile\$\@ \$(TMP_D)$o$bname.asm\n\n";

-	return($ret);

-	}

-

-sub Sasm_compile_target

-	{

-	my($target,$source,$bname)=@_;

-	my($ret);

-

-	$bname =~ s/(.*)\.[^\.]$/$1/;

-	$ret ="\$(TMP_D)$o$bname.asm: $source\n";

-	$ret.="\t\$(CC) -E \$(CFLAG) $source >\$\@\n\n";

-	$ret.="$target: \$(TMP_D)$o$bname.asm\n";

-	$ret.="\t\$(ASM) $afile\$\@ \$(TMP_D)$o$bname.asm\n\n";

-	return($ret);

-	}

-

-sub cc_compile_target

-	{

-	local($target,$source,$ex_flags)=@_;

-	local($ret);

-	

-	$ex_flags.=" -DMK1MF_BUILD -D$platform_cpp_symbol" if ($source =~ /cversion/);

-	$target =~ s/\//$o/g if $o ne "/";

-	$source =~ s/\//$o/g if $o ne "/";

-	$ret ="$target: \$(SRC_D)$o$source\n\t";

-	$ret.="\$(CC) ${ofile}$target $ex_flags -c \$(SRC_D)$o$source\n\n";

-	return($ret);

-	}

-

-##############################################################

-sub do_asm_rule

-	{

-	local($target,$src)=@_;

-	local($ret,@s,@t,$i);

-

-	$target =~ s/\//$o/g if $o ne "/";

-	$src =~ s/\//$o/g if $o ne "/";

-

-	@t=split(/\s+/,$target);

-	@s=split(/\s+/,$src);

-

-

-	for ($i=0; $i<=$#s; $i++)

-		{

-		my $objfile = $t[$i];

-		my $srcfile = $s[$i];

-

-		if ($perl_asm == 1)

-			{

-			my $plasm = $objfile;

-			$plasm =~ s/${obj}/.pl/;

-			$ret.="$srcfile: $plasm\n";

-			$ret.="\t\$(PERL) $plasm $asmtype \$(CFLAG) >$srcfile\n\n";

-			}

-

-		$ret.="$objfile: $srcfile\n";

-		$ret.="\t\$(ASM) $afile$objfile \$(SRC_D)$o$srcfile\n\n";

-		}

-	return($ret);

-	}

-

-sub do_shlib_rule

-	{

-	local($n,$def)=@_;

-	local($ret,$nn);

-	local($t);

-

-	($nn=$n) =~ tr/a-z/A-Z/;

-	$ret.="$n.dll: \$(${nn}OBJ)\n";

-	if ($vc && $w32)

-		{

-		$ret.="\t\$(MKSHLIB) $efile$n.dll $def @<<\n  \$(${nn}OBJ_F)\n<<\n";

-		}

-	$ret.="\n";

-	return($ret);

-	}

-

-# do a rule for each file that says 'copy' to new direcory on change

-sub do_copy_rule

-	{

-	local($to,$files,$p)=@_;

-	local($ret,$_,$n,$pp);

-	

-	$files =~ s/\//$o/g if $o ne '/';

-	foreach (split(/\s+/,$files))

-		{

-		$n=&bname($_);

-		if ($n =~ /bss_file/)

-			{ $pp=".c"; }

-		else	{ $pp=$p; }

-		$ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp\n\t\$(CP) \"\$(SRC_D)$o$_$pp\" \"$to${o}$n$pp\"\n\n";

-		}

-	return($ret);

-	}

-

-sub read_options

-	{

-	# Many options are handled in a similar way. In particular

-	# no-xxx sets zero or more scalars to 1.

-	# Process these using a hash containing the option name and

-	# reference to the scalars to set.

-

-	my %valid_options = (

-		"no-rc2" => \$no_rc2,

-		"no-rc4" => \$no_rc4,

-		"no-rc5" => \$no_rc5,

-		"no-idea" => \$no_idea,

-		"no-aes" => \$no_aes,

-		"no-camellia" => \$no_camellia,

-		"no-seed" => \$no_seed,

-		"no-des" => \$no_des,

-		"no-bf" => \$no_bf,

-		"no-cast" => \$no_cast,

-		"no-md2" => \$no_md2,

-		"no-md4" => \$no_md4,

-		"no-md5" => \$no_md5,

-		"no-sha" => \$no_sha,

-		"no-sha1" => \$no_sha1,

-		"no-ripemd" => \$no_ripemd,

-		"no-mdc2" => \$no_mdc2,

-		"no-whirlpool" => \$no_whirlpool,

-		"no-patents" => 

-			[\$no_rc2, \$no_rc4, \$no_rc5, \$no_idea, \$no_rsa],

-		"no-rsa" => \$no_rsa,

-		"no-dsa" => \$no_dsa,

-		"no-dh" => \$no_dh,

-		"no-hmac" => \$no_hmac,

-		"no-asm" => \$no_asm,

-		"nasm" => \$nasm,

-		"nw-nasm" => \$nw_nasm,

-		"nw-mwasm" => \$nw_mwasm,

-		"gaswin" => \$gaswin,

-		"no-ssl2" => \$no_ssl2,

-		"no-ssl3" => \$no_ssl3,

-		"no-tlsext" => \$no_tlsext,

-		"no-cms" => \$no_cms,

-		"no-jpake" => \$no_jpake,

-		"no-err" => \$no_err,

-		"no-sock" => \$no_sock,

-		"no-krb5" => \$no_krb5,

-		"no-ec" => \$no_ec,

-		"no-ecdsa" => \$no_ecdsa,

-		"no-ecdh" => \$no_ecdh,

-		"no-gost" => \$no_gost,

-		"no-engine" => \$no_engine,

-		"no-hw" => \$no_hw,

-		"just-ssl" =>

-			[\$no_rc2, \$no_idea, \$no_des, \$no_bf, \$no_cast,

-			  \$no_md2, \$no_sha, \$no_mdc2, \$no_dsa, \$no_dh,

-			  \$no_ssl2, \$no_err, \$no_ripemd, \$no_rc5,

-			  \$no_aes, \$no_camellia, \$no_seed],

-		"rsaref" => 0,

-		"gcc" => \$gcc,

-		"debug" => \$debug,

-		"profile" => \$profile,

-		"shlib" => \$shlib,

-		"dll" => \$shlib,

-		"shared" => 0,

-		"no-gmp" => 0,

-		"no-rfc3779" => 0,

-		"no-montasm" => 0,

-		"no-shared" => 0,

-		"no-store" => 0,

-		"no-zlib" => 0,

-		"no-zlib-dynamic" => 0,

-		);

-

-	if (exists $valid_options{$_})

-		{

-		my $r = $valid_options{$_};

-		if ( ref $r eq "SCALAR")

-			{ $$r = 1;}

-		elsif ( ref $r eq "ARRAY")

-			{

-			my $r2;

-			foreach $r2 (@$r)

-				{

-				$$r2 = 1;

-				}

-			}

-		}

-	elsif (/^no-comp$/) { $xcflags = "-DOPENSSL_NO_COMP $xcflags"; }

-	elsif (/^enable-zlib$/) { $zlib_opt = 1 if $zlib_opt == 0 }

-	elsif (/^enable-zlib-dynamic$/)

-		{

-		$zlib_opt = 2;

-		}

-	elsif (/^no-static-engine/)

-		{

-		$no_static_engine = 1;

-		}

-	elsif (/^enable-static-engine/)

-		{

-		$no_static_engine = 0;

-		}

-	# There are also enable-xxx options which correspond to

-	# the no-xxx. Since the scalars are enabled by default

-	# these can be ignored.

-	elsif (/^enable-/)

-		{

-		my $t = $_;

-		$t =~ s/^enable/no/;

-		if (exists $valid_options{$t})

-			{return 1;}

-		return 0;

-		}

-	# experimental-xxx is mostly like enable-xxx, but opensslconf.v

-	# will still set OPENSSL_NO_xxx unless we set OPENSSL_EXPERIMENTAL_xxx.

-	# (No need to fail if we don't know the algorithm -- this is for adventurous users only.)

-	elsif (/^experimental-/)

-		{

-		my $algo, $ALGO;

-		($algo = $_) =~ s/^experimental-//;

-		($ALGO = $algo) =~ tr/[a-z]/[A-Z]/;

-

-		$xcflags="-DOPENSSL_EXPERIMENTAL_$ALGO $xcflags";

-		

-		}

-	elsif (/^--with-krb5-flavor=(.*)$/)

-		{

-		my $krb5_flavor = $1;

-		if ($krb5_flavor =~ /^force-[Hh]eimdal$/)

-			{

-			$xcflags="-DKRB5_HEIMDAL $xcflags";

-			}

-		elsif ($krb5_flavor =~ /^MIT/i)

-			{

-			$xcflags="-DKRB5_MIT $xcflags";

-		 	if ($krb5_flavor =~ /^MIT[._-]*1[._-]*[01]/i)

-				{

-				$xcflags="-DKRB5_MIT_OLD11 $xcflags"

-				}

-			}

-		}

-	elsif (/^([^=]*)=(.*)$/){ $VARS{$1}=$2; }

-	elsif (/^-[lL].*$/)	{ $l_flags.="$_ "; }

-	elsif ((!/^-help/) && (!/^-h/) && (!/^-\?/) && /^-.*$/)

-		{ $c_flags.="$_ "; }

-	else { return(0); }

-	return(1);

-	}

+#!/usr/local/bin/perl
+# A bit of an evil hack but it post processes the file ../MINFO which
+# is generated by `make files` in the top directory.
+# This script outputs one mega makefile that has no shell stuff or any
+# funny stuff
+#
+
+$INSTALLTOP="/usr/local/ssl";
+$OPENSSLDIR="/usr/local/ssl";
+$OPTIONS="";
+$ssl_version="";
+$banner="\t\@echo Building OpenSSL";
+
+my $no_static_engine = 1;
+my $engines = "";
+my $otherlibs = "";
+local $zlib_opt = 0;	# 0 = no zlib, 1 = static, 2 = dynamic
+local $zlib_lib = "";
+local $perl_asm = 0;	# 1 to autobuild asm files from perl scripts
+
+# Options to import from top level Makefile
+
+my %mf_import = (
+	VERSION	       => \$ssl_version,
+	OPTIONS        => \$OPTIONS,
+	INSTALLTOP     => \$INSTALLTOP,
+	OPENSSLDIR     => \$OPENSSLDIR,
+	PLATFORM       => \$mf_platform,
+	CFLAG	       => \$mf_cflag,
+	DEPFLAG	       => \$mf_depflag,
+	CPUID_OBJ      => \$mf_cpuid_asm,
+	BN_ASM	       => \$mf_bn_asm,
+	DES_ENC	       => \$mf_des_asm,
+	AES_ENC        => \$mf_aes_asm,
+	BF_ENC	       => \$mf_bf_asm,
+	CAST_ENC       => \$mf_cast_asm,
+	RC4_ENC	       => \$mf_rc4_asm,
+	RC5_ENC        => \$mf_rc5_asm,
+	MD5_ASM_OBJ    => \$mf_md5_asm,
+	SHA1_ASM_OBJ   => \$mf_sha_asm,
+	RMD160_ASM_OBJ => \$mf_rmd_asm,
+	WP_ASM_OBJ     => \$mf_wp_asm,
+	CMLL_ENC       => \$mf_cm_asm
+);
+
+
+open(IN,"<Makefile") || die "unable to open Makefile!\n";
+while(<IN>) {
+    my ($mf_opt, $mf_ref);
+    while (($mf_opt, $mf_ref) = each %mf_import) {
+    	if (/^$mf_opt\s*=\s*(.*)$/) {
+	   $$mf_ref = $1;
+	}
+    }
+}
+close(IN);
+
+$debug = 1 if $mf_platform =~ /^debug-/;
+
+die "Makefile is not the toplevel Makefile!\n" if $ssl_version eq "";
+
+$infile="MINFO";
+
+%ops=(
+	"VC-WIN32",   "Microsoft Visual C++ [4-6] - Windows NT or 9X",
+	"VC-WIN64I",  "Microsoft C/C++ - Win64/IA-64",
+	"VC-WIN64A",  "Microsoft C/C++ - Win64/x64",
+	"VC-CE",   "Microsoft eMbedded Visual C++ 3.0 - Windows CE ONLY",
+	"VC-NT",   "Microsoft Visual C++ [4-6] - Windows NT ONLY",
+	"Mingw32", "GNU C++ - Windows NT or 9x",
+	"Mingw32-files", "Create files with DOS copy ...",
+	"BC-NT",   "Borland C++ 4.5 - Windows NT",
+	"linux-elf","Linux elf",
+	"ultrix-mips","DEC mips ultrix",
+	"FreeBSD","FreeBSD distribution",
+	"OS2-EMX", "EMX GCC OS/2",
+	"netware-clib", "CodeWarrior for NetWare - CLib - with WinSock Sockets",
+	"netware-clib-bsdsock", "CodeWarrior for NetWare - CLib - with BSD Sockets",
+	"netware-libc", "CodeWarrior for NetWare - LibC - with WinSock Sockets",
+	"netware-libc-bsdsock", "CodeWarrior for NetWare - LibC - with BSD Sockets",
+	"default","cc under unix",
+	"auto", "auto detect from top level Makefile"
+	);
+
+$platform="";
+my $xcflags="";
+foreach (@ARGV)
+	{
+	if (!&read_options && !defined($ops{$_}))
+		{
+		print STDERR "unknown option - $_\n";
+		print STDERR "usage: perl mk1mf.pl [options] [system]\n";
+		print STDERR "\nwhere [system] can be one of the following\n";
+		foreach $i (sort keys %ops)
+		{ printf STDERR "\t%-10s\t%s\n",$i,$ops{$i}; }
+		print STDERR <<"EOF";
+and [options] can be one of
+	no-md2 no-md4 no-md5 no-sha no-mdc2	- Skip this digest
+	no-ripemd
+	no-rc2 no-rc4 no-rc5 no-idea no-des     - Skip this symetric cipher
+	no-bf no-cast no-aes no-camellia no-seed
+	no-rsa no-dsa no-dh			- Skip this public key cipher
+	no-ssl2 no-ssl3				- Skip this version of SSL
+	just-ssl				- remove all non-ssl keys/digest
+	no-asm 					- No x86 asm
+	no-krb5					- No KRB5
+	no-ec					- No EC
+	no-ecdsa				- No ECDSA
+	no-ecdh					- No ECDH
+	no-engine				- No engine
+	no-hw					- No hw
+	nasm 					- Use NASM for x86 asm
+	nw-nasm					- Use NASM x86 asm for NetWare
+	nw-mwasm				- Use Metrowerks x86 asm for NetWare
+	gaswin					- Use GNU as with Mingw32
+	no-socks				- No socket code
+	no-err					- No error strings
+	dll/shlib				- Build shared libraries (MS)
+	debug					- Debug build
+        profile                                 - Profiling build
+	gcc					- Use Gcc (unix)
+
+Values that can be set
+TMP=tmpdir OUT=outdir SRC=srcdir BIN=binpath INC=header-outdir CC=C-compiler
+
+-L<ex_lib_path> -l<ex_lib>			- extra library flags (unix)
+-<ex_cc_flags>					- extra 'cc' flags,
+						  added (MS), or replace (unix)
+EOF
+		exit(1);
+		}
+	$platform=$_;
+	}
+foreach (grep(!/^$/, split(/ /, $OPTIONS)))
+	{
+	print STDERR "unknown option - $_\n" if !&read_options;
+	}
+
+$no_static_engine = 0 if (!$shlib);
+
+$no_mdc2=1 if ($no_des);
+
+$no_ssl3=1 if ($no_md5 || $no_sha);
+$no_ssl3=1 if ($no_rsa && $no_dh);
+
+$no_ssl2=1 if ($no_md5);
+$no_ssl2=1 if ($no_rsa);
+
+$out_def="out";
+$inc_def="outinc";
+$tmp_def="tmp";
+
+$perl="perl" unless defined $perl;
+$mkdir="-mkdir" unless defined $mkdir;
+
+($ssl,$crypto)=("ssl","crypto");
+$ranlib="echo ranlib";
+
+$cc=(defined($VARS{'CC'}))?$VARS{'CC'}:'cc';
+$src_dir=(defined($VARS{'SRC'}))?$VARS{'SRC'}:'.';
+$bin_dir=(defined($VARS{'BIN'}))?$VARS{'BIN'}:'';
+
+# $bin_dir.=$o causes a core dump on my sparc :-(
+
+
+$NT=0;
+
+push(@INC,"util/pl","pl");
+
+if ($platform eq "auto") {
+	$platform = $mf_platform;
+	print STDERR "Imported platform $mf_platform\n";
+}
+
+if (($platform =~ /VC-(.+)/))
+	{
+	$FLAVOR=$1;
+	$NT = 1 if $1 eq "NT";
+	require 'VC-32.pl';
+	}
+elsif ($platform eq "Mingw32")
+	{
+	require 'Mingw32.pl';
+	}
+elsif ($platform eq "Mingw32-files")
+	{
+	require 'Mingw32f.pl';
+	}
+elsif ($platform eq "BC-NT")
+	{
+	$bc=1;
+	require 'BC-32.pl';
+	}
+elsif ($platform eq "FreeBSD")
+	{
+	require 'unix.pl';
+	$cflags='-DTERMIO -D_ANSI_SOURCE -O2 -fomit-frame-pointer';
+	}
+elsif ($platform eq "linux-elf")
+	{
+	require "unix.pl";
+	require "linux.pl";
+	$unix=1;
+	}
+elsif ($platform eq "ultrix-mips")
+	{
+	require "unix.pl";
+	require "ultrix.pl";
+	$unix=1;
+	}
+elsif ($platform eq "OS2-EMX")
+	{
+	$wc=1;
+	require 'OS2-EMX.pl';
+	}
+elsif (($platform eq "netware-clib") || ($platform eq "netware-libc") ||
+       ($platform eq "netware-clib-bsdsock") || ($platform eq "netware-libc-bsdsock"))
+	{
+	$LIBC=1 if $platform eq "netware-libc" || $platform eq "netware-libc-bsdsock";
+	$BSDSOCK=1 if ($platform eq "netware-libc-bsdsock") || ($platform eq "netware-clib-bsdsock");
+	require 'netware.pl';
+	}
+else
+	{
+	require "unix.pl";
+
+	$unix=1;
+	$cflags.=' -DTERMIO';
+	}
+
+$out_dir=(defined($VARS{'OUT'}))?$VARS{'OUT'}:$out_def.($debug?".dbg":"");
+$tmp_dir=(defined($VARS{'TMP'}))?$VARS{'TMP'}:$tmp_def.($debug?".dbg":"");
+$inc_dir=(defined($VARS{'INC'}))?$VARS{'INC'}:$inc_def;
+
+$bin_dir=$bin_dir.$o unless ((substr($bin_dir,-1,1) eq $o) || ($bin_dir eq ''));
+
+$cflags= "$xcflags$cflags" if $xcflags ne "";
+$cdflags= "$xcflags$cflags" if $xcdflags ne "";
+
+$cflags.=" -DOPENSSL_NO_IDEA" if $no_idea;
+$cdflags.=" -DOPENSSL_NO_IDEA" if $no_idea;
+$cflags.=" -DOPENSSL_NO_AES"  if $no_aes;
+$cdflags.=" -DOPENSSL_NO_AES"  if $no_aes;
+$cflags.=" -DOPENSSL_NO_CAMELLIA"  if $no_camellia;
+$cdflags.=" -DOPENSSL_NO_CAMELLIA"  if $no_camellia;
+$cflags.=" -DOPENSSL_NO_SEED" if $no_seed;
+$cdflags.=" -DOPENSSL_NO_SEED" if $no_seed;
+$cflags.=" -DOPENSSL_NO_RC2"  if $no_rc2;
+$cdflags.=" -DOPENSSL_NO_RC2"  if $no_rc2;
+$cflags.=" -DOPENSSL_NO_RC4"  if $no_rc4;
+$cdflags.=" -DOPENSSL_NO_RC4"  if $no_rc4;
+$cflags.=" -DOPENSSL_NO_RC5"  if $no_rc5;
+$cdflags.=" -DOPENSSL_NO_RC5"  if $no_rc5;
+$cflags.=" -DOPENSSL_NO_MD2"  if $no_md2;
+$cdflags.=" -DOPENSSL_NO_MD2"  if $no_md2;
+$cflags.=" -DOPENSSL_NO_MD4"  if $no_md4;
+$cdflags.=" -DOPENSSL_NO_MD4"  if $no_md4;
+$cflags.=" -DOPENSSL_NO_MD5"  if $no_md5;
+$cdflags.=" -DOPENSSL_NO_MD5"  if $no_md5;
+$cflags.=" -DOPENSSL_NO_SHA"  if $no_sha;
+$cdflags.=" -DOPENSSL_NO_SHA"  if $no_sha;
+$cflags.=" -DOPENSSL_NO_SHA1" if $no_sha1;
+$cdflags.=" -DOPENSSL_NO_SHA1" if $no_sha1;
+$cflags.=" -DOPENSSL_NO_RIPEMD" if $no_ripemd;
+$cdflags.=" -DOPENSSL_NO_RIPEMD" if $no_ripemd;
+$cflags.=" -DOPENSSL_NO_MDC2" if $no_mdc2;
+$cdflags.=" -DOPENSSL_NO_MDC2" if $no_mdc2;
+$cflags.=" -DOPENSSL_NO_BF"  if $no_bf;
+$cdflags.=" -DOPENSSL_NO_BF"  if $no_bf;
+$cflags.=" -DOPENSSL_NO_CAST" if $no_cast;
+$cdflags.=" -DOPENSSL_NO_CAST" if $no_cast;
+$cflags.=" -DOPENSSL_NO_DES"  if $no_des;
+$cdflags.=" -DOPENSSL_NO_DES"  if $no_des;
+$cflags.=" -DOPENSSL_NO_RSA"  if $no_rsa;
+$cdflags.=" -DOPENSSL_NO_RSA"  if $no_rsa;
+$cflags.=" -DOPENSSL_NO_DSA"  if $no_dsa;
+$cdflags.=" -DOPENSSL_NO_DSA"  if $no_dsa;
+$cflags.=" -DOPENSSL_NO_DH"   if $no_dh;
+$cdflags.=" -DOPENSSL_NO_DH"   if $no_dh;
+$cflags.=" -DOPENSSL_NO_WHIRLPOOL"   if $no_whirlpool;
+$cdflags.=" -DOPENSSL_NO_WHIRLPOOL"   if $no_whirlpool;
+$cflags.=" -DOPENSSL_NO_SOCK" if $no_sock;
+$cdflags.=" -DOPENSSL_NO_SOCK" if $no_sock;
+$cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2;
+$cdflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2;
+$cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3;
+$cdflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3;
+$cflags.=" -DOPENSSL_NO_TLSEXT" if $no_tlsext;
+$cdflags.=" -DOPENSSL_NO_TLSEXT" if $no_tlsext;
+$cflags.=" -DOPENSSL_NO_CMS" if $no_cms;
+$cdflags.=" -DOPENSSL_NO_CMS" if $no_cms;
+$cflags.=" -DOPENSSL_NO_ERR"  if $no_err;
+$cdflags.=" -DOPENSSL_NO_ERR"  if $no_err;
+$cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5;
+$cdflags.=" -DOPENSSL_NO_KRB5" if $no_krb5;
+$cflags.=" -DOPENSSL_NO_EC"   if $no_ec;
+$cdflags.=" -DOPENSSL_NO_EC"   if $no_ec;
+$cflags.=" -DOPENSSL_NO_ECDSA" if $no_ecdsa;
+$cdflags.=" -DOPENSSL_NO_ECDSA" if $no_ecdsa;
+$cflags.=" -DOPENSSL_NO_ECDH" if $no_ecdh;
+$cdflags.=" -DOPENSSL_NO_ECDH" if $no_ecdh;
+$cflags.=" -DOPENSSL_NO_GOST" if $no_gost;
+$cdflags.=" -DOPENSSL_NO_GOST" if $no_gost;
+$cflags.=" -DOPENSSL_NO_ENGINE"   if $no_engine;
+$cdflags.=" -DOPENSSL_NO_ENGINE"   if $no_engine;
+$cflags.=" -DOPENSSL_NO_HW"   if $no_hw;
+$cdflags.=" -DOPENSSL_NO_HW"   if $no_hw;
+$cflags.=" -DOPENSSL_NO_JPAKE"    if $no_jpake;
+$cdflags.=" -DOPENSSL_NO_JPAKE"    if $no_jpake;
+$cflags.= " -DZLIB" if $zlib_opt;
+$cdflags.= " -DZLIB" if $zlib_opt;
+$cflags.= " -DZLIB_SHARED" if $zlib_opt == 2;
+$cdflags.= " -DZLIB_SHARED" if $zlib_opt == 2;
+
+if ($no_static_engine)
+	{
+	$cflags .= " -DOPENSSL_NO_STATIC_ENGINE";
+	$cdflags .= " -DOPENSSL_NO_STATIC_ENGINE";
+	}
+else
+	{
+	$cflags .= " -DOPENSSL_NO_DYNAMIC_ENGINE";
+	$cdflags .= " -DOPENSSL_NO_DYNAMIC_ENGINE";
+	}
+
+#$cflags.=" -DRSAref"  if $rsaref ne "";
+
+## if ($unix)
+##	{ $cflags="$c_flags" if ($c_flags ne ""); }
+##else
+	{ $cflags="$c_flags$cflags" if ($c_flags ne ""); }
+
+$ex_libs="$l_flags$ex_libs" if ($l_flags ne "");
+
+
+%shlib_ex_cflags=("SSL" => " -DOPENSSL_BUILD_SHLIBSSL",
+		  "CRYPTO" => " -DOPENSSL_BUILD_SHLIBCRYPTO");
+
+if ($msdos)
+	{
+	$banner ="\t\@echo Make sure you have run 'perl Configure $platform' in the\n";
+	$banner.="\t\@echo top level directory, if you don't have perl, you will\n";
+	$banner.="\t\@echo need to probably edit crypto/bn/bn.h, check the\n";
+	$banner.="\t\@echo documentation for details.\n";
+	}
+
+# have to do this to allow $(CC) under unix
+$link="$bin_dir$link" if ($link !~ /^\$/);
+
+$INSTALLTOP =~ s|/|$o|g;
+$OPENSSLDIR =~ s|/|$o|g;
+
+#############################################
+# We parse in input file and 'store' info for later printing.
+open(IN,"<$infile") || die "unable to open $infile:$!\n";
+$_=<IN>;
+for (;;)
+	{
+	chop;
+
+	($key,$val)=/^([^=]+)=(.*)/;
+	if ($key eq "RELATIVE_DIRECTORY")
+		{
+		if ($lib ne "")
+			{
+			$uc=$lib;
+			$uc =~ s/^lib(.*)\.a/$1/;
+			$uc =~ tr/a-z/A-Z/;
+			$lib_nam{$uc}=$uc;
+			$lib_obj{$uc}.=$libobj." ";
+			}
+		last if ($val eq "FINISHED");
+		$lib="";
+		$libobj="";
+		$dir=$val;
+		}
+
+	if ($key eq "KRB5_INCLUDES")
+		{ $cflags .= " $val";}
+
+	if ($key eq "ZLIB_INCLUDE")
+		{ $cflags .= " $val" if $val ne "";}
+
+	if ($key eq "LIBZLIB")
+		{ $zlib_lib = "$val" if $val ne "";}
+
+	if ($key eq "LIBKRB5")
+		{ $ex_libs .= " $val" if $val ne "";}
+
+	if ($key eq "TEST")
+		{ $test.=&var_add($dir,$val, 0); }
+
+	if (($key eq "PROGS") || ($key eq "E_OBJ"))
+		{ $e_exe.=&var_add($dir,$val, 0); }
+
+	if ($key eq "LIB")
+		{
+		$lib=$val;
+		$lib =~ s/^.*\/([^\/]+)$/$1/;
+		}
+	if ($key eq "LIBNAME" && $no_static_engine)
+		{
+		$lib=$val;
+		$lib =~ s/^.*\/([^\/]+)$/$1/;
+		$otherlibs .= " $lib";
+		}
+
+	if ($key eq "EXHEADER")
+		{ $exheader.=&var_add($dir,$val, 1); }
+
+	if ($key eq "HEADER")
+		{ $header.=&var_add($dir,$val, 1); }
+
+	if ($key eq "LIBOBJ" && ($dir ne "engines" || !$no_static_engine))
+		{ $libobj=&var_add($dir,$val, 0); }
+	if ($key eq "LIBNAMES" && $dir eq "engines" && $no_static_engine)
+ 		{ $engines.=$val }
+
+	if (!($_=<IN>))
+		{ $_="RELATIVE_DIRECTORY=FINISHED\n"; }
+	}
+close(IN);
+
+if ($shlib)
+	{
+	$extra_install= <<"EOF";
+	\$(CP) \"\$(O_SSL)\" \"\$(INSTALLTOP)${o}bin\"
+	\$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}bin\"
+	\$(CP) \"\$(L_SSL)\" \"\$(INSTALLTOP)${o}lib\"
+	\$(CP) \"\$(L_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"
+EOF
+	if ($no_static_engine)
+		{
+		$extra_install .= <<"EOF"
+	\$(MKDIR) \"\$(INSTALLTOP)${o}lib${o}engines\"
+	\$(CP) \"\$(E_SHLIB)\" \"\$(INSTALLTOP)${o}lib${o}engines\"
+EOF
+		}
+	}
+else
+	{
+	$extra_install= <<"EOF";
+	\$(CP) \"\$(O_SSL)\" \"\$(INSTALLTOP)${o}lib\"
+	\$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"
+EOF
+	$ex_libs .= " $zlib_lib" if $zlib_opt == 1;
+	}
+
+$defs= <<"EOF";
+# This makefile has been automatically generated from the OpenSSL distribution.
+# This single makefile will build the complete OpenSSL distribution and
+# by default leave the 'intertesting' output files in .${o}out and the stuff
+# that needs deleting in .${o}tmp.
+# The file was generated by running 'make makefile.one', which
+# does a 'make files', which writes all the environment variables from all
+# the makefiles to the file call MINFO.  This file is used by
+# util${o}mk1mf.pl to generate makefile.one.
+# The 'makefile per directory' system suites me when developing this
+# library and also so I can 'distribute' indervidual library sections.
+# The one monster makefile better suits building in non-unix
+# environments.
+
+EOF
+
+$defs .= $preamble if defined $preamble;
+
+$defs.= <<"EOF";
+INSTALLTOP=$INSTALLTOP
+OPENSSLDIR=$OPENSSLDIR
+
+!ifdef DEBUG
+# The output directory for everything intersting
+OUT_D=out32_d
+# The output directory for all the temporary muck
+TMP_D=tmp32_d
+!else
+# The output directory for everything intersting
+OUT_D=out32
+# The output directory for all the temporary muck
+TMP_D=tmp32
+!endif
+
+# Set your compiler options
+PLATFORM=$platform
+CC=$bin_dir${cc}
+!ifdef DEBUG
+CFLAG=$cdflags
+!else
+CFLAG=$cflags
+!endif
+APP_CFLAG=$app_cflag
+LIB_CFLAG=$lib_cflag
+SHLIB_CFLAG=$shl_cflag
+APP_EX_OBJ=$app_ex_obj
+SHLIB_EX_OBJ=$shlib_ex_obj
+# add extra libraries to this define, for solaris -lsocket -lnsl would
+# be added
+EX_LIBS=$ex_libs
+
+# The OpenSSL directory
+SRC_D=$src_dir
+
+LINK=$link
+!ifdef DEBUG
+LFLAGS=$lflagsd
+!else
+LFLAGS=$lflags
+!endif
+RSC=$rsc
+
+# The output directory for the header files
+INC_D=$inc_dir
+INCO_D=$inc_dir${o}openssl
+
+PERL=$perl
+CP=$cp
+RM=$rm
+RANLIB=$ranlib
+MKDIR=$mkdir
+!ifdef DEBUG
+MKLIB=$bin_dir$mklibd
+!else
+MKLIB=$bin_dir$mklib
+!endif
+MLFLAGS=$mlflags
+ASM=$bin_dir$asm
+
+######################################################
+# You should not need to touch anything below this point
+######################################################
+
+E_EXE=openssl
+SSL=$ssl
+CRYPTO=$crypto
+
+# BIN_D  - Binary output directory
+# TEST_D - Binary test file output directory
+# LIB_D  - library output directory
+# ENG_D  - dynamic engine output directory
+# Note: if you change these point to different directories then uncomment out
+# the lines around the 'NB' comment below.
+# 
+BIN_D=\$(OUT_D)
+TEST_D=\$(OUT_D)
+LIB_D=\$(OUT_D)
+ENG_D=\$(OUT_D)
+
+# INCL_D - local library directory
+# OBJ_D  - temp object file directory
+OBJ_D=\$(TMP_D)
+INCL_D=\$(TMP_D)
+
+O_SSL=     \$(LIB_D)$o$plib\$(SSL)$shlibp
+O_CRYPTO=  \$(LIB_D)$o$plib\$(CRYPTO)$shlibp
+SO_SSL=    $plib\$(SSL)$so_shlibp
+SO_CRYPTO= $plib\$(CRYPTO)$so_shlibp
+L_SSL=     \$(LIB_D)$o$plib\$(SSL)$libp
+L_CRYPTO=  \$(LIB_D)$o$plib\$(CRYPTO)$libp
+
+L_LIBS= \$(L_SSL) \$(L_CRYPTO)
+
+######################################################
+# Don't touch anything below this point
+######################################################
+
+INC=-I\$(INC_D) -I\$(INCL_D)
+APP_CFLAGS=\$(INC) \$(CFLAG) \$(APP_CFLAG)
+LIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG)
+SHLIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG) \$(SHLIB_CFLAG)
+LIBS_DEP=\$(O_CRYPTO) \$(O_SSL)
+
+#############################################
+EOF
+
+$rules=<<"EOF";
+all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers lib exe
+
+banner:
+$banner
+
+\$(TMP_D):
+	\$(MKDIR) \"\$(TMP_D)\"
+# NB: uncomment out these lines if BIN_D, TEST_D and LIB_D are different
+#\$(BIN_D):
+#	\$(MKDIR) \$(BIN_D)
+#
+#\$(TEST_D):
+#	\$(MKDIR) \$(TEST_D)
+
+\$(LIB_D):
+	\$(MKDIR) \"\$(LIB_D)\"
+
+\$(INCO_D): \$(INC_D)
+	\$(MKDIR) \"\$(INCO_D)\"
+
+\$(INC_D):
+	\$(MKDIR) \"\$(INC_D)\"
+
+headers: \$(HEADER) \$(EXHEADER)
+	@
+
+lib: \$(LIBS_DEP) \$(E_SHLIB)
+
+exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep
+
+install: all
+	\$(MKDIR) \"\$(INSTALLTOP)\"
+	\$(MKDIR) \"\$(INSTALLTOP)${o}bin\"
+	\$(MKDIR) \"\$(INSTALLTOP)${o}include\"
+	\$(MKDIR) \"\$(INSTALLTOP)${o}include${o}openssl\"
+	\$(MKDIR) \"\$(INSTALLTOP)${o}lib\"
+	\$(CP) \"\$(INCO_D)${o}*.\[ch\]\" \"\$(INSTALLTOP)${o}include${o}openssl\"
+	\$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin\"
+	\$(MKDIR) \"\$(OPENSSLDIR)\"
+	\$(CP) apps${o}openssl.cnf \"\$(OPENSSLDIR)\"
+$extra_install
+
+
+test: \$(T_EXE)
+	cd \$(BIN_D)
+	..${o}ms${o}test
+
+clean:
+	\$(RM) \$(TMP_D)$o*.*
+
+vclean:
+	\$(RM) \$(TMP_D)$o*.*
+	\$(RM) \$(OUT_D)$o*.*
+
+EOF
+    
+my $platform_cpp_symbol = "MK1MF_PLATFORM_$platform";
+$platform_cpp_symbol =~ s/-/_/g;
+if (open(IN,"crypto/buildinf.h"))
+	{
+	# Remove entry for this platform in existing file buildinf.h.
+
+	my $old_buildinf_h = "";
+	while (<IN>)
+		{
+		if (/^\#ifdef $platform_cpp_symbol$/)
+			{
+			while (<IN>) { last if (/^\#endif/); }
+			}
+		else
+			{
+			$old_buildinf_h .= $_;
+			}
+		}
+	close(IN);
+
+	open(OUT,">crypto/buildinf.h") || die "Can't open buildinf.h";
+	print OUT $old_buildinf_h;
+	close(OUT);
+	}
+
+open (OUT,">>crypto/buildinf.h") || die "Can't open buildinf.h";
+printf OUT <<EOF;
+#ifdef $platform_cpp_symbol
+  /* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */
+  #define CFLAGS "$cc $cflags"
+  #define PLATFORM "$platform"
+EOF
+printf OUT "  #define DATE \"%s\"\n", scalar gmtime();
+printf OUT "#endif\n";
+close(OUT);
+
+# Strip of trailing ' '
+foreach (keys %lib_obj) { $lib_obj{$_}=&clean_up_ws($lib_obj{$_}); }
+$test=&clean_up_ws($test);
+$e_exe=&clean_up_ws($e_exe);
+$exheader=&clean_up_ws($exheader);
+$header=&clean_up_ws($header);
+
+# First we strip the exheaders from the headers list
+foreach (split(/\s+/,$exheader)){ $h{$_}=1; }
+foreach (split(/\s+/,$header))	{ $h.=$_." " unless $h{$_}; }
+chop($h); $header=$h;
+
+$defs.=&do_defs("HEADER",$header,"\$(INCL_D)","");
+$rules.=&do_copy_rule("\$(INCL_D)",$header,"");
+
+$defs.=&do_defs("EXHEADER",$exheader,"\$(INCO_D)","");
+$rules.=&do_copy_rule("\$(INCO_D)",$exheader,"");
+
+$defs.=&do_defs("T_OBJ",$test,"\$(OBJ_D)",$obj);
+$rules.=&do_compile_rule("\$(OBJ_D)",$test,"\$(APP_CFLAGS)");
+
+$defs.=&do_defs("E_OBJ",$e_exe,"\$(OBJ_D)",$obj);
+$rules.=&do_compile_rule("\$(OBJ_D)",$e_exe,'-DMONOLITH $(APP_CFLAGS)');
+
+foreach (values %lib_nam)
+	{
+	$lib_obj=$lib_obj{$_};
+	local($slib)=$shlib;
+
+	if (($_ eq "SSL") && $no_ssl2 && $no_ssl3)
+		{
+		$rules.="\$(O_SSL):\n\n"; 
+		next;
+		}
+
+	$defs.=&do_defs(${_}."OBJ",$lib_obj,"\$(OBJ_D)",$obj);
+	$lib=($slib)?" \$(SHLIB_CFLAGS)".$shlib_ex_cflags{$_}:" \$(LIB_CFLAGS)";
+	$rules.=&do_compile_rule("\$(OBJ_D)",$lib_obj{$_},$lib);
+	}
+
+# hack to add version info on MSVC
+if (($platform eq "VC-WIN32") || ($platform eq "VC-WIN64A")
+	|| ($platform eq "VC-WIN64I") || ($platform eq "VC-NT")) {
+    $rules.= <<"EOF";
+\$(OBJ_D)\\\$(CRYPTO).res: ms\\version32.rc
+	\$(RSC) /fo"\$(OBJ_D)\\\$(CRYPTO).res" /d CRYPTO ms\\version32.rc
+
+\$(OBJ_D)\\\$(SSL).res: ms\\version32.rc
+	\$(RSC) /fo"\$(OBJ_D)\\\$(SSL).res" /d SSL ms\\version32.rc
+
+EOF
+}
+
+$defs.=&do_defs("T_EXE",$test,"\$(TEST_D)",$exep);
+foreach (split(/\s+/,$test))
+	{
+	$t=&bname($_);
+	$tt="\$(OBJ_D)${o}$t${obj}";
+	$rules.=&do_link_rule("\$(TEST_D)$o$t$exep",$tt,"\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)");
+	}
+
+$defs.=&do_defs("E_SHLIB",$engines . $otherlibs,"\$(ENG_D)",$shlibp);
+
+foreach (split(/\s+/,$engines))
+	{
+	$rules.=&do_compile_rule("\$(OBJ_D)","engines${o}e_$_",$lib);
+	$rules.= &do_lib_rule("\$(OBJ_D)${o}e_${_}.obj","\$(ENG_D)$o$_$shlibp","",$shlib,"");
+	}
+
+
+
+$rules.= &do_lib_rule("\$(SSLOBJ)","\$(O_SSL)",$ssl,$shlib,"\$(SO_SSL)");
+$rules.= &do_lib_rule("\$(CRYPTOOBJ)","\$(O_CRYPTO)",$crypto,$shlib,"\$(SO_CRYPTO)");
+
+foreach (split(" ",$otherlibs))
+	{
+	my $uc = $_;
+	$uc =~ tr /a-z/A-Z/;	
+	$rules.= &do_lib_rule("\$(${uc}OBJ)","\$(ENG_D)$o$_$shlibp", "", $shlib, "");
+
+	}
+
+$rules.=&do_link_rule("\$(BIN_D)$o\$(E_EXE)$exep","\$(E_OBJ)","\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)");
+
+print $defs;
+
+if ($platform eq "linux-elf") {
+    print <<"EOF";
+# Generate perlasm output files
+%.cpp:
+	(cd \$(\@D)/..; PERL=perl make -f Makefile asm/\$(\@F))
+EOF
+}
+print "###################################################################\n";
+print $rules;
+
+###############################################
+# strip off any trailing .[och] and append the relative directory
+# also remembering to do nothing if we are in one of the dropped
+# directories
+sub var_add
+	{
+	local($dir,$val,$keepext)=@_;
+	local(@a,$_,$ret);
+
+	return("") if $no_engine && $dir =~ /\/engine/;
+	return("") if $no_hw   && $dir =~ /\/hw/;
+	return("") if $no_idea && $dir =~ /\/idea/;
+	return("") if $no_aes  && $dir =~ /\/aes/;
+	return("") if $no_camellia  && $dir =~ /\/camellia/;
+	return("") if $no_seed && $dir =~ /\/seed/;
+	return("") if $no_rc2  && $dir =~ /\/rc2/;
+	return("") if $no_rc4  && $dir =~ /\/rc4/;
+	return("") if $no_rc5  && $dir =~ /\/rc5/;
+	return("") if $no_rsa  && $dir =~ /\/rsa/;
+	return("") if $no_rsa  && $dir =~ /^rsaref/;
+	return("") if $no_dsa  && $dir =~ /\/dsa/;
+	return("") if $no_dh   && $dir =~ /\/dh/;
+	return("") if $no_ec   && $dir =~ /\/ec/;
+	return("") if $no_gost   && $dir =~ /\/ccgost/;
+	return("") if $no_cms  && $dir =~ /\/cms/;
+	return("") if $no_jpake  && $dir =~ /\/jpake/;
+	if ($no_des && $dir =~ /\/des/)
+		{
+		if ($val =~ /read_pwd/)
+			{ return("$dir/read_pwd "); }
+		else
+			{ return(""); }
+		}
+	return("") if $no_mdc2 && $dir =~ /\/mdc2/;
+	return("") if $no_sock && $dir =~ /\/proxy/;
+	return("") if $no_bf   && $dir =~ /\/bf/;
+	return("") if $no_cast && $dir =~ /\/cast/;
+	return("") if $no_whirlpool && $dir =~ /\/whrlpool/;
+
+	$val =~ s/^\s*(.*)\s*$/$1/;
+	@a=split(/\s+/,$val);
+	grep(s/\.[och]$//,@a) unless $keepext;
+
+	@a=grep(!/^e_.*_3d$/,@a) if $no_des;
+	@a=grep(!/^e_.*_d$/,@a) if $no_des;
+	@a=grep(!/^e_.*_ae$/,@a) if $no_idea;
+	@a=grep(!/^e_.*_i$/,@a) if $no_aes;
+	@a=grep(!/^e_.*_r2$/,@a) if $no_rc2;
+	@a=grep(!/^e_.*_r5$/,@a) if $no_rc5;
+	@a=grep(!/^e_.*_bf$/,@a) if $no_bf;
+	@a=grep(!/^e_.*_c$/,@a) if $no_cast;
+	@a=grep(!/^e_rc4$/,@a) if $no_rc4;
+	@a=grep(!/^e_camellia$/,@a) if $no_camellia;
+	@a=grep(!/^e_seed$/,@a) if $no_seed;
+
+	#@a=grep(!/(^s2_)|(^s23_)/,@a) if $no_ssl2;
+	#@a=grep(!/(^s3_)|(^s23_)/,@a) if $no_ssl3;
+
+	@a=grep(!/(_sock$)|(_acpt$)|(_conn$)|(^pxy_)/,@a) if $no_sock;
+
+	@a=grep(!/(^md2)|(_md2$)/,@a) if $no_md2;
+	@a=grep(!/(^md4)|(_md4$)/,@a) if $no_md4;
+	@a=grep(!/(^md5)|(_md5$)/,@a) if $no_md5;
+	@a=grep(!/(rmd)|(ripemd)/,@a) if $no_ripemd;
+
+	@a=grep(!/(^d2i_r_)|(^i2d_r_)/,@a) if $no_rsa;
+	@a=grep(!/(^p_open$)|(^p_seal$)/,@a) if $no_rsa;
+	@a=grep(!/(^pem_seal$)/,@a) if $no_rsa;
+
+	@a=grep(!/(m_dss$)|(m_dss1$)/,@a) if $no_dsa;
+	@a=grep(!/(^d2i_s_)|(^i2d_s_)|(_dsap$)/,@a) if $no_dsa;
+
+	@a=grep(!/^n_pkey$/,@a) if $no_rsa || $no_rc4;
+
+	@a=grep(!/_dhp$/,@a) if $no_dh;
+
+	@a=grep(!/(^sha[^1])|(_sha$)|(m_dss$)/,@a) if $no_sha;
+	@a=grep(!/(^sha1)|(_sha1$)|(m_dss1$)/,@a) if $no_sha1;
+	@a=grep(!/_mdc2$/,@a) if $no_mdc2;
+
+	@a=grep(!/^engine$/,@a) if $no_engine;
+	@a=grep(!/^hw$/,@a) if $no_hw;
+	@a=grep(!/(^rsa$)|(^genrsa$)/,@a) if $no_rsa;
+	@a=grep(!/(^dsa$)|(^gendsa$)|(^dsaparam$)/,@a) if $no_dsa;
+	@a=grep(!/^gendsa$/,@a) if $no_sha1;
+	@a=grep(!/(^dh$)|(^gendh$)/,@a) if $no_dh;
+
+	@a=grep(!/(^dh)|(_sha1$)|(m_dss1$)/,@a) if $no_sha1;
+
+	grep($_="$dir/$_",@a);
+	@a=grep(!/(^|\/)s_/,@a) if $no_sock;
+	@a=grep(!/(^|\/)bio_sock/,@a) if $no_sock;
+	$ret=join(' ',@a)." ";
+	return($ret);
+	}
+
+# change things so that each 'token' is only separated by one space
+sub clean_up_ws
+	{
+	local($w)=@_;
+
+	$w =~ s/^\s*(.*)\s*$/$1/;
+	$w =~ s/\s+/ /g;
+	return($w);
+	}
+
+sub do_defs
+	{
+	local($var,$files,$location,$postfix)=@_;
+	local($_,$ret,$pf);
+	local(*OUT,$tmp,$t);
+
+	$files =~ s/\//$o/g if $o ne '/';
+	$ret="$var="; 
+	$n=1;
+	$Vars{$var}.="";
+	foreach (split(/ /,$files))
+		{
+		$orig=$_;
+		$_=&bname($_) unless /^\$/;
+		if ($n++ == 2)
+			{
+			$n=0;
+			$ret.="\\\n\t";
+			}
+		if (($_ =~ /bss_file/) && ($postfix eq ".h"))
+			{ $pf=".c"; }
+		else	{ $pf=$postfix; }
+		if ($_ =~ /BN_ASM/)	{ $t="$_ "; }
+		elsif ($_ =~ /BNCO_ASM/){ $t="$_ "; }
+		elsif ($_ =~ /AES_ASM/){ $t="$_ "; }
+		elsif ($_ =~ /DES_ENC/)	{ $t="$_ "; }
+		elsif ($_ =~ /BF_ENC/)	{ $t="$_ "; }
+		elsif ($_ =~ /CAST_ENC/){ $t="$_ "; }
+		elsif ($_ =~ /RC4_ENC/)	{ $t="$_ "; }
+		elsif ($_ =~ /RC5_ENC/)	{ $t="$_ "; }
+		elsif ($_ =~ /MD5_ASM/)	{ $t="$_ "; }
+		elsif ($_ =~ /SHA1_ASM/){ $t="$_ "; }
+		elsif ($_ =~ /RMD160_ASM/){ $t="$_ "; }
+		elsif ($_ =~ /WHIRLPOOL_ASM/){ $t="$_ "; }
+		elsif ($_ =~ /CPUID_ASM/){ $t="$_ "; }
+		else	{ $t="$location${o}$_$pf "; }
+
+		$Vars{$var}.="$t ";
+		$ret.=$t;
+		}
+	# hack to add version info on MSVC
+	if ($shlib && (($platform eq "VC-WIN32") || ($platfrom eq "VC-WIN64I") || ($platform eq "VC-WIN64A") || ($platform eq "VC-NT")))
+		{
+		if ($var eq "CRYPTOOBJ")
+			{ $ret.="\$(OBJ_D)\\\$(CRYPTO).res "; }
+		elsif ($var eq "SSLOBJ")
+			{ $ret.="\$(OBJ_D)\\\$(SSL).res "; }
+		}
+	chomp($ret);
+	$ret.="\n\n";
+	return($ret);
+	}
+
+# return the name with the leading path removed
+sub bname
+	{
+	local($ret)=@_;
+	$ret =~ s/^.*[\\\/]([^\\\/]+)$/$1/;
+	return($ret);
+	}
+
+# return the leading path
+sub dname
+	{
+	my $ret=shift;
+	$ret =~ s/(^.*)[\\\/][^\\\/]+$/$1/;
+	return($ret);
+	}
+
+##############################################################
+# do a rule for each file that says 'compile' to new direcory
+# compile the files in '$files' into $to
+sub do_compile_rule
+	{
+	local($to,$files,$ex)=@_;
+	local($ret,$_,$n,$d,$s);
+
+	$files =~ s/\//$o/g if $o ne '/';
+	foreach (split(/\s+/,$files))
+		{
+		$n=&bname($_);
+		$d=&dname($_);
+		if (-f "${_}.c")
+			{
+			$ret.=&cc_compile_target("$to${o}$n$obj","${_}.c",$ex)
+			}
+		elsif (-f ($s="${d}${o}asm${o}${n}.pl") or
+		       ($s=~s/sha256/sha512/ and -f $s) or
+		       -f ($s="${d}${o}${n}.pl"))
+			{
+			$ret.=&perlasm_compile_target("$to${o}$n$obj",$s,$n);
+			}
+		elsif (-f ($s="${d}${o}asm${o}${n}.S") or
+		       -f ($s="${d}${o}${n}.S"))
+			{
+			$ret.=&Sasm_compile_target("$to${o}$n$obj",$s,$n);
+			}
+		else	{ die "no rule for $_"; }
+		}
+	return($ret);
+	}
+
+##############################################################
+# do a rule for each file that says 'compile' to new direcory
+sub perlasm_compile_target
+	{
+	my($target,$source,$bname)=@_;
+	my($ret);
+
+	$bname =~ s/(.*)\.[^\.]$/$1/;
+	$ret ="\$(TMP_D)$o$bname.asm: $source\n";
+	$ret.="\t\$(PERL) $source $asmtype \$(CFLAG) >\$\@\n\n";
+	$ret.="$target: \$(TMP_D)$o$bname.asm\n";
+	$ret.="\t\$(ASM) $afile\$\@ \$(TMP_D)$o$bname.asm\n\n";
+	return($ret);
+	}
+
+sub Sasm_compile_target
+	{
+	my($target,$source,$bname)=@_;
+	my($ret);
+
+	$bname =~ s/(.*)\.[^\.]$/$1/;
+	$ret ="\$(TMP_D)$o$bname.asm: $source\n";
+	$ret.="\t\$(CC) -E \$(CFLAG) $source >\$\@\n\n";
+	$ret.="$target: \$(TMP_D)$o$bname.asm\n";
+	$ret.="\t\$(ASM) $afile\$\@ \$(TMP_D)$o$bname.asm\n\n";
+	return($ret);
+	}
+
+sub cc_compile_target
+	{
+	local($target,$source,$ex_flags)=@_;
+	local($ret);
+	
+	$ex_flags.=" -DMK1MF_BUILD -D$platform_cpp_symbol" if ($source =~ /cversion/);
+	$target =~ s/\//$o/g if $o ne "/";
+	$source =~ s/\//$o/g if $o ne "/";
+	$ret ="$target: \$(SRC_D)$o$source\n\t";
+	$ret.="\$(CC) ${ofile}$target $ex_flags -c \$(SRC_D)$o$source\n\n";
+	return($ret);
+	}
+
+##############################################################
+sub do_asm_rule
+	{
+	local($target,$src)=@_;
+	local($ret,@s,@t,$i);
+
+	$target =~ s/\//$o/g if $o ne "/";
+	$src =~ s/\//$o/g if $o ne "/";
+
+	@t=split(/\s+/,$target);
+	@s=split(/\s+/,$src);
+
+
+	for ($i=0; $i<=$#s; $i++)
+		{
+		my $objfile = $t[$i];
+		my $srcfile = $s[$i];
+
+		if ($perl_asm == 1)
+			{
+			my $plasm = $objfile;
+			$plasm =~ s/${obj}/.pl/;
+			$ret.="$srcfile: $plasm\n";
+			$ret.="\t\$(PERL) $plasm $asmtype \$(CFLAG) >$srcfile\n\n";
+			}
+
+		$ret.="$objfile: $srcfile\n";
+		$ret.="\t\$(ASM) $afile$objfile \$(SRC_D)$o$srcfile\n\n";
+		}
+	return($ret);
+	}
+
+sub do_shlib_rule
+	{
+	local($n,$def)=@_;
+	local($ret,$nn);
+	local($t);
+
+	($nn=$n) =~ tr/a-z/A-Z/;
+	$ret.="$n.dll: \$(${nn}OBJ)\n";
+	if ($vc && $w32)
+		{
+		$ret.="\t\$(MKSHLIB) $efile$n.dll $def @<<\n  \$(${nn}OBJ_F)\n<<\n";
+		}
+	$ret.="\n";
+	return($ret);
+	}
+
+# do a rule for each file that says 'copy' to new direcory on change
+sub do_copy_rule
+	{
+	local($to,$files,$p)=@_;
+	local($ret,$_,$n,$pp);
+	
+	$files =~ s/\//$o/g if $o ne '/';
+	foreach (split(/\s+/,$files))
+		{
+		$n=&bname($_);
+		if ($n =~ /bss_file/)
+			{ $pp=".c"; }
+		else	{ $pp=$p; }
+		$ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp\n\t\$(CP) \"\$(SRC_D)$o$_$pp\" \"$to${o}$n$pp\"\n\n";
+		}
+	return($ret);
+	}
+
+sub read_options
+	{
+	# Many options are handled in a similar way. In particular
+	# no-xxx sets zero or more scalars to 1.
+	# Process these using a hash containing the option name and
+	# reference to the scalars to set.
+
+	my %valid_options = (
+		"no-rc2" => \$no_rc2,
+		"no-rc4" => \$no_rc4,
+		"no-rc5" => \$no_rc5,
+		"no-idea" => \$no_idea,
+		"no-aes" => \$no_aes,
+		"no-camellia" => \$no_camellia,
+		"no-seed" => \$no_seed,
+		"no-des" => \$no_des,
+		"no-bf" => \$no_bf,
+		"no-cast" => \$no_cast,
+		"no-md2" => \$no_md2,
+		"no-md4" => \$no_md4,
+		"no-md5" => \$no_md5,
+		"no-sha" => \$no_sha,
+		"no-sha1" => \$no_sha1,
+		"no-ripemd" => \$no_ripemd,
+		"no-mdc2" => \$no_mdc2,
+		"no-whirlpool" => \$no_whirlpool,
+		"no-patents" => 
+			[\$no_rc2, \$no_rc4, \$no_rc5, \$no_idea, \$no_rsa],
+		"no-rsa" => \$no_rsa,
+		"no-dsa" => \$no_dsa,
+		"no-dh" => \$no_dh,
+		"no-hmac" => \$no_hmac,
+		"no-asm" => \$no_asm,
+		"nasm" => \$nasm,
+		"nw-nasm" => \$nw_nasm,
+		"nw-mwasm" => \$nw_mwasm,
+		"gaswin" => \$gaswin,
+		"no-ssl2" => \$no_ssl2,
+		"no-ssl3" => \$no_ssl3,
+		"no-tlsext" => \$no_tlsext,
+		"no-cms" => \$no_cms,
+		"no-jpake" => \$no_jpake,
+		"no-err" => \$no_err,
+		"no-sock" => \$no_sock,
+		"no-krb5" => \$no_krb5,
+		"no-ec" => \$no_ec,
+		"no-ecdsa" => \$no_ecdsa,
+		"no-ecdh" => \$no_ecdh,
+		"no-gost" => \$no_gost,
+		"no-engine" => \$no_engine,
+		"no-hw" => \$no_hw,
+		"just-ssl" =>
+			[\$no_rc2, \$no_idea, \$no_des, \$no_bf, \$no_cast,
+			  \$no_md2, \$no_sha, \$no_mdc2, \$no_dsa, \$no_dh,
+			  \$no_ssl2, \$no_err, \$no_ripemd, \$no_rc5,
+			  \$no_aes, \$no_camellia, \$no_seed],
+		"rsaref" => 0,
+		"gcc" => \$gcc,
+		"debug" => \$debug,
+		"profile" => \$profile,
+		"shlib" => \$shlib,
+		"dll" => \$shlib,
+		"shared" => 0,
+		"no-gmp" => 0,
+		"no-rfc3779" => 0,
+		"no-montasm" => 0,
+		"no-shared" => 0,
+		"no-store" => 0,
+		"no-zlib" => 0,
+		"no-zlib-dynamic" => 0,
+		);
+
+	if (exists $valid_options{$_})
+		{
+		my $r = $valid_options{$_};
+		if ( ref $r eq "SCALAR")
+			{ $$r = 1;}
+		elsif ( ref $r eq "ARRAY")
+			{
+			my $r2;
+			foreach $r2 (@$r)
+				{
+				$$r2 = 1;
+				}
+			}
+		}
+	elsif (/^no-comp$/) { $xcflags = "-DOPENSSL_NO_COMP $xcflags"; }
+	elsif (/^enable-zlib$/) { $zlib_opt = 1 if $zlib_opt == 0 }
+	elsif (/^enable-zlib-dynamic$/)
+		{
+		$zlib_opt = 2;
+		}
+	elsif (/^no-static-engine/)
+		{
+		$no_static_engine = 1;
+		}
+	elsif (/^enable-static-engine/)
+		{
+		$no_static_engine = 0;
+		}
+	# There are also enable-xxx options which correspond to
+	# the no-xxx. Since the scalars are enabled by default
+	# these can be ignored.
+	elsif (/^enable-/)
+		{
+		my $t = $_;
+		$t =~ s/^enable/no/;
+		if (exists $valid_options{$t})
+			{return 1;}
+		return 0;
+		}
+	# experimental-xxx is mostly like enable-xxx, but opensslconf.v
+	# will still set OPENSSL_NO_xxx unless we set OPENSSL_EXPERIMENTAL_xxx.
+	# (No need to fail if we don't know the algorithm -- this is for adventurous users only.)
+	elsif (/^experimental-/)
+		{
+		my $algo, $ALGO;
+		($algo = $_) =~ s/^experimental-//;
+		($ALGO = $algo) =~ tr/[a-z]/[A-Z]/;
+
+		$xcflags="-DOPENSSL_EXPERIMENTAL_$ALGO $xcflags";
+		
+		}
+	elsif (/^--with-krb5-flavor=(.*)$/)
+		{
+		my $krb5_flavor = $1;
+		if ($krb5_flavor =~ /^force-[Hh]eimdal$/)
+			{
+			$xcflags="-DKRB5_HEIMDAL $xcflags";
+			}
+		elsif ($krb5_flavor =~ /^MIT/i)
+			{
+			$xcflags="-DKRB5_MIT $xcflags";
+		 	if ($krb5_flavor =~ /^MIT[._-]*1[._-]*[01]/i)
+				{
+				$xcflags="-DKRB5_MIT_OLD11 $xcflags"
+				}
+			}
+		}
+	elsif (/^([^=]*)=(.*)$/){ $VARS{$1}=$2; }
+	elsif (/^-[lL].*$/)	{ $l_flags.="$_ "; }
+	elsif ((!/^-help/) && (!/^-h/) && (!/^-\?/) && /^-.*$/)
+		{ $c_flags.="$_ "; }
+	else { return(0); }
+	return(1);
+	}
diff --git a/openssl/util/mkerr.pl b/openssl/util/mkerr.pl
index 74e3ef67b..d8ea43a5d 100644
--- a/openssl/util/mkerr.pl
+++ b/openssl/util/mkerr.pl
@@ -1,810 +1,810 @@
-#!/usr/local/bin/perl -w

-

-my $config = "crypto/err/openssl.ec";

-my $hprefix = "openssl/";

-my $debug = 0;

-my $rebuild = 0;

-my $static = 1;

-my $recurse = 0;

-my $reindex = 0;

-my $dowrite = 0;

-my $staticloader = "";

-

-my $pack_errcode;

-my $load_errcode;

-

-my $errcount;

-

-while (@ARGV) {

-	my $arg = $ARGV[0];

-	if($arg eq "-conf") {

-		shift @ARGV;

-		$config = shift @ARGV;

-	} elsif($arg eq "-hprefix") {

-		shift @ARGV;

-		$hprefix = shift @ARGV;

-	} elsif($arg eq "-debug") {

-		$debug = 1;

-		shift @ARGV;

-	} elsif($arg eq "-rebuild") {

-		$rebuild = 1;

-		shift @ARGV;

-	} elsif($arg eq "-recurse") {

-		$recurse = 1;

-		shift @ARGV;

-	} elsif($arg eq "-reindex") {

-		$reindex = 1;

-		shift @ARGV;

-	} elsif($arg eq "-nostatic") {

-		$static = 0;

-		shift @ARGV;

-	} elsif($arg eq "-staticloader") {

-		$staticloader = "static ";

-		shift @ARGV;

-	} elsif($arg eq "-write") {

-		$dowrite = 1;

-		shift @ARGV;

-	} elsif($arg eq "-help" || $arg eq "-h" || $arg eq "-?" || $arg eq "--help") {

-		print STDERR <<"EOF";

-mkerr.pl [options] ...

-

-Options:

-

-  -conf F       Use the config file F instead of the default one:

-                  crypto/err/openssl.ec

-

-  -hprefix P    Prepend the filenames in generated #include <header>

-                statements with prefix P. Default: 'openssl/' (without

-                the quotes, naturally)

-

-  -debug        Turn on debugging verbose output on stderr.

-

-  -rebuild      Rebuild all header and C source files, irrespective of the

-                fact if any error or function codes have been added/removed.

-                Default: only update files for libraries which saw change

-                         (of course, this requires '-write' as well, or no

-                          files will be touched!)

-

-  -recurse      scan a preconfigured set of directories / files for error and

-                function codes:

-                  (<crypto/*.c>, <crypto/*/*.c>, <ssl/*.c>, <apps/*.c>)

-                When this option is NOT specified, the filelist is taken from

-                the commandline instead. Here, wildcards may be embedded. (Be

-                sure to escape those to prevent the shell from expanding them

-                for you when you wish mkerr.pl to do so instead.)

-                Default: take file list to scan from the command line.

-

-  -reindex      Discard the numeric values previously assigned to the error

-                and function codes as extracted from the scanned header files;

-                instead renumber all of them starting from 100. (Note that

-                the numbers assigned through 'R' records in the config file

-                remain intact.)

-                Default: keep previously assigned numbers. (You are warned

-                         when collisions are detected.)

-

-  -nostatic     Generates a different source code, where these additional 

-                functions are generated for each library specified in the

-                config file:

-                  void ERR_load_<LIB>_strings(void);

-                  void ERR_unload_<LIB>_strings(void);

-                  void ERR_<LIB>_error(int f, int r, char *fn, int ln);

-                  #define <LIB>err(f,r) ERR_<LIB>_error(f,r,__FILE__,__LINE__)

-                while the code facilitates the use of these in an environment

-                where the error support routines are dynamically loaded at 

-                runtime.

-                Default: 'static' code generation.

-

-  -staticloader Prefix generated functions with the 'static' scope modifier.

-                Default: don't write any scope modifier prefix.

-

-  -write        Actually (over)write the generated code to the header and C 

-                source files as assigned to each library through the config 

-                file.

-                Default: don't write.

-

-  -help / -h / -? / --help            Show this help text.

-

-  ...           Additional arguments are added to the file list to scan,

-                assuming '-recurse' was NOT specified on the command line.

-

-EOF

-		exit 1;

-	} else {

-		last;

-	}

-}

-

-if($recurse) {

-	@source = (<crypto/*.c>, <crypto/*/*.c>, <ssl/*.c>);

-} else {

-	@source = @ARGV;

-}

-

-# Read in the config file

-

-open(IN, "<$config") || die "Can't open config file $config";

-

-# Parse config file

-

-while(<IN>)

-{

-	if(/^L\s+(\S+)\s+(\S+)\s+(\S+)/) {

-		$hinc{$1} = $2;

-		$libinc{$2} = $1;

-		$cskip{$3} = $1;

-		if($3 ne "NONE") {

-			$csrc{$1} = $3;

-			$fmax{$1} = 100;

-			$rmax{$1} = 100;

-			$fassigned{$1} = ":";

-			$rassigned{$1} = ":";

-			$fnew{$1} = 0;

-			$rnew{$1} = 0;

-		}

-	} elsif (/^F\s+(\S+)/) {

-	# Add extra function with $1

-	} elsif (/^R\s+(\S+)\s+(\S+)/) {

-		$rextra{$1} = $2;

-		$rcodes{$1} = $2;

-	}

-}

-

-close IN;

-

-# Scan each header file in turn and make a list of error codes

-# and function names

-

-while (($hdr, $lib) = each %libinc)

-{

-	next if($hdr eq "NONE");

-	print STDERR "Scanning header file $hdr\n" if $debug; 

-	my $line = "", $def= "", $linenr = 0, $gotfile = 0;

-	if (open(IN, "<$hdr")) {

-	    $gotfile = 1;

-	    while(<IN>) {

-		$linenr++;

-		print STDERR "line: $linenr\r" if $debug;

-

-		last if(/BEGIN\s+ERROR\s+CODES/);

-		if ($line ne '') {

-		    $_ = $line . $_;

-		    $line = '';

-		}

-

-		if (/\\$/) {

-		    $line = $_;

-		    next;

-		}

-

-		if(/\/\*/) {

-		    if (not /\*\//) {		# multiline comment...

-			$line = $_;		# ... just accumulate

-			next; 

-		    } else {

-			s/\/\*.*?\*\///gs;	# wipe it

-		    }

-		}

-

-		if ($cpp) {

-		    $cpp++ if /^#\s*if/;

-		    $cpp-- if /^#\s*endif/;

-		    next;

-		}

-		$cpp = 1 if /^#.*ifdef.*cplusplus/;  # skip "C" declaration

-

-		next if (/^\#/);                      # skip preprocessor directives

-

-		s/{[^{}]*}//gs;                      # ignore {} blocks

-

-		if (/\{|\/\*/) { # Add a } so editor works...

-		    $line = $_;

-		} else {

-		    $def .= $_;

-		}

-	    }

-	}

-

-	print STDERR "                                  \r" if $debug;

-        $defnr = 0;

-	# Delete any DECLARE_ macros

-	$def =~ s/DECLARE_\w+\([\w,\s]+\)//gs;

-	foreach (split /;/, $def) {

-	    $defnr++;

-	    print STDERR "def: $defnr\r" if $debug;

-

-	    # The goal is to collect function names from function declarations.

-

-	    s/^[\n\s]*//g;

-	    s/[\n\s]*$//g;

-

-	    # Skip over recognized non-function declarations

-	    next if(/typedef\W/ or /DECLARE_STACK_OF/ or /TYPEDEF_.*_OF/);

-

-	    # Remove STACK_OF(foo)

-	    s/STACK_OF\(\w+\)/void/;

-

-	    # Reduce argument lists to empty ()

-	    # fold round brackets recursively: (t(*v)(t),t) -> (t{}{},t) -> {}

-	    while(/\(.*\)/s) {

-		s/\([^\(\)]+\)/\{\}/gs;

-		s/\(\s*\*\s*(\w+)\s*\{\}\s*\)/$1/gs;	#(*f{}) -> f

-	    }

-	    # pretend as we didn't use curly braces: {} -> ()

-	    s/\{\}/\(\)/gs;

-

-	    if (/(\w+)\s*\(\).*/s) {	# first token prior [first] () is

-		my $name = $1;		# a function name!

-		$name =~ tr/[a-z]/[A-Z]/;

-		$ftrans{$name} = $1;

-	    } elsif (/[\(\)]/ and not (/=/)) {

-		print STDERR "Header $hdr: cannot parse: $_;\n";

-	    }

-	}

-

-	print STDERR "                                  \r" if $debug;

-

-	next if $reindex;

-

-	# Scan function and reason codes and store them: keep a note of the

-	# maximum code used.

-

-	if ($gotfile) {

-	  while(<IN>) {

-		if(/^\#define\s+(\S+)\s+(\S+)/) {

-			$name = $1;

-			$code = $2;

-			next if $name =~ /^${lib}err/;

-			unless($name =~ /^${lib}_([RF])_(\w+)$/) {

-				print STDERR "Invalid error code $name\n";

-				next;

-			}

-			if($1 eq "R") {

-				$rcodes{$name} = $code;

-				if ($rassigned{$lib} =~ /:$code:/) {

-					print STDERR "!! ERROR: $lib reason code $code assigned twice (collision at $name)\n";

-					++$errcount;

-				}

-				$rassigned{$lib} .= "$code:";

-				if(!(exists $rextra{$name}) &&

-					 ($code > $rmax{$lib}) ) {

-					$rmax{$lib} = $code;

-				}

-			} else {

-				if ($fassigned{$lib} =~ /:$code:/) {

-					print STDERR "!! ERROR: $lib function code $code assigned twice (collision at $name)\n";

-					++$errcount;

-				}

-				$fassigned{$lib} .= "$code:";

-				if($code > $fmax{$lib}) {

-					$fmax{$lib} = $code;

-				}

-				$fcodes{$name} = $code;

-			}

-		}

-	  }

-	}

-

-	if ($debug) {

-		if (defined($fmax{$lib})) {

-			print STDERR "Max function code fmax" . "{" . "$lib" . "} = $fmax{$lib}\n";

-			$fassigned{$lib} =~ m/^:(.*):$/;

-			@fassigned = sort {$a <=> $b} split(":", $1);

-			print STDERR "  @fassigned\n";

-		}

-		if (defined($rmax{$lib})) {

-			print STDERR "Max reason code rmax" . "{" . "$lib" . "} = $rmax{$lib}\n";

-			$rassigned{$lib} =~ m/^:(.*):$/;

-			@rassigned = sort {$a <=> $b} split(":", $1);

-			print STDERR "  @rassigned\n";

-		}

-	}

-

-	if ($lib eq "SSL") {

-		if ($rmax{$lib} >= 1000) {

-			print STDERR "!! ERROR: SSL error codes 1000+ are reserved for alerts.\n";

-			print STDERR "!!        Any new alerts must be added to $config.\n";

-			++$errcount;

-			print STDERR "\n";

-		}

-	}

-	close IN;

-}

-

-# Scan each C source file and look for function and reason codes

-# This is done by looking for strings that "look like" function or

-# reason codes: basically anything consisting of all upper case and

-# numerics which has _F_ or _R_ in it and which has the name of an

-# error library at the start. This seems to work fine except for the

-# oddly named structure BIO_F_CTX which needs to be ignored.

-# If a code doesn't exist in list compiled from headers then mark it

-# with the value "X" as a place holder to give it a value later.

-# Store all function and reason codes found in %ufcodes and %urcodes

-# so all those unreferenced can be printed out.

-

-

-foreach $file (@source) {

-	# Don't parse the error source file.

-	next if exists $cskip{$file};

-	print STDERR "File loaded: ".$file."\r" if $debug;

-	open(IN, "<$file") || die "Can't open source file $file\n";

-	while(<IN>) {

-		# skip obsoleted source files entirely!

-		last if(/^#error\s+obsolete/);

-

-		if(/(([A-Z0-9]+)_F_([A-Z0-9_]+))/) {

-			next unless exists $csrc{$2};

-			next if($1 eq "BIO_F_BUFFER_CTX");

-			$ufcodes{$1} = 1;

-			if(!exists $fcodes{$1}) {

-				$fcodes{$1} = "X";

-				$fnew{$2}++;

-			}

-			$notrans{$1} = 1 unless exists $ftrans{$3};

-			print STDERR "Function: $1\t= $fcodes{$1} (lib: $2, name: $3)\n" if $debug; 

-		}

-		if(/(([A-Z0-9]+)_R_[A-Z0-9_]+)/) {

-			next unless exists $csrc{$2};

-			$urcodes{$1} = 1;

-			if(!exists $rcodes{$1}) {

-				$rcodes{$1} = "X";

-				$rnew{$2}++;

-			}

-			print STDERR "Reason: $1\t= $rcodes{$1} (lib: $2)\n" if $debug; 

-		} 

-	}

-	close IN;

-}

-print STDERR "                                  \n" if $debug;

-

-# Now process each library in turn.

-

-foreach $lib (keys %csrc)

-{

-	my $hfile = $hinc{$lib};

-	my $cfile = $csrc{$lib};

-	if(!$fnew{$lib} && !$rnew{$lib}) {

-		print STDERR "$lib:\t\tNo new error codes\n";

-		next unless $rebuild;

-	} else {

-		print STDERR "$lib:\t\t$fnew{$lib} New Functions,";

-		print STDERR " $rnew{$lib} New Reasons.\n";

-		next unless $dowrite;

-	}

-

-	# If we get here then we have some new error codes so we

-	# need to rebuild the header file and C file.

-

-	# Make a sorted list of error and reason codes for later use.

-

-	my @function = sort grep(/^${lib}_/,keys %fcodes);

-	my @reasons = sort grep(/^${lib}_/,keys %rcodes);

-

-	# Rewrite the header file

-

-	if (open(IN, "<$hfile")) {

-	    # Copy across the old file

-	    while(<IN>) {

-		push @out, $_;

-		last if (/BEGIN ERROR CODES/);

-	    }

-	    close IN;

-	} else {

-	    push @out,

-"/* ====================================================================\n",

-" * Copyright (c) 2001-2011 The OpenSSL Project.  All rights reserved.\n",

-" *\n",

-" * Redistribution and use in source and binary forms, with or without\n",

-" * modification, are permitted provided that the following conditions\n",

-" * are met:\n",

-" *\n",

-" * 1. Redistributions of source code must retain the above copyright\n",

-" *    notice, this list of conditions and the following disclaimer. \n",

-" *\n",

-" * 2. Redistributions in binary form must reproduce the above copyright\n",

-" *    notice, this list of conditions and the following disclaimer in\n",

-" *    the documentation and/or other materials provided with the\n",

-" *    distribution.\n",

-" *\n",

-" * 3. All advertising materials mentioning features or use of this\n",

-" *    software must display the following acknowledgment:\n",

-" *    \"This product includes software developed by the OpenSSL Project\n",

-" *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)\"\n",

-" *\n",

-" * 4. The names \"OpenSSL Toolkit\" and \"OpenSSL Project\" must not be used to\n",

-" *    endorse or promote products derived from this software without\n",

-" *    prior written permission. For written permission, please contact\n",

-" *    openssl-core\@openssl.org.\n",

-" *\n",

-" * 5. Products derived from this software may not be called \"OpenSSL\"\n",

-" *    nor may \"OpenSSL\" appear in their names without prior written\n",

-" *    permission of the OpenSSL Project.\n",

-" *\n",

-" * 6. Redistributions of any form whatsoever must retain the following\n",

-" *    acknowledgment:\n",

-" *    \"This product includes software developed by the OpenSSL Project\n",

-" *    for use in the OpenSSL Toolkit (http://www.openssl.org/)\"\n",

-" *\n",

-" * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY\n",

-" * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n",

-" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n",

-" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR\n",

-" * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n",

-" * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n",

-" * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n",

-" * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n",

-" * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n",

-" * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\n",

-" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\n",

-" * OF THE POSSIBILITY OF SUCH DAMAGE.\n",

-" * ====================================================================\n",

-" *\n",

-" * This product includes cryptographic software written by Eric Young\n",

-" * (eay\@cryptsoft.com).  This product includes software written by Tim\n",

-" * Hudson (tjh\@cryptsoft.com).\n",

-" *\n",

-" */\n",

-"\n",

-"#ifndef HEADER_${lib}_ERR_H\n",

-"#define HEADER_${lib}_ERR_H\n",

-"\n",

-"#ifdef  __cplusplus\n",

-"extern \"C\" {\n",

-"#endif\n",

-"\n",

-"/* BEGIN ERROR CODES */\n";

-	}

-	open (OUT, ">$hfile") || die "Can't Open File $hfile for writing\n";

-

-	print OUT @out;

-	undef @out;

-	print OUT <<"EOF";

-/* The following lines are auto generated by the script mkerr.pl. Any changes

- * made after this point may be overwritten when the script is next run.

- */

-EOF

-	if($static) {

-		print OUT <<"EOF";

-${staticloader}void ERR_load_${lib}_strings(void);

-

-EOF

-	} else {

-		print OUT <<"EOF";

-${staticloader}void ERR_load_${lib}_strings(void);

-${staticloader}void ERR_unload_${lib}_strings(void);

-${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line);

-#define ${lib}err(f,r) ERR_${lib}_error((f),(r),__FILE__,__LINE__)

-

-EOF

-	}

-	print OUT <<"EOF";

-/* Error codes for the $lib functions. */

-

-/* Function codes. */

-EOF

-

-	foreach $i (@function) {

-		$z=6-int(length($i)/8);

-		if($fcodes{$i} eq "X") {

-			$fassigned{$lib} =~ m/^:([^:]*):/;

-			$findcode = $1;

-			if (!defined($findcode)) {

-				$findcode = $fmax{$lib};

-			}

-			while ($fassigned{$lib} =~ m/:$findcode:/) {

-				$findcode++;

-			}

-			$fcodes{$i} = $findcode;

-			$fassigned{$lib} .= "$findcode:";

-			print STDERR "New Function code $i\n" if $debug;

-		}

-		printf OUT "#define $i%s $fcodes{$i}\n","\t" x $z;

-	}

-

-	print OUT "\n/* Reason codes. */\n";

-

-	foreach $i (@reasons) {

-		$z=6-int(length($i)/8);

-		if($rcodes{$i} eq "X") {

-			$rassigned{$lib} =~ m/^:([^:]*):/;

-			$findcode = $1;

-			if (!defined($findcode)) {

-				$findcode = $rmax{$lib};

-			}

-			while ($rassigned{$lib} =~ m/:$findcode:/) {

-				$findcode++;

-			}

-			$rcodes{$i} = $findcode;

-			$rassigned{$lib} .= "$findcode:";

-			print STDERR "New Reason code   $i\n" if $debug;

-		}

-		printf OUT "#define $i%s $rcodes{$i}\n","\t" x $z;

-	}

-	print OUT <<"EOF";

-

-#ifdef  __cplusplus

-}

-#endif

-#endif

-EOF

-	close OUT;

-

-	# Rewrite the C source file containing the error details.

-

-	# First, read any existing reason string definitions:

-	my %err_reason_strings;

-	if (open(IN,"<$cfile")) {

-		while (<IN>) {

-			if (/\b(${lib}_R_\w*)\b.*\"(.*)\"/) {

-				$err_reason_strings{$1} = $2;

-			}

-			if (/\b${lib}_F_(\w*)\b.*\"(.*)\"/) {

-				if (!exists $ftrans{$1} && ($1 ne $2)) {

-					print STDERR "WARNING: Mismatched function string $2\n";

-					$ftrans{$1} = $2;

-				}

-			}

-		}

-		close(IN);

-	}

-

-

-	my $hincf;

-	if($static) {

-		$hfile =~ /([^\/]+)$/;

-		$hincf = "<${hprefix}$1>";

-	} else {

-		$hincf = "\"$hfile\"";

-	}

-

-	# If static we know the error code at compile time so use it

-	# in error definitions.

-

-	if ($static)

-		{

-		$pack_errcode = "ERR_LIB_${lib}";

-		$load_errcode = "0";

-		}

-	else

-		{

-		$pack_errcode = "0";

-		$load_errcode = "ERR_LIB_${lib}";

-		}

-

-

-	open (OUT,">$cfile") || die "Can't open $cfile for writing";

-

-	print OUT <<"EOF";

-/* $cfile */

-/* ====================================================================

- * Copyright (c) 1999-2010 The OpenSSL Project.  All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- *

- * 1. Redistributions of source code must retain the above copyright

- *    notice, this list of conditions and the following disclaimer. 

- *

- * 2. Redistributions in binary form must reproduce the above copyright

- *    notice, this list of conditions and the following disclaimer in

- *    the documentation and/or other materials provided with the

- *    distribution.

- *

- * 3. All advertising materials mentioning features or use of this

- *    software must display the following acknowledgment:

- *    "This product includes software developed by the OpenSSL Project

- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"

- *

- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to

- *    endorse or promote products derived from this software without

- *    prior written permission. For written permission, please contact

- *    openssl-core\@OpenSSL.org.

- *

- * 5. Products derived from this software may not be called "OpenSSL"

- *    nor may "OpenSSL" appear in their names without prior written

- *    permission of the OpenSSL Project.

- *

- * 6. Redistributions of any form whatsoever must retain the following

- *    acknowledgment:

- *    "This product includes software developed by the OpenSSL Project

- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"

- *

- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY

- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR

- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

- * OF THE POSSIBILITY OF SUCH DAMAGE.

- * ====================================================================

- *

- * This product includes cryptographic software written by Eric Young

- * (eay\@cryptsoft.com).  This product includes software written by Tim

- * Hudson (tjh\@cryptsoft.com).

- *

- */

-

-/* NOTE: this file was auto generated by the mkerr.pl script: any changes

- * made to it will be overwritten when the script next updates this file,

- * only reason strings will be preserved.

- */

-

-#include <stdio.h>

-#include <openssl/err.h>

-#include $hincf

-

-/* BEGIN ERROR CODES */

-#ifndef OPENSSL_NO_ERR

-

-#define ERR_FUNC(func) ERR_PACK($pack_errcode,func,0)

-#define ERR_REASON(reason) ERR_PACK($pack_errcode,0,reason)

-

-static ERR_STRING_DATA ${lib}_str_functs[]=

-	{

-EOF

-	# Add each function code: if a function name is found then use it.

-	foreach $i (@function) {

-		my $fn;

-		$i =~ /^${lib}_F_(\S+)$/;

-		$fn = $1;

-		if(exists $ftrans{$fn}) {

-			$fn = $ftrans{$fn};

-		}

-#		print OUT "{ERR_PACK($pack_errcode,$i,0),\t\"$fn\"},\n";

-		print OUT "{ERR_FUNC($i),\t\"$fn\"},\n";

-	}

-	print OUT <<"EOF";

-{0,NULL}

-	};

-

-static ERR_STRING_DATA ${lib}_str_reasons[]=

-	{

-EOF

-	# Add each reason code.

-	foreach $i (@reasons) {

-		my $rn;

-		my $rstr = "ERR_REASON($i)";

-		my $nspc = 0;

-		if (exists $err_reason_strings{$i}) {

-			$rn = $err_reason_strings{$i};

-		} else {

-			$i =~ /^${lib}_R_(\S+)$/;

-			$rn = $1;

-			$rn =~ tr/_[A-Z]/ [a-z]/;

-		}

-		$nspc = 40 - length($rstr) unless length($rstr) > 40;

-		$nspc = " " x $nspc;

-		print OUT "{${rstr}${nspc},\"$rn\"},\n";

-	}

-if($static) {

-	print OUT <<"EOF";

-{0,NULL}

-	};

-

-#endif

-

-${staticloader}void ERR_load_${lib}_strings(void)

-	{

-#ifndef OPENSSL_NO_ERR

-

-	if (ERR_func_error_string(${lib}_str_functs[0].error) == NULL)

-		{

-		ERR_load_strings($load_errcode,${lib}_str_functs);

-		ERR_load_strings($load_errcode,${lib}_str_reasons);

-		}

-#endif

-	}

-EOF

-} else {

-	print OUT <<"EOF";

-{0,NULL}

-	};

-

-#endif

-

-#ifdef ${lib}_LIB_NAME

-static ERR_STRING_DATA ${lib}_lib_name[]=

-        {

-{0	,${lib}_LIB_NAME},

-{0,NULL}

-	};

-#endif

-

-

-static int ${lib}_lib_error_code=0;

-static int ${lib}_error_init=1;

-

-${staticloader}void ERR_load_${lib}_strings(void)

-	{

-	if (${lib}_lib_error_code == 0)

-		${lib}_lib_error_code=ERR_get_next_error_library();

-

-	if (${lib}_error_init)

-		{

-		${lib}_error_init=0;

-#ifndef OPENSSL_NO_ERR

-		ERR_load_strings(${lib}_lib_error_code,${lib}_str_functs);

-		ERR_load_strings(${lib}_lib_error_code,${lib}_str_reasons);

-#endif

-

-#ifdef ${lib}_LIB_NAME

-		${lib}_lib_name->error = ERR_PACK(${lib}_lib_error_code,0,0);

-		ERR_load_strings(0,${lib}_lib_name);

-#endif

-		}

-	}

-

-${staticloader}void ERR_unload_${lib}_strings(void)

-	{

-	if (${lib}_error_init == 0)

-		{

-#ifndef OPENSSL_NO_ERR

-		ERR_unload_strings(${lib}_lib_error_code,${lib}_str_functs);

-		ERR_unload_strings(${lib}_lib_error_code,${lib}_str_reasons);

-#endif

-

-#ifdef ${lib}_LIB_NAME

-		ERR_unload_strings(0,${lib}_lib_name);

-#endif

-		${lib}_error_init=1;

-		}

-	}

-

-${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line)

-	{

-	if (${lib}_lib_error_code == 0)

-		${lib}_lib_error_code=ERR_get_next_error_library();

-	ERR_PUT_error(${lib}_lib_error_code,function,reason,file,line);

-	}

-EOF

-

-}

-

-	close OUT;

-	undef %err_reason_strings;

-}

-

-if($debug && defined(%notrans)) {

-	print STDERR "The following function codes were not translated:\n";

-	foreach(sort keys %notrans)

-	{

-		print STDERR "$_\n";

-	}

-}

-

-# Make a list of unreferenced function and reason codes

-

-foreach (keys %fcodes) {

-	push (@funref, $_) unless exists $ufcodes{$_};

-}

-

-foreach (keys %rcodes) {

-	push (@runref, $_) unless exists $urcodes{$_};

-}

-

-if($debug && defined(@funref) ) {

-	print STDERR "The following function codes were not referenced:\n";

-	foreach(sort @funref)

-	{

-		print STDERR "$_\n";

-	}

-}

-

-if($debug && defined(@runref) ) {

-	print STDERR "The following reason codes were not referenced:\n";

-	foreach(sort @runref)

-	{

-		print STDERR "$_\n";

-	}

-}

-

-if($errcount) {

-	print STDERR "There were errors, failing...\n\n";

-	exit $errcount;

-}

-

+#!/usr/local/bin/perl -w
+
+my $config = "crypto/err/openssl.ec";
+my $hprefix = "openssl/";
+my $debug = 0;
+my $rebuild = 0;
+my $static = 1;
+my $recurse = 0;
+my $reindex = 0;
+my $dowrite = 0;
+my $staticloader = "";
+
+my $pack_errcode;
+my $load_errcode;
+
+my $errcount;
+
+while (@ARGV) {
+	my $arg = $ARGV[0];
+	if($arg eq "-conf") {
+		shift @ARGV;
+		$config = shift @ARGV;
+	} elsif($arg eq "-hprefix") {
+		shift @ARGV;
+		$hprefix = shift @ARGV;
+	} elsif($arg eq "-debug") {
+		$debug = 1;
+		shift @ARGV;
+	} elsif($arg eq "-rebuild") {
+		$rebuild = 1;
+		shift @ARGV;
+	} elsif($arg eq "-recurse") {
+		$recurse = 1;
+		shift @ARGV;
+	} elsif($arg eq "-reindex") {
+		$reindex = 1;
+		shift @ARGV;
+	} elsif($arg eq "-nostatic") {
+		$static = 0;
+		shift @ARGV;
+	} elsif($arg eq "-staticloader") {
+		$staticloader = "static ";
+		shift @ARGV;
+	} elsif($arg eq "-write") {
+		$dowrite = 1;
+		shift @ARGV;
+	} elsif($arg eq "-help" || $arg eq "-h" || $arg eq "-?" || $arg eq "--help") {
+		print STDERR <<"EOF";
+mkerr.pl [options] ...
+
+Options:
+
+  -conf F       Use the config file F instead of the default one:
+                  crypto/err/openssl.ec
+
+  -hprefix P    Prepend the filenames in generated #include <header>
+                statements with prefix P. Default: 'openssl/' (without
+                the quotes, naturally)
+
+  -debug        Turn on debugging verbose output on stderr.
+
+  -rebuild      Rebuild all header and C source files, irrespective of the
+                fact if any error or function codes have been added/removed.
+                Default: only update files for libraries which saw change
+                         (of course, this requires '-write' as well, or no
+                          files will be touched!)
+
+  -recurse      scan a preconfigured set of directories / files for error and
+                function codes:
+                  (<crypto/*.c>, <crypto/*/*.c>, <ssl/*.c>, <apps/*.c>)
+                When this option is NOT specified, the filelist is taken from
+                the commandline instead. Here, wildcards may be embedded. (Be
+                sure to escape those to prevent the shell from expanding them
+                for you when you wish mkerr.pl to do so instead.)
+                Default: take file list to scan from the command line.
+
+  -reindex      Discard the numeric values previously assigned to the error
+                and function codes as extracted from the scanned header files;
+                instead renumber all of them starting from 100. (Note that
+                the numbers assigned through 'R' records in the config file
+                remain intact.)
+                Default: keep previously assigned numbers. (You are warned
+                         when collisions are detected.)
+
+  -nostatic     Generates a different source code, where these additional 
+                functions are generated for each library specified in the
+                config file:
+                  void ERR_load_<LIB>_strings(void);
+                  void ERR_unload_<LIB>_strings(void);
+                  void ERR_<LIB>_error(int f, int r, char *fn, int ln);
+                  #define <LIB>err(f,r) ERR_<LIB>_error(f,r,__FILE__,__LINE__)
+                while the code facilitates the use of these in an environment
+                where the error support routines are dynamically loaded at 
+                runtime.
+                Default: 'static' code generation.
+
+  -staticloader Prefix generated functions with the 'static' scope modifier.
+                Default: don't write any scope modifier prefix.
+
+  -write        Actually (over)write the generated code to the header and C 
+                source files as assigned to each library through the config 
+                file.
+                Default: don't write.
+
+  -help / -h / -? / --help            Show this help text.
+
+  ...           Additional arguments are added to the file list to scan,
+                assuming '-recurse' was NOT specified on the command line.
+
+EOF
+		exit 1;
+	} else {
+		last;
+	}
+}
+
+if($recurse) {
+	@source = (<crypto/*.c>, <crypto/*/*.c>, <ssl/*.c>);
+} else {
+	@source = @ARGV;
+}
+
+# Read in the config file
+
+open(IN, "<$config") || die "Can't open config file $config";
+
+# Parse config file
+
+while(<IN>)
+{
+	if(/^L\s+(\S+)\s+(\S+)\s+(\S+)/) {
+		$hinc{$1} = $2;
+		$libinc{$2} = $1;
+		$cskip{$3} = $1;
+		if($3 ne "NONE") {
+			$csrc{$1} = $3;
+			$fmax{$1} = 100;
+			$rmax{$1} = 100;
+			$fassigned{$1} = ":";
+			$rassigned{$1} = ":";
+			$fnew{$1} = 0;
+			$rnew{$1} = 0;
+		}
+	} elsif (/^F\s+(\S+)/) {
+	# Add extra function with $1
+	} elsif (/^R\s+(\S+)\s+(\S+)/) {
+		$rextra{$1} = $2;
+		$rcodes{$1} = $2;
+	}
+}
+
+close IN;
+
+# Scan each header file in turn and make a list of error codes
+# and function names
+
+while (($hdr, $lib) = each %libinc)
+{
+	next if($hdr eq "NONE");
+	print STDERR "Scanning header file $hdr\n" if $debug; 
+	my $line = "", $def= "", $linenr = 0, $gotfile = 0;
+	if (open(IN, "<$hdr")) {
+	    $gotfile = 1;
+	    while(<IN>) {
+		$linenr++;
+		print STDERR "line: $linenr\r" if $debug;
+
+		last if(/BEGIN\s+ERROR\s+CODES/);
+		if ($line ne '') {
+		    $_ = $line . $_;
+		    $line = '';
+		}
+
+		if (/\\$/) {
+		    $line = $_;
+		    next;
+		}
+
+		if(/\/\*/) {
+		    if (not /\*\//) {		# multiline comment...
+			$line = $_;		# ... just accumulate
+			next; 
+		    } else {
+			s/\/\*.*?\*\///gs;	# wipe it
+		    }
+		}
+
+		if ($cpp) {
+		    $cpp++ if /^#\s*if/;
+		    $cpp-- if /^#\s*endif/;
+		    next;
+		}
+		$cpp = 1 if /^#.*ifdef.*cplusplus/;  # skip "C" declaration
+
+		next if (/^\#/);                      # skip preprocessor directives
+
+		s/{[^{}]*}//gs;                      # ignore {} blocks
+
+		if (/\{|\/\*/) { # Add a } so editor works...
+		    $line = $_;
+		} else {
+		    $def .= $_;
+		}
+	    }
+	}
+
+	print STDERR "                                  \r" if $debug;
+        $defnr = 0;
+	# Delete any DECLARE_ macros
+	$def =~ s/DECLARE_\w+\([\w,\s]+\)//gs;
+	foreach (split /;/, $def) {
+	    $defnr++;
+	    print STDERR "def: $defnr\r" if $debug;
+
+	    # The goal is to collect function names from function declarations.
+
+	    s/^[\n\s]*//g;
+	    s/[\n\s]*$//g;
+
+	    # Skip over recognized non-function declarations
+	    next if(/typedef\W/ or /DECLARE_STACK_OF/ or /TYPEDEF_.*_OF/);
+
+	    # Remove STACK_OF(foo)
+	    s/STACK_OF\(\w+\)/void/;
+
+	    # Reduce argument lists to empty ()
+	    # fold round brackets recursively: (t(*v)(t),t) -> (t{}{},t) -> {}
+	    while(/\(.*\)/s) {
+		s/\([^\(\)]+\)/\{\}/gs;
+		s/\(\s*\*\s*(\w+)\s*\{\}\s*\)/$1/gs;	#(*f{}) -> f
+	    }
+	    # pretend as we didn't use curly braces: {} -> ()
+	    s/\{\}/\(\)/gs;
+
+	    if (/(\w+)\s*\(\).*/s) {	# first token prior [first] () is
+		my $name = $1;		# a function name!
+		$name =~ tr/[a-z]/[A-Z]/;
+		$ftrans{$name} = $1;
+	    } elsif (/[\(\)]/ and not (/=/)) {
+		print STDERR "Header $hdr: cannot parse: $_;\n";
+	    }
+	}
+
+	print STDERR "                                  \r" if $debug;
+
+	next if $reindex;
+
+	# Scan function and reason codes and store them: keep a note of the
+	# maximum code used.
+
+	if ($gotfile) {
+	  while(<IN>) {
+		if(/^\#define\s+(\S+)\s+(\S+)/) {
+			$name = $1;
+			$code = $2;
+			next if $name =~ /^${lib}err/;
+			unless($name =~ /^${lib}_([RF])_(\w+)$/) {
+				print STDERR "Invalid error code $name\n";
+				next;
+			}
+			if($1 eq "R") {
+				$rcodes{$name} = $code;
+				if ($rassigned{$lib} =~ /:$code:/) {
+					print STDERR "!! ERROR: $lib reason code $code assigned twice (collision at $name)\n";
+					++$errcount;
+				}
+				$rassigned{$lib} .= "$code:";
+				if(!(exists $rextra{$name}) &&
+					 ($code > $rmax{$lib}) ) {
+					$rmax{$lib} = $code;
+				}
+			} else {
+				if ($fassigned{$lib} =~ /:$code:/) {
+					print STDERR "!! ERROR: $lib function code $code assigned twice (collision at $name)\n";
+					++$errcount;
+				}
+				$fassigned{$lib} .= "$code:";
+				if($code > $fmax{$lib}) {
+					$fmax{$lib} = $code;
+				}
+				$fcodes{$name} = $code;
+			}
+		}
+	  }
+	}
+
+	if ($debug) {
+		if (defined($fmax{$lib})) {
+			print STDERR "Max function code fmax" . "{" . "$lib" . "} = $fmax{$lib}\n";
+			$fassigned{$lib} =~ m/^:(.*):$/;
+			@fassigned = sort {$a <=> $b} split(":", $1);
+			print STDERR "  @fassigned\n";
+		}
+		if (defined($rmax{$lib})) {
+			print STDERR "Max reason code rmax" . "{" . "$lib" . "} = $rmax{$lib}\n";
+			$rassigned{$lib} =~ m/^:(.*):$/;
+			@rassigned = sort {$a <=> $b} split(":", $1);
+			print STDERR "  @rassigned\n";
+		}
+	}
+
+	if ($lib eq "SSL") {
+		if ($rmax{$lib} >= 1000) {
+			print STDERR "!! ERROR: SSL error codes 1000+ are reserved for alerts.\n";
+			print STDERR "!!        Any new alerts must be added to $config.\n";
+			++$errcount;
+			print STDERR "\n";
+		}
+	}
+	close IN;
+}
+
+# Scan each C source file and look for function and reason codes
+# This is done by looking for strings that "look like" function or
+# reason codes: basically anything consisting of all upper case and
+# numerics which has _F_ or _R_ in it and which has the name of an
+# error library at the start. This seems to work fine except for the
+# oddly named structure BIO_F_CTX which needs to be ignored.
+# If a code doesn't exist in list compiled from headers then mark it
+# with the value "X" as a place holder to give it a value later.
+# Store all function and reason codes found in %ufcodes and %urcodes
+# so all those unreferenced can be printed out.
+
+
+foreach $file (@source) {
+	# Don't parse the error source file.
+	next if exists $cskip{$file};
+	print STDERR "File loaded: ".$file."\r" if $debug;
+	open(IN, "<$file") || die "Can't open source file $file\n";
+	while(<IN>) {
+		# skip obsoleted source files entirely!
+		last if(/^#error\s+obsolete/);
+
+		if(/(([A-Z0-9]+)_F_([A-Z0-9_]+))/) {
+			next unless exists $csrc{$2};
+			next if($1 eq "BIO_F_BUFFER_CTX");
+			$ufcodes{$1} = 1;
+			if(!exists $fcodes{$1}) {
+				$fcodes{$1} = "X";
+				$fnew{$2}++;
+			}
+			$notrans{$1} = 1 unless exists $ftrans{$3};
+			print STDERR "Function: $1\t= $fcodes{$1} (lib: $2, name: $3)\n" if $debug; 
+		}
+		if(/(([A-Z0-9]+)_R_[A-Z0-9_]+)/) {
+			next unless exists $csrc{$2};
+			$urcodes{$1} = 1;
+			if(!exists $rcodes{$1}) {
+				$rcodes{$1} = "X";
+				$rnew{$2}++;
+			}
+			print STDERR "Reason: $1\t= $rcodes{$1} (lib: $2)\n" if $debug; 
+		} 
+	}
+	close IN;
+}
+print STDERR "                                  \n" if $debug;
+
+# Now process each library in turn.
+
+foreach $lib (keys %csrc)
+{
+	my $hfile = $hinc{$lib};
+	my $cfile = $csrc{$lib};
+	if(!$fnew{$lib} && !$rnew{$lib}) {
+		print STDERR "$lib:\t\tNo new error codes\n";
+		next unless $rebuild;
+	} else {
+		print STDERR "$lib:\t\t$fnew{$lib} New Functions,";
+		print STDERR " $rnew{$lib} New Reasons.\n";
+		next unless $dowrite;
+	}
+
+	# If we get here then we have some new error codes so we
+	# need to rebuild the header file and C file.
+
+	# Make a sorted list of error and reason codes for later use.
+
+	my @function = sort grep(/^${lib}_/,keys %fcodes);
+	my @reasons = sort grep(/^${lib}_/,keys %rcodes);
+
+	# Rewrite the header file
+
+	if (open(IN, "<$hfile")) {
+	    # Copy across the old file
+	    while(<IN>) {
+		push @out, $_;
+		last if (/BEGIN ERROR CODES/);
+	    }
+	    close IN;
+	} else {
+	    push @out,
+"/* ====================================================================\n",
+" * Copyright (c) 2001-2011 The OpenSSL Project.  All rights reserved.\n",
+" *\n",
+" * Redistribution and use in source and binary forms, with or without\n",
+" * modification, are permitted provided that the following conditions\n",
+" * are met:\n",
+" *\n",
+" * 1. Redistributions of source code must retain the above copyright\n",
+" *    notice, this list of conditions and the following disclaimer. \n",
+" *\n",
+" * 2. Redistributions in binary form must reproduce the above copyright\n",
+" *    notice, this list of conditions and the following disclaimer in\n",
+" *    the documentation and/or other materials provided with the\n",
+" *    distribution.\n",
+" *\n",
+" * 3. All advertising materials mentioning features or use of this\n",
+" *    software must display the following acknowledgment:\n",
+" *    \"This product includes software developed by the OpenSSL Project\n",
+" *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)\"\n",
+" *\n",
+" * 4. The names \"OpenSSL Toolkit\" and \"OpenSSL Project\" must not be used to\n",
+" *    endorse or promote products derived from this software without\n",
+" *    prior written permission. For written permission, please contact\n",
+" *    openssl-core\@openssl.org.\n",
+" *\n",
+" * 5. Products derived from this software may not be called \"OpenSSL\"\n",
+" *    nor may \"OpenSSL\" appear in their names without prior written\n",
+" *    permission of the OpenSSL Project.\n",
+" *\n",
+" * 6. Redistributions of any form whatsoever must retain the following\n",
+" *    acknowledgment:\n",
+" *    \"This product includes software developed by the OpenSSL Project\n",
+" *    for use in the OpenSSL Toolkit (http://www.openssl.org/)\"\n",
+" *\n",
+" * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY\n",
+" * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n",
+" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n",
+" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR\n",
+" * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n",
+" * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n",
+" * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n",
+" * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n",
+" * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n",
+" * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\n",
+" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\n",
+" * OF THE POSSIBILITY OF SUCH DAMAGE.\n",
+" * ====================================================================\n",
+" *\n",
+" * This product includes cryptographic software written by Eric Young\n",
+" * (eay\@cryptsoft.com).  This product includes software written by Tim\n",
+" * Hudson (tjh\@cryptsoft.com).\n",
+" *\n",
+" */\n",
+"\n",
+"#ifndef HEADER_${lib}_ERR_H\n",
+"#define HEADER_${lib}_ERR_H\n",
+"\n",
+"#ifdef  __cplusplus\n",
+"extern \"C\" {\n",
+"#endif\n",
+"\n",
+"/* BEGIN ERROR CODES */\n";
+	}
+	open (OUT, ">$hfile") || die "Can't Open File $hfile for writing\n";
+
+	print OUT @out;
+	undef @out;
+	print OUT <<"EOF";
+/* The following lines are auto generated by the script mkerr.pl. Any changes
+ * made after this point may be overwritten when the script is next run.
+ */
+EOF
+	if($static) {
+		print OUT <<"EOF";
+${staticloader}void ERR_load_${lib}_strings(void);
+
+EOF
+	} else {
+		print OUT <<"EOF";
+${staticloader}void ERR_load_${lib}_strings(void);
+${staticloader}void ERR_unload_${lib}_strings(void);
+${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line);
+#define ${lib}err(f,r) ERR_${lib}_error((f),(r),__FILE__,__LINE__)
+
+EOF
+	}
+	print OUT <<"EOF";
+/* Error codes for the $lib functions. */
+
+/* Function codes. */
+EOF
+
+	foreach $i (@function) {
+		$z=6-int(length($i)/8);
+		if($fcodes{$i} eq "X") {
+			$fassigned{$lib} =~ m/^:([^:]*):/;
+			$findcode = $1;
+			if (!defined($findcode)) {
+				$findcode = $fmax{$lib};
+			}
+			while ($fassigned{$lib} =~ m/:$findcode:/) {
+				$findcode++;
+			}
+			$fcodes{$i} = $findcode;
+			$fassigned{$lib} .= "$findcode:";
+			print STDERR "New Function code $i\n" if $debug;
+		}
+		printf OUT "#define $i%s $fcodes{$i}\n","\t" x $z;
+	}
+
+	print OUT "\n/* Reason codes. */\n";
+
+	foreach $i (@reasons) {
+		$z=6-int(length($i)/8);
+		if($rcodes{$i} eq "X") {
+			$rassigned{$lib} =~ m/^:([^:]*):/;
+			$findcode = $1;
+			if (!defined($findcode)) {
+				$findcode = $rmax{$lib};
+			}
+			while ($rassigned{$lib} =~ m/:$findcode:/) {
+				$findcode++;
+			}
+			$rcodes{$i} = $findcode;
+			$rassigned{$lib} .= "$findcode:";
+			print STDERR "New Reason code   $i\n" if $debug;
+		}
+		printf OUT "#define $i%s $rcodes{$i}\n","\t" x $z;
+	}
+	print OUT <<"EOF";
+
+#ifdef  __cplusplus
+}
+#endif
+#endif
+EOF
+	close OUT;
+
+	# Rewrite the C source file containing the error details.
+
+	# First, read any existing reason string definitions:
+	my %err_reason_strings;
+	if (open(IN,"<$cfile")) {
+		while (<IN>) {
+			if (/\b(${lib}_R_\w*)\b.*\"(.*)\"/) {
+				$err_reason_strings{$1} = $2;
+			}
+			if (/\b${lib}_F_(\w*)\b.*\"(.*)\"/) {
+				if (!exists $ftrans{$1} && ($1 ne $2)) {
+					print STDERR "WARNING: Mismatched function string $2\n";
+					$ftrans{$1} = $2;
+				}
+			}
+		}
+		close(IN);
+	}
+
+
+	my $hincf;
+	if($static) {
+		$hfile =~ /([^\/]+)$/;
+		$hincf = "<${hprefix}$1>";
+	} else {
+		$hincf = "\"$hfile\"";
+	}
+
+	# If static we know the error code at compile time so use it
+	# in error definitions.
+
+	if ($static)
+		{
+		$pack_errcode = "ERR_LIB_${lib}";
+		$load_errcode = "0";
+		}
+	else
+		{
+		$pack_errcode = "0";
+		$load_errcode = "ERR_LIB_${lib}";
+		}
+
+
+	open (OUT,">$cfile") || die "Can't open $cfile for writing";
+
+	print OUT <<"EOF";
+/* $cfile */
+/* ====================================================================
+ * Copyright (c) 1999-2010 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core\@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay\@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh\@cryptsoft.com).
+ *
+ */
+
+/* NOTE: this file was auto generated by the mkerr.pl script: any changes
+ * made to it will be overwritten when the script next updates this file,
+ * only reason strings will be preserved.
+ */
+
+#include <stdio.h>
+#include <openssl/err.h>
+#include $hincf
+
+/* BEGIN ERROR CODES */
+#ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK($pack_errcode,func,0)
+#define ERR_REASON(reason) ERR_PACK($pack_errcode,0,reason)
+
+static ERR_STRING_DATA ${lib}_str_functs[]=
+	{
+EOF
+	# Add each function code: if a function name is found then use it.
+	foreach $i (@function) {
+		my $fn;
+		$i =~ /^${lib}_F_(\S+)$/;
+		$fn = $1;
+		if(exists $ftrans{$fn}) {
+			$fn = $ftrans{$fn};
+		}
+#		print OUT "{ERR_PACK($pack_errcode,$i,0),\t\"$fn\"},\n";
+		print OUT "{ERR_FUNC($i),\t\"$fn\"},\n";
+	}
+	print OUT <<"EOF";
+{0,NULL}
+	};
+
+static ERR_STRING_DATA ${lib}_str_reasons[]=
+	{
+EOF
+	# Add each reason code.
+	foreach $i (@reasons) {
+		my $rn;
+		my $rstr = "ERR_REASON($i)";
+		my $nspc = 0;
+		if (exists $err_reason_strings{$i}) {
+			$rn = $err_reason_strings{$i};
+		} else {
+			$i =~ /^${lib}_R_(\S+)$/;
+			$rn = $1;
+			$rn =~ tr/_[A-Z]/ [a-z]/;
+		}
+		$nspc = 40 - length($rstr) unless length($rstr) > 40;
+		$nspc = " " x $nspc;
+		print OUT "{${rstr}${nspc},\"$rn\"},\n";
+	}
+if($static) {
+	print OUT <<"EOF";
+{0,NULL}
+	};
+
+#endif
+
+${staticloader}void ERR_load_${lib}_strings(void)
+	{
+#ifndef OPENSSL_NO_ERR
+
+	if (ERR_func_error_string(${lib}_str_functs[0].error) == NULL)
+		{
+		ERR_load_strings($load_errcode,${lib}_str_functs);
+		ERR_load_strings($load_errcode,${lib}_str_reasons);
+		}
+#endif
+	}
+EOF
+} else {
+	print OUT <<"EOF";
+{0,NULL}
+	};
+
+#endif
+
+#ifdef ${lib}_LIB_NAME
+static ERR_STRING_DATA ${lib}_lib_name[]=
+        {
+{0	,${lib}_LIB_NAME},
+{0,NULL}
+	};
+#endif
+
+
+static int ${lib}_lib_error_code=0;
+static int ${lib}_error_init=1;
+
+${staticloader}void ERR_load_${lib}_strings(void)
+	{
+	if (${lib}_lib_error_code == 0)
+		${lib}_lib_error_code=ERR_get_next_error_library();
+
+	if (${lib}_error_init)
+		{
+		${lib}_error_init=0;
+#ifndef OPENSSL_NO_ERR
+		ERR_load_strings(${lib}_lib_error_code,${lib}_str_functs);
+		ERR_load_strings(${lib}_lib_error_code,${lib}_str_reasons);
+#endif
+
+#ifdef ${lib}_LIB_NAME
+		${lib}_lib_name->error = ERR_PACK(${lib}_lib_error_code,0,0);
+		ERR_load_strings(0,${lib}_lib_name);
+#endif
+		}
+	}
+
+${staticloader}void ERR_unload_${lib}_strings(void)
+	{
+	if (${lib}_error_init == 0)
+		{
+#ifndef OPENSSL_NO_ERR
+		ERR_unload_strings(${lib}_lib_error_code,${lib}_str_functs);
+		ERR_unload_strings(${lib}_lib_error_code,${lib}_str_reasons);
+#endif
+
+#ifdef ${lib}_LIB_NAME
+		ERR_unload_strings(0,${lib}_lib_name);
+#endif
+		${lib}_error_init=1;
+		}
+	}
+
+${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line)
+	{
+	if (${lib}_lib_error_code == 0)
+		${lib}_lib_error_code=ERR_get_next_error_library();
+	ERR_PUT_error(${lib}_lib_error_code,function,reason,file,line);
+	}
+EOF
+
+}
+
+	close OUT;
+	undef %err_reason_strings;
+}
+
+if($debug && defined(%notrans)) {
+	print STDERR "The following function codes were not translated:\n";
+	foreach(sort keys %notrans)
+	{
+		print STDERR "$_\n";
+	}
+}
+
+# Make a list of unreferenced function and reason codes
+
+foreach (keys %fcodes) {
+	push (@funref, $_) unless exists $ufcodes{$_};
+}
+
+foreach (keys %rcodes) {
+	push (@runref, $_) unless exists $urcodes{$_};
+}
+
+if($debug && defined(@funref) ) {
+	print STDERR "The following function codes were not referenced:\n";
+	foreach(sort @funref)
+	{
+		print STDERR "$_\n";
+	}
+}
+
+if($debug && defined(@runref) ) {
+	print STDERR "The following reason codes were not referenced:\n";
+	foreach(sort @runref)
+	{
+		print STDERR "$_\n";
+	}
+}
+
+if($errcount) {
+	print STDERR "There were errors, failing...\n\n";
+	exit $errcount;
+}
+
diff --git a/openssl/util/mkstack.pl b/openssl/util/mkstack.pl
index 685051f82..f708610a7 100644
--- a/openssl/util/mkstack.pl
+++ b/openssl/util/mkstack.pl
@@ -1,192 +1,192 @@
-#!/usr/local/bin/perl -w

-

-# This is a utility that searches out "DECLARE_STACK_OF()"

-# declarations in .h and .c files, and updates/creates/replaces

-# the corresponding macro declarations in crypto/stack/safestack.h.

-# As it's not generally possible to have macros that generate macros,

-# we need to control this from the "outside", here in this script.

-#

-# Geoff Thorpe, June, 2000 (with massive Perl-hacking

-#                           help from Steve Robb)

-

-my $safestack = "crypto/stack/safestack";

-

-my $do_write;

-while (@ARGV) {

-	my $arg = $ARGV[0];

-	if($arg eq "-write") {

-		$do_write = 1;

-	}

-	shift @ARGV;

-}

-

-

-@source = (<crypto/*.[ch]>, <crypto/*/*.[ch]>, <ssl/*.[ch]>, <apps/*.[ch]>);

-foreach $file (@source) {

-	next if -l $file;

-

-	# Open the .c/.h file for reading

-	open(IN, "< $file") || die "Can't open $file for reading: $!";

-

-	while(<IN>) {

-		if (/^DECLARE_STACK_OF\(([^)]+)\)/) {

-			push @stacklst, $1;

-		}

-	        if (/^DECLARE_SPECIAL_STACK_OF\(([^,\s]+)\s*,\s*([^>\s]+)\)/) {

-		    	push @sstacklst, [$1, $2];

-		}

-		if (/^DECLARE_ASN1_SET_OF\(([^)]+)\)/) {

-			push @asn1setlst, $1;

-		}

-		if (/^DECLARE_PKCS12_STACK_OF\(([^)]+)\)/) {

-			push @p12stklst, $1;

-		}

-		if (/^DECLARE_LHASH_OF\(([^)]+)\)/) {

-			push @lhashlst, $1;

-		}

-	}

-	close(IN);

-}

-

-

-

-my $old_stackfile = "";

-my $new_stackfile = "";

-my $inside_block = 0;

-my $type_thing;

-

-open(IN, "< $safestack.h") || die "Can't open input file: $!";

-while(<IN>) {

-	$old_stackfile .= $_;

-

-	if (m|^/\* This block of defines is updated by util/mkstack.pl, please do not touch! \*/|) {

-		$inside_block = 1;

-	}

-	if (m|^/\* End of util/mkstack.pl block, you may now edit :-\) \*/|) {

-		$inside_block = 0;

-	} elsif ($inside_block == 0) {

-		$new_stackfile .= $_;

-	}

-	next if($inside_block != 1);

-	$new_stackfile .= "/* This block of defines is updated by util/mkstack.pl, please do not touch! */";

-		

-	foreach $type_thing (sort @stacklst) {

-		$new_stackfile .= <<EOF;

-

-#define sk_${type_thing}_new(cmp) SKM_sk_new($type_thing, (cmp))

-#define sk_${type_thing}_new_null() SKM_sk_new_null($type_thing)

-#define sk_${type_thing}_free(st) SKM_sk_free($type_thing, (st))

-#define sk_${type_thing}_num(st) SKM_sk_num($type_thing, (st))

-#define sk_${type_thing}_value(st, i) SKM_sk_value($type_thing, (st), (i))

-#define sk_${type_thing}_set(st, i, val) SKM_sk_set($type_thing, (st), (i), (val))

-#define sk_${type_thing}_zero(st) SKM_sk_zero($type_thing, (st))

-#define sk_${type_thing}_push(st, val) SKM_sk_push($type_thing, (st), (val))

-#define sk_${type_thing}_unshift(st, val) SKM_sk_unshift($type_thing, (st), (val))

-#define sk_${type_thing}_find(st, val) SKM_sk_find($type_thing, (st), (val))

-#define sk_${type_thing}_find_ex(st, val) SKM_sk_find_ex($type_thing, (st), (val))

-#define sk_${type_thing}_delete(st, i) SKM_sk_delete($type_thing, (st), (i))

-#define sk_${type_thing}_delete_ptr(st, ptr) SKM_sk_delete_ptr($type_thing, (st), (ptr))

-#define sk_${type_thing}_insert(st, val, i) SKM_sk_insert($type_thing, (st), (val), (i))

-#define sk_${type_thing}_set_cmp_func(st, cmp) SKM_sk_set_cmp_func($type_thing, (st), (cmp))

-#define sk_${type_thing}_dup(st) SKM_sk_dup($type_thing, st)

-#define sk_${type_thing}_pop_free(st, free_func) SKM_sk_pop_free($type_thing, (st), (free_func))

-#define sk_${type_thing}_shift(st) SKM_sk_shift($type_thing, (st))

-#define sk_${type_thing}_pop(st) SKM_sk_pop($type_thing, (st))

-#define sk_${type_thing}_sort(st) SKM_sk_sort($type_thing, (st))

-#define sk_${type_thing}_is_sorted(st) SKM_sk_is_sorted($type_thing, (st))

-EOF

-	}

-

-	foreach $type_thing (sort @sstacklst) {

-	    my $t1 = $type_thing->[0];

-	    my $t2 = $type_thing->[1];

-	    $new_stackfile .= <<EOF;

-

-#define sk_${t1}_new(cmp) ((STACK_OF($t1) *)sk_new(CHECKED_SK_CMP_FUNC($t2, cmp)))

-#define sk_${t1}_new_null() ((STACK_OF($t1) *)sk_new_null())

-#define sk_${t1}_push(st, val) sk_push(CHECKED_STACK_OF($t1, st), CHECKED_PTR_OF($t2, val))

-#define sk_${t1}_find(st, val) sk_find(CHECKED_STACK_OF($t1, st), CHECKED_PTR_OF($t2, val))

-#define sk_${t1}_value(st, i) (($t1)sk_value(CHECKED_STACK_OF($t1, st), i))

-#define sk_${t1}_num(st) SKM_sk_num($t1, st)

-#define sk_${t1}_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF($t1, st), CHECKED_SK_FREE_FUNC2($t1, free_func))

-#define sk_${t1}_insert(st, val, i) sk_insert(CHECKED_STACK_OF($t1, st), CHECKED_PTR_OF($t2, val), i)

-#define sk_${t1}_free(st) SKM_sk_free(${t1}, st)

-#define sk_${t1}_set(st, i, val) sk_set(CHECKED_STACK_OF($t1, st), i, CHECKED_PTR_OF($t2, val))

-#define sk_${t1}_zero(st) SKM_sk_zero($t1, (st))

-#define sk_${t1}_unshift(st, val) sk_unshift(CHECKED_STACK_OF($t1, st), CHECKED_PTR_OF($t2, val))

-#define sk_${t1}_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF($t1), st), CHECKED_CONST_PTR_OF($t2, val))

-#define sk_${t1}_delete(st, i) SKM_sk_delete($t1, (st), (i))

-#define sk_${t1}_delete_ptr(st, ptr) ($t1 *)sk_delete_ptr(CHECKED_STACK_OF($t1, st), CHECKED_PTR_OF($t2, ptr))

-#define sk_${t1}_set_cmp_func(st, cmp)  \\

-	((int (*)(const $t2 * const *,const $t2 * const *)) \\

-	sk_set_cmp_func(CHECKED_STACK_OF($t1, st), CHECKED_SK_CMP_FUNC($t2, cmp)))

-#define sk_${t1}_dup(st) SKM_sk_dup($t1, st)

-#define sk_${t1}_shift(st) SKM_sk_shift($t1, (st))

-#define sk_${t1}_pop(st) ($t2 *)sk_pop(CHECKED_STACK_OF($t1, st))

-#define sk_${t1}_sort(st) SKM_sk_sort($t1, (st))

-#define sk_${t1}_is_sorted(st) SKM_sk_is_sorted($t1, (st))

-

-EOF

-	}

-

-	foreach $type_thing (sort @asn1setlst) {

-		$new_stackfile .= <<EOF;

-

-#define d2i_ASN1_SET_OF_${type_thing}(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \\

-	SKM_ASN1_SET_OF_d2i($type_thing, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 

-#define i2d_ASN1_SET_OF_${type_thing}(st, pp, i2d_func, ex_tag, ex_class, is_set) \\

-	SKM_ASN1_SET_OF_i2d($type_thing, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))

-#define ASN1_seq_pack_${type_thing}(st, i2d_func, buf, len) \\

-	SKM_ASN1_seq_pack($type_thing, (st), (i2d_func), (buf), (len))

-#define ASN1_seq_unpack_${type_thing}(buf, len, d2i_func, free_func) \\

-	SKM_ASN1_seq_unpack($type_thing, (buf), (len), (d2i_func), (free_func))

-EOF

-	}

-	foreach $type_thing (sort @p12stklst) {

-		$new_stackfile .= <<EOF;

-

-#define PKCS12_decrypt_d2i_${type_thing}(algor, d2i_func, free_func, pass, passlen, oct, seq) \\

-	SKM_PKCS12_decrypt_d2i($type_thing, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))

-EOF

-	}

-

-	foreach $type_thing (sort @lhashlst) {

-		my $lc_tt = lc $type_thing;

-		$new_stackfile .= <<EOF;

-

-#define lh_${type_thing}_new() LHM_lh_new(${type_thing},${lc_tt})

-#define lh_${type_thing}_insert(lh,inst) LHM_lh_insert(${type_thing},lh,inst)

-#define lh_${type_thing}_retrieve(lh,inst) LHM_lh_retrieve(${type_thing},lh,inst)

-#define lh_${type_thing}_delete(lh,inst) LHM_lh_delete(${type_thing},lh,inst)

-#define lh_${type_thing}_doall(lh,fn) LHM_lh_doall(${type_thing},lh,fn)

-#define lh_${type_thing}_doall_arg(lh,fn,arg_type,arg) \\

-  LHM_lh_doall_arg(${type_thing},lh,fn,arg_type,arg)

-#define lh_${type_thing}_error(lh) LHM_lh_error(${type_thing},lh)

-#define lh_${type_thing}_num_items(lh) LHM_lh_num_items(${type_thing},lh)

-#define lh_${type_thing}_down_load(lh) LHM_lh_down_load(${type_thing},lh)

-#define lh_${type_thing}_node_stats_bio(lh,out) \\

-  LHM_lh_node_stats_bio(${type_thing},lh,out)

-#define lh_${type_thing}_node_usage_stats_bio(lh,out) \\

-  LHM_lh_node_usage_stats_bio(${type_thing},lh,out)

-#define lh_${type_thing}_stats_bio(lh,out) \\

-  LHM_lh_stats_bio(${type_thing},lh,out)

-#define lh_${type_thing}_free(lh) LHM_lh_free(${type_thing},lh)

-EOF

-	}

-

-	$new_stackfile .= "/* End of util/mkstack.pl block, you may now edit :-) */\n";

-	$inside_block = 2;

-}

-

-

-if ($new_stackfile eq $old_stackfile) {

-	print "No changes to $safestack.h.\n";

-	exit 0; # avoid unnecessary rebuild

-}

-

-if ($do_write) {

-	print "Writing new $safestack.h.\n";

-	open OUT, ">$safestack.h" || die "Can't open output file";

-	print OUT $new_stackfile;

-	close OUT;

-}

+#!/usr/local/bin/perl -w
+
+# This is a utility that searches out "DECLARE_STACK_OF()"
+# declarations in .h and .c files, and updates/creates/replaces
+# the corresponding macro declarations in crypto/stack/safestack.h.
+# As it's not generally possible to have macros that generate macros,
+# we need to control this from the "outside", here in this script.
+#
+# Geoff Thorpe, June, 2000 (with massive Perl-hacking
+#                           help from Steve Robb)
+
+my $safestack = "crypto/stack/safestack";
+
+my $do_write;
+while (@ARGV) {
+	my $arg = $ARGV[0];
+	if($arg eq "-write") {
+		$do_write = 1;
+	}
+	shift @ARGV;
+}
+
+
+@source = (<crypto/*.[ch]>, <crypto/*/*.[ch]>, <ssl/*.[ch]>, <apps/*.[ch]>);
+foreach $file (@source) {
+	next if -l $file;
+
+	# Open the .c/.h file for reading
+	open(IN, "< $file") || die "Can't open $file for reading: $!";
+
+	while(<IN>) {
+		if (/^DECLARE_STACK_OF\(([^)]+)\)/) {
+			push @stacklst, $1;
+		}
+	        if (/^DECLARE_SPECIAL_STACK_OF\(([^,\s]+)\s*,\s*([^>\s]+)\)/) {
+		    	push @sstacklst, [$1, $2];
+		}
+		if (/^DECLARE_ASN1_SET_OF\(([^)]+)\)/) {
+			push @asn1setlst, $1;
+		}
+		if (/^DECLARE_PKCS12_STACK_OF\(([^)]+)\)/) {
+			push @p12stklst, $1;
+		}
+		if (/^DECLARE_LHASH_OF\(([^)]+)\)/) {
+			push @lhashlst, $1;
+		}
+	}
+	close(IN);
+}
+
+
+
+my $old_stackfile = "";
+my $new_stackfile = "";
+my $inside_block = 0;
+my $type_thing;
+
+open(IN, "< $safestack.h") || die "Can't open input file: $!";
+while(<IN>) {
+	$old_stackfile .= $_;
+
+	if (m|^/\* This block of defines is updated by util/mkstack.pl, please do not touch! \*/|) {
+		$inside_block = 1;
+	}
+	if (m|^/\* End of util/mkstack.pl block, you may now edit :-\) \*/|) {
+		$inside_block = 0;
+	} elsif ($inside_block == 0) {
+		$new_stackfile .= $_;
+	}
+	next if($inside_block != 1);
+	$new_stackfile .= "/* This block of defines is updated by util/mkstack.pl, please do not touch! */";
+		
+	foreach $type_thing (sort @stacklst) {
+		$new_stackfile .= <<EOF;
+
+#define sk_${type_thing}_new(cmp) SKM_sk_new($type_thing, (cmp))
+#define sk_${type_thing}_new_null() SKM_sk_new_null($type_thing)
+#define sk_${type_thing}_free(st) SKM_sk_free($type_thing, (st))
+#define sk_${type_thing}_num(st) SKM_sk_num($type_thing, (st))
+#define sk_${type_thing}_value(st, i) SKM_sk_value($type_thing, (st), (i))
+#define sk_${type_thing}_set(st, i, val) SKM_sk_set($type_thing, (st), (i), (val))
+#define sk_${type_thing}_zero(st) SKM_sk_zero($type_thing, (st))
+#define sk_${type_thing}_push(st, val) SKM_sk_push($type_thing, (st), (val))
+#define sk_${type_thing}_unshift(st, val) SKM_sk_unshift($type_thing, (st), (val))
+#define sk_${type_thing}_find(st, val) SKM_sk_find($type_thing, (st), (val))
+#define sk_${type_thing}_find_ex(st, val) SKM_sk_find_ex($type_thing, (st), (val))
+#define sk_${type_thing}_delete(st, i) SKM_sk_delete($type_thing, (st), (i))
+#define sk_${type_thing}_delete_ptr(st, ptr) SKM_sk_delete_ptr($type_thing, (st), (ptr))
+#define sk_${type_thing}_insert(st, val, i) SKM_sk_insert($type_thing, (st), (val), (i))
+#define sk_${type_thing}_set_cmp_func(st, cmp) SKM_sk_set_cmp_func($type_thing, (st), (cmp))
+#define sk_${type_thing}_dup(st) SKM_sk_dup($type_thing, st)
+#define sk_${type_thing}_pop_free(st, free_func) SKM_sk_pop_free($type_thing, (st), (free_func))
+#define sk_${type_thing}_shift(st) SKM_sk_shift($type_thing, (st))
+#define sk_${type_thing}_pop(st) SKM_sk_pop($type_thing, (st))
+#define sk_${type_thing}_sort(st) SKM_sk_sort($type_thing, (st))
+#define sk_${type_thing}_is_sorted(st) SKM_sk_is_sorted($type_thing, (st))
+EOF
+	}
+
+	foreach $type_thing (sort @sstacklst) {
+	    my $t1 = $type_thing->[0];
+	    my $t2 = $type_thing->[1];
+	    $new_stackfile .= <<EOF;
+
+#define sk_${t1}_new(cmp) ((STACK_OF($t1) *)sk_new(CHECKED_SK_CMP_FUNC($t2, cmp)))
+#define sk_${t1}_new_null() ((STACK_OF($t1) *)sk_new_null())
+#define sk_${t1}_push(st, val) sk_push(CHECKED_STACK_OF($t1, st), CHECKED_PTR_OF($t2, val))
+#define sk_${t1}_find(st, val) sk_find(CHECKED_STACK_OF($t1, st), CHECKED_PTR_OF($t2, val))
+#define sk_${t1}_value(st, i) (($t1)sk_value(CHECKED_STACK_OF($t1, st), i))
+#define sk_${t1}_num(st) SKM_sk_num($t1, st)
+#define sk_${t1}_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF($t1, st), CHECKED_SK_FREE_FUNC2($t1, free_func))
+#define sk_${t1}_insert(st, val, i) sk_insert(CHECKED_STACK_OF($t1, st), CHECKED_PTR_OF($t2, val), i)
+#define sk_${t1}_free(st) SKM_sk_free(${t1}, st)
+#define sk_${t1}_set(st, i, val) sk_set(CHECKED_STACK_OF($t1, st), i, CHECKED_PTR_OF($t2, val))
+#define sk_${t1}_zero(st) SKM_sk_zero($t1, (st))
+#define sk_${t1}_unshift(st, val) sk_unshift(CHECKED_STACK_OF($t1, st), CHECKED_PTR_OF($t2, val))
+#define sk_${t1}_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF($t1), st), CHECKED_CONST_PTR_OF($t2, val))
+#define sk_${t1}_delete(st, i) SKM_sk_delete($t1, (st), (i))
+#define sk_${t1}_delete_ptr(st, ptr) ($t1 *)sk_delete_ptr(CHECKED_STACK_OF($t1, st), CHECKED_PTR_OF($t2, ptr))
+#define sk_${t1}_set_cmp_func(st, cmp)  \\
+	((int (*)(const $t2 * const *,const $t2 * const *)) \\
+	sk_set_cmp_func(CHECKED_STACK_OF($t1, st), CHECKED_SK_CMP_FUNC($t2, cmp)))
+#define sk_${t1}_dup(st) SKM_sk_dup($t1, st)
+#define sk_${t1}_shift(st) SKM_sk_shift($t1, (st))
+#define sk_${t1}_pop(st) ($t2 *)sk_pop(CHECKED_STACK_OF($t1, st))
+#define sk_${t1}_sort(st) SKM_sk_sort($t1, (st))
+#define sk_${t1}_is_sorted(st) SKM_sk_is_sorted($t1, (st))
+
+EOF
+	}
+
+	foreach $type_thing (sort @asn1setlst) {
+		$new_stackfile .= <<EOF;
+
+#define d2i_ASN1_SET_OF_${type_thing}(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \\
+	SKM_ASN1_SET_OF_d2i($type_thing, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
+#define i2d_ASN1_SET_OF_${type_thing}(st, pp, i2d_func, ex_tag, ex_class, is_set) \\
+	SKM_ASN1_SET_OF_i2d($type_thing, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
+#define ASN1_seq_pack_${type_thing}(st, i2d_func, buf, len) \\
+	SKM_ASN1_seq_pack($type_thing, (st), (i2d_func), (buf), (len))
+#define ASN1_seq_unpack_${type_thing}(buf, len, d2i_func, free_func) \\
+	SKM_ASN1_seq_unpack($type_thing, (buf), (len), (d2i_func), (free_func))
+EOF
+	}
+	foreach $type_thing (sort @p12stklst) {
+		$new_stackfile .= <<EOF;
+
+#define PKCS12_decrypt_d2i_${type_thing}(algor, d2i_func, free_func, pass, passlen, oct, seq) \\
+	SKM_PKCS12_decrypt_d2i($type_thing, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))
+EOF
+	}
+
+	foreach $type_thing (sort @lhashlst) {
+		my $lc_tt = lc $type_thing;
+		$new_stackfile .= <<EOF;
+
+#define lh_${type_thing}_new() LHM_lh_new(${type_thing},${lc_tt})
+#define lh_${type_thing}_insert(lh,inst) LHM_lh_insert(${type_thing},lh,inst)
+#define lh_${type_thing}_retrieve(lh,inst) LHM_lh_retrieve(${type_thing},lh,inst)
+#define lh_${type_thing}_delete(lh,inst) LHM_lh_delete(${type_thing},lh,inst)
+#define lh_${type_thing}_doall(lh,fn) LHM_lh_doall(${type_thing},lh,fn)
+#define lh_${type_thing}_doall_arg(lh,fn,arg_type,arg) \\
+  LHM_lh_doall_arg(${type_thing},lh,fn,arg_type,arg)
+#define lh_${type_thing}_error(lh) LHM_lh_error(${type_thing},lh)
+#define lh_${type_thing}_num_items(lh) LHM_lh_num_items(${type_thing},lh)
+#define lh_${type_thing}_down_load(lh) LHM_lh_down_load(${type_thing},lh)
+#define lh_${type_thing}_node_stats_bio(lh,out) \\
+  LHM_lh_node_stats_bio(${type_thing},lh,out)
+#define lh_${type_thing}_node_usage_stats_bio(lh,out) \\
+  LHM_lh_node_usage_stats_bio(${type_thing},lh,out)
+#define lh_${type_thing}_stats_bio(lh,out) \\
+  LHM_lh_stats_bio(${type_thing},lh,out)
+#define lh_${type_thing}_free(lh) LHM_lh_free(${type_thing},lh)
+EOF
+	}
+
+	$new_stackfile .= "/* End of util/mkstack.pl block, you may now edit :-) */\n";
+	$inside_block = 2;
+}
+
+
+if ($new_stackfile eq $old_stackfile) {
+	print "No changes to $safestack.h.\n";
+	exit 0; # avoid unnecessary rebuild
+}
+
+if ($do_write) {
+	print "Writing new $safestack.h.\n";
+	open OUT, ">$safestack.h" || die "Can't open output file";
+	print OUT $new_stackfile;
+	close OUT;
+}