- merged in the latest from the main trunk, fixed all conflicts

 Changes between 0.9.5a and 0.9.6  [xx XXX 2000]

  *) New function BN_mod_exp_mont_word for small bases (roughly 20%

     faster than BN_mod_exp_mont even though it does not use

     windowing).

  *) The evp_local.h macros were using 'c.##kname' which resulted in

     invalid expansion on some systems (SCO 5.0.5 for example).

     Corrected to 'c.kname'.

     [Phillip Porch <root@theporch.com>]

  *) New X509_get1_email() and X509_REQ_get1_email() functions that return

     a STACK of email addresses from a certificate or request, these look

     in the subject name and the subject alternative name extensions and 

     omit any duplicate addresses.

     [Steve Henson]

  *) Re-implement BN_mod_exp2_mont using independent (and larger) windows.

     This makes DSA verification about 2 % faster.

     [Bodo Moeller]

  *) Increase maximum window size in BN_mod_exp_... to 6 bits instead of 5

     (meaning that now 2^5 values will be precomputed, which is only 4 KB

     plus overhead for 1024 bit moduli).

     This makes exponentiations about 0.5 % faster for 1024 bit

     exponents (as measured by "openssl speed rsa2048").

     [Bodo Moeller]

  *) Rename memory handling macros to avoid conflicts with other

     software:

          Malloc         =>  OPENSSL_malloc

          Malloc_locked  =>  OPENSSL_malloc_locked

          Realloc        =>  OPENSSL_realloc

          Free           =>  OPENSSL_free

     [Richard Levitte]

  *) New function BN_mod_exp_mont_word for small bases (roughly 15%

     faster than BN_mod_exp_mont, i.e. 7% for a full DH exchange).

     [Bodo Moeller]

  *) CygWin32 support.

# Sunos configs, assuming sparc for the gcc one.

##"sunos-cc", "cc:-O4 -DNOPROTO -DNOCONST::(unknown)::DES_UNROLL:::",

"sunos-gcc","gcc:-O3 -mv8 -Dssize_t=int::(unknown):-liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:::",

"sunos-gcc","gcc:-O3 -mv8 -Dssize_t=int::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:::",

#### IRIX 5.x configs

# -mips2 flag is added by ./config when appropriate.

# Dec Alpha, OSF/1 - the alpha164-cc is the flags for a 21164A with

# the new compiler

# For gcc, the following gave a %50 speedup on a 164 over the 'DES_INT' version

"alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:asm/alpha.o::",

"alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:asm/alpha.o::",

"alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:asm/alpha.o:::::::::dlfcn",

"alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:asm/alpha.o:::::::::dlfcn",

"alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:asm/alpha.o::",

"FreeBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2:::",

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = 

$dso_scheme   = dlfcn

*** alpha-gcc

$cc           = gcc

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = 

$dso_scheme   = dlfcn

*** alpha164-cc

$cc           = cc

*** debug-ben

$cc           = gcc

$cflags       = -DBN_DEBUG -DREF_CHECK -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -O2 -pedantic -Wall -Wshadow -Werror -pipe

$cflags       = -DBN_DEBUG -DREF_CHECK -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -O2 -pedantic -Wall -Wshadow -Werror -pipe

$unistd       = 

$thread_cflag = (unknown)

$lflags       = 

*** debug-ben-debug

$cc           = gcc

$cflags       = -DBN_DEBUG -DREF_CHECK -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe

$cflags       = -DBN_DEBUG -DREF_CHECK -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe

$unistd       = 

$thread_cflag = (unknown)

$lflags       = 

$cc           = cc

$cflags       = -n32 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W

$unistd       = 

$thread_cflag = (unknown)

$thread_cflag = -D_SGI_MP_SOURCE

$lflags       = 

$bn_ops       = DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT

$bn_obj       = asm/mips3.o

$cc           = gcc

$cflags       = -mabi=n32 -mmips-as -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W

$unistd       = 

$thread_cflag = (unknown)

$thread_cflag = -D_SGI_MP_SOURCE

$lflags       = 

$bn_ops       = MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT

$bn_obj       = asm/mips3.o

$cc           = cc

$cflags       = -64 -mips4 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W

$unistd       = 

$thread_cflag = (unknown)

$thread_cflag = -D_SGI_MP_SOURCE

$lflags       = 

$bn_ops       = RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG

$bn_obj       = asm/mips3.o

$cc           = gcc

$cflags       = -mabi=64 -mips4 -mmips-as -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W

$unistd       = 

$thread_cflag = (unknown)

$thread_cflag = -D_SGI_MP_SOURCE

$lflags       = 

$bn_ops       = RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG

$bn_obj       = asm/mips3.o

$cc           = ccc

$cflags       = -fast -readonly_strings -DL_ENDIAN -DTERMIO

$unistd       = 

$thread_cflag = (unknown)

$thread_cflag = -D_REENTRANT

$lflags       = 

$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL

$bn_obj       = asm/alpha.o

$cc           = gcc

$cflags       = -O3 -DL_ENDIAN -DTERMIO

$unistd       = 

$thread_cflag = (unknown)

$thread_cflag = -D_REENTRANT

$lflags       = 

$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL

$bn_obj       = asm/alpha.o

$cc           = ccc

$cflags       = -fast -readonly_strings -DL_ENDIAN -DTERMIO

$unistd       = 

$thread_cflag = (unknown)

$thread_cflag = -D_REENTRANT

$lflags       = 

$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL

$bn_obj       = asm/alpha.o

$cc           = gcc

$cflags       = -O3 -DL_ENDIAN -DTERMIO

$unistd       = 

$thread_cflag = (unknown)

$thread_cflag = -D_REENTRANT

$lflags       = 

$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL

$bn_obj       = asm/alpha.o

			}

		else if (strcmp(*argv,"-3") == 0)

			f4=3;

		else if (strcmp(*argv,"-F4") == 0)

		else if (strcmp(*argv,"-F4") == 0 || strcmp(*argv,"-f4") == 0)

			f4=RSA_F4;

		else if (strcmp(*argv,"-rand") == 0)

			{