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

author Richard Levitte <levitte@openssl.org>

Tue, 13 Jun 2000 16:21:06 +0000 (16:21 +0000)

committer Richard Levitte <levitte@openssl.org>

Tue, 13 Jun 2000 16:21:06 +0000 (16:21 +0000)
author Richard Levitte <levitte@openssl.org>
Tue, 13 Jun 2000 16:21:06 +0000 (16:21 +0000)
committer Richard Levitte <levitte@openssl.org>
Tue, 13 Jun 2000 16:21:06 +0000 (16:21 +0000)
diff --git a/CHANGES b/CHANGES

index f1cfe73a80c17235980e5dffcd1cb4d731bb98d4..bd8e6da93e6887d4aba8fe45b52d84121fcd6857 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,9 +4,38 @@
  
   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.
diff --git a/Configure b/Configure

index a2ad62c2ceed10e9a33df3c9fbe5ab3cdc48aae3..06e8d0363430dbd81037033a00492fd27ce3adc9 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -168,7 +168,7 @@ my %table=(
  
  # 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.
@@ -250,8 +250,8 @@ my %table=(
  # 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:::",
  
diff --git a/TABLE b/TABLE

index 49f72e0d464438f916c3174e1145135944746f83..9526e2e703a9981e86d461050d13b32239937b90 100644 (file)
--- a/TABLE
+++ b/TABLE
@@ -484,7 +484,7 @@ $cast_obj     =
  $rc4_obj      = 
  $rmd160_obj   = 
  $rc5_obj      = 
-$dso_scheme   = 
+$dso_scheme   = dlfcn
  
  *** alpha-gcc
  $cc           = gcc
@@ -502,7 +502,7 @@ $cast_obj     =
  $rc4_obj      = 
  $rmd160_obj   = 
  $rc5_obj      = 
-$dso_scheme   = 
+$dso_scheme   = dlfcn
  
  *** alpha164-cc
  $cc           = cc
@@ -632,7 +632,7 @@ $dso_scheme   =
  
  *** 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       = 
@@ -650,7 +650,7 @@ $dso_scheme   =
  
  *** 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       = 
@@ -1228,7 +1228,7 @@ $dso_scheme   =
  $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
@@ -1246,7 +1246,7 @@ $dso_scheme   =
  $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
@@ -1264,7 +1264,7 @@ $dso_scheme   =
  $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
@@ -1282,7 +1282,7 @@ $dso_scheme   =
  $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
@@ -1300,7 +1300,7 @@ $dso_scheme   =
  $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
@@ -1318,7 +1318,7 @@ $dso_scheme   =
  $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
@@ -1336,7 +1336,7 @@ $dso_scheme   =
  $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
@@ -1354,7 +1354,7 @@ $dso_scheme   =
  $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
diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl

index fb73899ccf3035ab377924cbb2985e68d2b2a2c6..129c0f84929d4279e53823dbedfbddafb42e95a7 100644 (file)
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -150,15 +150,16 @@ app_rand.o: ../include/openssl/crypto.h ../include/openssl/des.h
  app_rand.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  app_rand.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  app_rand.o: ../include/openssl/evp.h ../include/openssl/idea.h
-app_rand.o: ../include/openssl/md2.h ../include/openssl/md5.h
-app_rand.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
-app_rand.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-app_rand.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
-app_rand.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-app_rand.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
-app_rand.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-app_rand.o: ../include/openssl/sha.h ../include/openssl/stack.h
-app_rand.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
+app_rand.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+app_rand.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
+app_rand.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+app_rand.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
+app_rand.o: ../include/openssl/rand.h ../include/openssl/rc2.h
+app_rand.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+app_rand.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+app_rand.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+app_rand.o: ../include/openssl/stack.h ../include/openssl/x509.h
+app_rand.o: ../include/openssl/x509_vfy.h apps.h
  apps.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  apps.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  apps.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -166,15 +167,15 @@ apps.o: ../include/openssl/crypto.h ../include/openssl/des.h
  apps.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  apps.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  apps.o: ../include/openssl/evp.h ../include/openssl/idea.h
-apps.o: ../include/openssl/md2.h ../include/openssl/md5.h
-apps.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
-apps.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-apps.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
-apps.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-apps.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-apps.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-apps.o: ../include/openssl/stack.h ../include/openssl/x509.h
-apps.o: ../include/openssl/x509_vfy.h apps.h
+apps.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+apps.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
+apps.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+apps.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
+apps.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+apps.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+apps.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+apps.o: ../include/openssl/sha.h ../include/openssl/stack.h
+apps.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
  asn1pars.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  asn1pars.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  asn1pars.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -182,16 +183,17 @@ asn1pars.o: ../include/openssl/crypto.h ../include/openssl/des.h
  asn1pars.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  asn1pars.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  asn1pars.o: ../include/openssl/err.h ../include/openssl/evp.h
-asn1pars.o: ../include/openssl/idea.h ../include/openssl/md2.h
-asn1pars.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-asn1pars.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-asn1pars.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-asn1pars.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-asn1pars.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-asn1pars.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
-asn1pars.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-asn1pars.o: ../include/openssl/sha.h ../include/openssl/stack.h
-asn1pars.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
+asn1pars.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+asn1pars.o: ../include/openssl/md2.h ../include/openssl/md5.h
+asn1pars.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+asn1pars.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+asn1pars.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+asn1pars.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
+asn1pars.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+asn1pars.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+asn1pars.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+asn1pars.o: ../include/openssl/stack.h ../include/openssl/x509.h
+asn1pars.o: ../include/openssl/x509_vfy.h apps.h
  ca.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  ca.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  ca.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -214,23 +216,24 @@ ca.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
  ciphers.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  ciphers.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  ciphers.o: ../include/openssl/buffer.h ../include/openssl/cast.h
-ciphers.o: ../include/openssl/crypto.h ../include/openssl/des.h
-ciphers.o: ../include/openssl/dh.h ../include/openssl/dsa.h
-ciphers.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-ciphers.o: ../include/openssl/err.h ../include/openssl/evp.h
-ciphers.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-ciphers.o: ../include/openssl/md2.h ../include/openssl/md5.h
-ciphers.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
-ciphers.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-ciphers.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-ciphers.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
-ciphers.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-ciphers.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-ciphers.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-ciphers.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-ciphers.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-ciphers.o: ../include/openssl/stack.h ../include/openssl/tls1.h
-ciphers.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
+ciphers.o: ../include/openssl/comp.h ../include/openssl/crypto.h
+ciphers.o: ../include/openssl/des.h ../include/openssl/dh.h
+ciphers.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
+ciphers.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+ciphers.o: ../include/openssl/evp.h ../include/openssl/idea.h
+ciphers.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+ciphers.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
+ciphers.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+ciphers.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+ciphers.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+ciphers.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+ciphers.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+ciphers.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+ciphers.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+ciphers.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+ciphers.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+ciphers.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+ciphers.o: ../include/openssl/x509_vfy.h apps.h
  crl.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  crl.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  crl.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -257,16 +260,17 @@ crl2p7.o: ../include/openssl/crypto.h ../include/openssl/des.h
  crl2p7.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  crl2p7.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  crl2p7.o: ../include/openssl/err.h ../include/openssl/evp.h
-crl2p7.o: ../include/openssl/idea.h ../include/openssl/md2.h
-crl2p7.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-crl2p7.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-crl2p7.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-crl2p7.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-crl2p7.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-crl2p7.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
-crl2p7.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-crl2p7.o: ../include/openssl/sha.h ../include/openssl/stack.h
-crl2p7.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
+crl2p7.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+crl2p7.o: ../include/openssl/md2.h ../include/openssl/md5.h
+crl2p7.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+crl2p7.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+crl2p7.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+crl2p7.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
+crl2p7.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+crl2p7.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+crl2p7.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+crl2p7.o: ../include/openssl/stack.h ../include/openssl/x509.h
+crl2p7.o: ../include/openssl/x509_vfy.h apps.h
  dgst.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  dgst.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  dgst.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -274,16 +278,17 @@ dgst.o: ../include/openssl/crypto.h ../include/openssl/des.h
  dgst.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  dgst.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  dgst.o: ../include/openssl/err.h ../include/openssl/evp.h
-dgst.o: ../include/openssl/idea.h ../include/openssl/md2.h
-dgst.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-dgst.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-dgst.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-dgst.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-dgst.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-dgst.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
-dgst.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-dgst.o: ../include/openssl/sha.h ../include/openssl/stack.h
-dgst.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
+dgst.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+dgst.o: ../include/openssl/md2.h ../include/openssl/md5.h
+dgst.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+dgst.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+dgst.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+dgst.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
+dgst.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+dgst.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+dgst.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+dgst.o: ../include/openssl/stack.h ../include/openssl/x509.h
+dgst.o: ../include/openssl/x509_vfy.h apps.h
  dh.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  dh.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  dh.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -291,16 +296,17 @@ dh.o: ../include/openssl/crypto.h ../include/openssl/des.h
  dh.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  dh.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  dh.o: ../include/openssl/err.h ../include/openssl/evp.h
-dh.o: ../include/openssl/idea.h ../include/openssl/md2.h
-dh.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-dh.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-dh.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-dh.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-dh.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-dh.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
-dh.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-dh.o: ../include/openssl/sha.h ../include/openssl/stack.h
-dh.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
+dh.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+dh.o: ../include/openssl/md2.h ../include/openssl/md5.h
+dh.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+dh.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+dh.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+dh.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
+dh.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+dh.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+dh.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+dh.o: ../include/openssl/stack.h ../include/openssl/x509.h
+dh.o: ../include/openssl/x509_vfy.h apps.h
  dsa.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  dsa.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  dsa.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -308,16 +314,17 @@ dsa.o: ../include/openssl/crypto.h ../include/openssl/des.h
  dsa.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  dsa.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  dsa.o: ../include/openssl/err.h ../include/openssl/evp.h
-dsa.o: ../include/openssl/idea.h ../include/openssl/md2.h
-dsa.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-dsa.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-dsa.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-dsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-dsa.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-dsa.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
-dsa.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-dsa.o: ../include/openssl/sha.h ../include/openssl/stack.h
-dsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
+dsa.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+dsa.o: ../include/openssl/md2.h ../include/openssl/md5.h
+dsa.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+dsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+dsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+dsa.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
+dsa.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+dsa.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+dsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+dsa.o: ../include/openssl/stack.h ../include/openssl/x509.h
+dsa.o: ../include/openssl/x509_vfy.h apps.h
  dsaparam.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  dsaparam.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  dsaparam.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -325,16 +332,17 @@ dsaparam.o: ../include/openssl/crypto.h ../include/openssl/des.h
  dsaparam.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  dsaparam.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  dsaparam.o: ../include/openssl/err.h ../include/openssl/evp.h
-dsaparam.o: ../include/openssl/idea.h ../include/openssl/md2.h
-dsaparam.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-dsaparam.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-dsaparam.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-dsaparam.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-dsaparam.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-dsaparam.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
-dsaparam.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-dsaparam.o: ../include/openssl/sha.h ../include/openssl/stack.h
-dsaparam.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
+dsaparam.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+dsaparam.o: ../include/openssl/md2.h ../include/openssl/md5.h
+dsaparam.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+dsaparam.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+dsaparam.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+dsaparam.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
+dsaparam.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+dsaparam.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+dsaparam.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+dsaparam.o: ../include/openssl/stack.h ../include/openssl/x509.h
+dsaparam.o: ../include/openssl/x509_vfy.h apps.h
  enc.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  enc.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  enc.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -342,37 +350,38 @@ enc.o: ../include/openssl/crypto.h ../include/openssl/des.h
  enc.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  enc.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  enc.o: ../include/openssl/err.h ../include/openssl/evp.h
-enc.o: ../include/openssl/idea.h ../include/openssl/md2.h
-enc.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-enc.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-enc.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-enc.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-enc.o: ../include/openssl/rand.h ../include/openssl/rc2.h
-enc.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-enc.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-enc.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-enc.o: ../include/openssl/stack.h ../include/openssl/x509.h
-enc.o: ../include/openssl/x509_vfy.h apps.h
+enc.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+enc.o: ../include/openssl/md2.h ../include/openssl/md5.h
+enc.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+enc.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+enc.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+enc.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+enc.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+enc.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+enc.o: ../include/openssl/sha.h ../include/openssl/stack.h
+enc.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
  errstr.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  errstr.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  errstr.o: ../include/openssl/buffer.h ../include/openssl/cast.h
-errstr.o: ../include/openssl/crypto.h ../include/openssl/des.h
-errstr.o: ../include/openssl/dh.h ../include/openssl/dsa.h
-errstr.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-errstr.o: ../include/openssl/err.h ../include/openssl/evp.h
-errstr.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-errstr.o: ../include/openssl/md2.h ../include/openssl/md5.h
-errstr.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
-errstr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-errstr.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-errstr.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
-errstr.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-errstr.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-errstr.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-errstr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-errstr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-errstr.o: ../include/openssl/stack.h ../include/openssl/tls1.h
-errstr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
+errstr.o: ../include/openssl/comp.h ../include/openssl/crypto.h
+errstr.o: ../include/openssl/des.h ../include/openssl/dh.h
+errstr.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
+errstr.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+errstr.o: ../include/openssl/evp.h ../include/openssl/idea.h
+errstr.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+errstr.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
+errstr.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+errstr.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+errstr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+errstr.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+errstr.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+errstr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+errstr.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+errstr.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+errstr.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+errstr.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+errstr.o: ../include/openssl/x509_vfy.h apps.h
  gendh.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  gendh.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  gendh.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -380,17 +389,17 @@ gendh.o: ../include/openssl/crypto.h ../include/openssl/des.h
  gendh.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  gendh.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  gendh.o: ../include/openssl/err.h ../include/openssl/evp.h
-gendh.o: ../include/openssl/idea.h ../include/openssl/md2.h
-gendh.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-gendh.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-gendh.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-gendh.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-gendh.o: ../include/openssl/rand.h ../include/openssl/rc2.h
-gendh.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-gendh.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-gendh.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-gendh.o: ../include/openssl/stack.h ../include/openssl/x509.h
-gendh.o: ../include/openssl/x509_vfy.h apps.h
+gendh.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+gendh.o: ../include/openssl/md2.h ../include/openssl/md5.h
+gendh.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+gendh.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+gendh.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+gendh.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+gendh.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+gendh.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+gendh.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+gendh.o: ../include/openssl/sha.h ../include/openssl/stack.h
+gendh.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
  gendsa.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  gendsa.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  gendsa.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -398,16 +407,17 @@ gendsa.o: ../include/openssl/crypto.h ../include/openssl/des.h
  gendsa.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  gendsa.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  gendsa.o: ../include/openssl/err.h ../include/openssl/evp.h
-gendsa.o: ../include/openssl/idea.h ../include/openssl/md2.h
-gendsa.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-gendsa.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-gendsa.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-gendsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-gendsa.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-gendsa.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
-gendsa.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-gendsa.o: ../include/openssl/sha.h ../include/openssl/stack.h
-gendsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
+gendsa.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+gendsa.o: ../include/openssl/md2.h ../include/openssl/md5.h
+gendsa.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+gendsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+gendsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+gendsa.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
+gendsa.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+gendsa.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+gendsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+gendsa.o: ../include/openssl/stack.h ../include/openssl/x509.h
+gendsa.o: ../include/openssl/x509_vfy.h apps.h
  genrsa.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  genrsa.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  genrsa.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -415,16 +425,17 @@ genrsa.o: ../include/openssl/crypto.h ../include/openssl/des.h
  genrsa.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  genrsa.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  genrsa.o: ../include/openssl/err.h ../include/openssl/evp.h
-genrsa.o: ../include/openssl/idea.h ../include/openssl/md2.h
-genrsa.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-genrsa.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-genrsa.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-genrsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-genrsa.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-genrsa.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
-genrsa.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-genrsa.o: ../include/openssl/sha.h ../include/openssl/stack.h
-genrsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
+genrsa.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+genrsa.o: ../include/openssl/md2.h ../include/openssl/md5.h
+genrsa.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+genrsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+genrsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+genrsa.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
+genrsa.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+genrsa.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+genrsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+genrsa.o: ../include/openssl/stack.h ../include/openssl/x509.h
+genrsa.o: ../include/openssl/x509_vfy.h apps.h
  nseq.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  nseq.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  nseq.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -432,38 +443,39 @@ nseq.o: ../include/openssl/crypto.h ../include/openssl/des.h
  nseq.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  nseq.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  nseq.o: ../include/openssl/err.h ../include/openssl/evp.h
-nseq.o: ../include/openssl/idea.h ../include/openssl/md2.h
-nseq.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-nseq.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-nseq.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-nseq.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-nseq.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-nseq.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
-nseq.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-nseq.o: ../include/openssl/sha.h ../include/openssl/stack.h
-nseq.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
+nseq.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+nseq.o: ../include/openssl/md2.h ../include/openssl/md5.h
+nseq.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+nseq.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+nseq.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+nseq.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
+nseq.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+nseq.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+nseq.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+nseq.o: ../include/openssl/stack.h ../include/openssl/x509.h
+nseq.o: ../include/openssl/x509_vfy.h apps.h
  openssl.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  openssl.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  openssl.o: ../include/openssl/buffer.h ../include/openssl/cast.h
-openssl.o: ../include/openssl/conf.h ../include/openssl/crypto.h
-openssl.o: ../include/openssl/des.h ../include/openssl/dh.h
-openssl.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
-openssl.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-openssl.o: ../include/openssl/err.h ../include/openssl/evp.h
-openssl.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-openssl.o: ../include/openssl/md2.h ../include/openssl/md5.h
-openssl.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
-openssl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-openssl.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-openssl.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
-openssl.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-openssl.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-openssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-openssl.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-openssl.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-openssl.o: ../include/openssl/stack.h ../include/openssl/tls1.h
-openssl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
-openssl.o: progs.h s_apps.h
+openssl.o: ../include/openssl/comp.h ../include/openssl/conf.h
+openssl.o: ../include/openssl/crypto.h ../include/openssl/des.h
+openssl.o: ../include/openssl/dh.h ../include/openssl/dsa.h
+openssl.o: ../include/openssl/e_os.h ../include/openssl/e_os.h
+openssl.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+openssl.o: ../include/openssl/evp.h ../include/openssl/idea.h
+openssl.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+openssl.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
+openssl.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+openssl.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+openssl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+openssl.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+openssl.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+openssl.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+openssl.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+openssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+openssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+openssl.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+openssl.o: ../include/openssl/x509_vfy.h apps.h progs.h s_apps.h
  passwd.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  passwd.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  passwd.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -471,16 +483,16 @@ passwd.o: ../include/openssl/crypto.h ../include/openssl/des.h
  passwd.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  passwd.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  passwd.o: ../include/openssl/err.h ../include/openssl/evp.h
-passwd.o: ../include/openssl/idea.h ../include/openssl/md2.h
-passwd.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-passwd.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-passwd.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
-passwd.o: ../include/openssl/rand.h ../include/openssl/rc2.h
-passwd.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-passwd.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-passwd.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-passwd.o: ../include/openssl/stack.h ../include/openssl/x509.h
-passwd.o: ../include/openssl/x509_vfy.h apps.h
+passwd.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+passwd.o: ../include/openssl/md2.h ../include/openssl/md5.h
+passwd.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+passwd.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+passwd.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+passwd.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+passwd.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+passwd.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+passwd.o: ../include/openssl/sha.h ../include/openssl/stack.h
+passwd.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
  pkcs12.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  pkcs12.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  pkcs12.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -488,17 +500,17 @@ pkcs12.o: ../include/openssl/crypto.h ../include/openssl/des.h
  pkcs12.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  pkcs12.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  pkcs12.o: ../include/openssl/err.h ../include/openssl/evp.h
-pkcs12.o: ../include/openssl/idea.h ../include/openssl/md2.h
-pkcs12.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-pkcs12.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-pkcs12.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-pkcs12.o: ../include/openssl/pem2.h ../include/openssl/pkcs12.h
-pkcs12.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
-pkcs12.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-pkcs12.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-pkcs12.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-pkcs12.o: ../include/openssl/stack.h ../include/openssl/x509.h
-pkcs12.o: ../include/openssl/x509_vfy.h apps.h
+pkcs12.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+pkcs12.o: ../include/openssl/md2.h ../include/openssl/md5.h
+pkcs12.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+pkcs12.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+pkcs12.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+pkcs12.o: ../include/openssl/pkcs12.h ../include/openssl/pkcs7.h
+pkcs12.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+pkcs12.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+pkcs12.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+pkcs12.o: ../include/openssl/sha.h ../include/openssl/stack.h
+pkcs12.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
  pkcs7.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  pkcs7.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  pkcs7.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -506,16 +518,17 @@ pkcs7.o: ../include/openssl/crypto.h ../include/openssl/des.h
  pkcs7.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  pkcs7.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  pkcs7.o: ../include/openssl/err.h ../include/openssl/evp.h
-pkcs7.o: ../include/openssl/idea.h ../include/openssl/md2.h
-pkcs7.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-pkcs7.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-pkcs7.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-pkcs7.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-pkcs7.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-pkcs7.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
-pkcs7.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-pkcs7.o: ../include/openssl/sha.h ../include/openssl/stack.h
-pkcs7.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
+pkcs7.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+pkcs7.o: ../include/openssl/md2.h ../include/openssl/md5.h
+pkcs7.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+pkcs7.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+pkcs7.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+pkcs7.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
+pkcs7.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+pkcs7.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+pkcs7.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+pkcs7.o: ../include/openssl/stack.h ../include/openssl/x509.h
+pkcs7.o: ../include/openssl/x509_vfy.h apps.h
  pkcs8.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  pkcs8.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  pkcs8.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -523,17 +536,17 @@ pkcs8.o: ../include/openssl/crypto.h ../include/openssl/des.h
  pkcs8.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  pkcs8.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  pkcs8.o: ../include/openssl/err.h ../include/openssl/evp.h
-pkcs8.o: ../include/openssl/idea.h ../include/openssl/md2.h
-pkcs8.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-pkcs8.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-pkcs8.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-pkcs8.o: ../include/openssl/pem2.h ../include/openssl/pkcs12.h
-pkcs8.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
-pkcs8.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-pkcs8.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-pkcs8.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-pkcs8.o: ../include/openssl/stack.h ../include/openssl/x509.h
-pkcs8.o: ../include/openssl/x509_vfy.h apps.h
+pkcs8.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+pkcs8.o: ../include/openssl/md2.h ../include/openssl/md5.h
+pkcs8.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+pkcs8.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+pkcs8.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+pkcs8.o: ../include/openssl/pkcs12.h ../include/openssl/pkcs7.h
+pkcs8.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+pkcs8.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+pkcs8.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+pkcs8.o: ../include/openssl/sha.h ../include/openssl/stack.h
+pkcs8.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
  rand.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  rand.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  rand.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -541,16 +554,16 @@ rand.o: ../include/openssl/crypto.h ../include/openssl/des.h
  rand.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  rand.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  rand.o: ../include/openssl/err.h ../include/openssl/evp.h
-rand.o: ../include/openssl/idea.h ../include/openssl/md2.h
-rand.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-rand.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-rand.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
-rand.o: ../include/openssl/rand.h ../include/openssl/rc2.h
-rand.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-rand.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-rand.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-rand.o: ../include/openssl/stack.h ../include/openssl/x509.h
-rand.o: ../include/openssl/x509_vfy.h apps.h
+rand.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+rand.o: ../include/openssl/md2.h ../include/openssl/md5.h
+rand.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+rand.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+rand.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+rand.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+rand.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+rand.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+rand.o: ../include/openssl/sha.h ../include/openssl/stack.h
+rand.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
  req.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  req.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  req.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -577,141 +590,145 @@ rsa.o: ../include/openssl/crypto.h ../include/openssl/des.h
  rsa.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  rsa.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  rsa.o: ../include/openssl/err.h ../include/openssl/evp.h
-rsa.o: ../include/openssl/idea.h ../include/openssl/md2.h
-rsa.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-rsa.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-rsa.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-rsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-rsa.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-rsa.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
-rsa.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-rsa.o: ../include/openssl/sha.h ../include/openssl/stack.h
-rsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
+rsa.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+rsa.o: ../include/openssl/md2.h ../include/openssl/md5.h
+rsa.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+rsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+rsa.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+rsa.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
+rsa.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+rsa.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+rsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+rsa.o: ../include/openssl/stack.h ../include/openssl/x509.h
+rsa.o: ../include/openssl/x509_vfy.h apps.h
  s_cb.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  s_cb.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  s_cb.o: ../include/openssl/buffer.h ../include/openssl/cast.h
-s_cb.o: ../include/openssl/crypto.h ../include/openssl/des.h
-s_cb.o: ../include/openssl/dh.h ../include/openssl/dsa.h
-s_cb.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-s_cb.o: ../include/openssl/err.h ../include/openssl/evp.h
-s_cb.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-s_cb.o: ../include/openssl/md2.h ../include/openssl/md5.h
-s_cb.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
-s_cb.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-s_cb.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-s_cb.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
-s_cb.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-s_cb.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-s_cb.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s_cb.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s_cb.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s_cb.o: ../include/openssl/stack.h ../include/openssl/tls1.h
-s_cb.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h s_apps.h
+s_cb.o: ../include/openssl/comp.h ../include/openssl/crypto.h
+s_cb.o: ../include/openssl/des.h ../include/openssl/dh.h
+s_cb.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
+s_cb.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+s_cb.o: ../include/openssl/evp.h ../include/openssl/idea.h
+s_cb.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+s_cb.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
+s_cb.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+s_cb.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+s_cb.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+s_cb.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+s_cb.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+s_cb.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+s_cb.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s_cb.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s_cb.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s_cb.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+s_cb.o: ../include/openssl/x509_vfy.h apps.h s_apps.h
  s_client.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  s_client.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  s_client.o: ../include/openssl/buffer.h ../include/openssl/cast.h
-s_client.o: ../include/openssl/crypto.h ../include/openssl/des.h
-s_client.o: ../include/openssl/dh.h ../include/openssl/dsa.h
-s_client.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-s_client.o: ../include/openssl/engine.h ../include/openssl/err.h
-s_client.o: ../include/openssl/evp.h ../include/openssl/idea.h
-s_client.o: ../include/openssl/lhash.h ../include/openssl/md2.h
-s_client.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-s_client.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s_client.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-s_client.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s_client.o: ../include/openssl/rand.h ../include/openssl/rc2.h
-s_client.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-s_client.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-s_client.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s_client.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s_client.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s_client.o: ../include/openssl/stack.h ../include/openssl/tls1.h
-s_client.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
-s_client.o: s_apps.h
+s_client.o: ../include/openssl/comp.h ../include/openssl/crypto.h
+s_client.o: ../include/openssl/des.h ../include/openssl/dh.h
+s_client.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
+s_client.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
+s_client.o: ../include/openssl/err.h ../include/openssl/evp.h
+s_client.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+s_client.o: ../include/openssl/md2.h ../include/openssl/md5.h
+s_client.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+s_client.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s_client.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s_client.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+s_client.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+s_client.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+s_client.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+s_client.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s_client.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s_client.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s_client.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+s_client.o: ../include/openssl/x509_vfy.h apps.h s_apps.h
  s_server.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  s_server.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  s_server.o: ../include/openssl/buffer.h ../include/openssl/cast.h
-s_server.o: ../include/openssl/crypto.h ../include/openssl/des.h
-s_server.o: ../include/openssl/dh.h ../include/openssl/dsa.h
-s_server.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-s_server.o: ../include/openssl/engine.h ../include/openssl/err.h
-s_server.o: ../include/openssl/evp.h ../include/openssl/idea.h
-s_server.o: ../include/openssl/lhash.h ../include/openssl/md2.h
-s_server.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-s_server.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s_server.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-s_server.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s_server.o: ../include/openssl/rand.h ../include/openssl/rc2.h
-s_server.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-s_server.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-s_server.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s_server.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s_server.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s_server.o: ../include/openssl/stack.h ../include/openssl/tls1.h
-s_server.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
-s_server.o: s_apps.h
+s_server.o: ../include/openssl/comp.h ../include/openssl/crypto.h
+s_server.o: ../include/openssl/des.h ../include/openssl/dh.h
+s_server.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
+s_server.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
+s_server.o: ../include/openssl/err.h ../include/openssl/evp.h
+s_server.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+s_server.o: ../include/openssl/md2.h ../include/openssl/md5.h
+s_server.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+s_server.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s_server.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s_server.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+s_server.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+s_server.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+s_server.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+s_server.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s_server.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s_server.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s_server.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+s_server.o: ../include/openssl/x509_vfy.h apps.h s_apps.h
  s_socket.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  s_socket.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  s_socket.o: ../include/openssl/buffer.h ../include/openssl/cast.h
-s_socket.o: ../include/openssl/crypto.h ../include/openssl/des.h
-s_socket.o: ../include/openssl/dh.h ../include/openssl/dsa.h
-s_socket.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-s_socket.o: ../include/openssl/evp.h ../include/openssl/idea.h
-s_socket.o: ../include/openssl/lhash.h ../include/openssl/md2.h
-s_socket.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-s_socket.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s_socket.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-s_socket.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s_socket.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-s_socket.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
-s_socket.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s_socket.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s_socket.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s_socket.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s_socket.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-s_socket.o: ../include/openssl/x509_vfy.h apps.h s_apps.h
+s_socket.o: ../include/openssl/comp.h ../include/openssl/crypto.h
+s_socket.o: ../include/openssl/des.h ../include/openssl/dh.h
+s_socket.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
+s_socket.o: ../include/openssl/e_os2.h ../include/openssl/evp.h
+s_socket.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+s_socket.o: ../include/openssl/md2.h ../include/openssl/md5.h
+s_socket.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+s_socket.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s_socket.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s_socket.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
+s_socket.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+s_socket.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+s_socket.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+s_socket.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s_socket.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s_socket.o: ../include/openssl/stack.h ../include/openssl/tls1.h
+s_socket.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
+s_socket.o: s_apps.h
  s_time.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  s_time.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  s_time.o: ../include/openssl/buffer.h ../include/openssl/cast.h
-s_time.o: ../include/openssl/crypto.h ../include/openssl/des.h
-s_time.o: ../include/openssl/dh.h ../include/openssl/dsa.h
-s_time.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-s_time.o: ../include/openssl/err.h ../include/openssl/evp.h
-s_time.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-s_time.o: ../include/openssl/md2.h ../include/openssl/md5.h
-s_time.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
-s_time.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-s_time.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-s_time.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
-s_time.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-s_time.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-s_time.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s_time.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s_time.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s_time.o: ../include/openssl/stack.h ../include/openssl/tls1.h
-s_time.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
-s_time.o: s_apps.h
+s_time.o: ../include/openssl/comp.h ../include/openssl/crypto.h
+s_time.o: ../include/openssl/des.h ../include/openssl/dh.h
+s_time.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
+s_time.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+s_time.o: ../include/openssl/evp.h ../include/openssl/idea.h
+s_time.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+s_time.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
+s_time.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+s_time.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+s_time.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+s_time.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+s_time.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+s_time.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+s_time.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s_time.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s_time.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s_time.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+s_time.o: ../include/openssl/x509_vfy.h apps.h s_apps.h
  sess_id.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  sess_id.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  sess_id.o: ../include/openssl/buffer.h ../include/openssl/cast.h
-sess_id.o: ../include/openssl/crypto.h ../include/openssl/des.h
-sess_id.o: ../include/openssl/dh.h ../include/openssl/dsa.h
-sess_id.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-sess_id.o: ../include/openssl/err.h ../include/openssl/evp.h
-sess_id.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-sess_id.o: ../include/openssl/md2.h ../include/openssl/md5.h
-sess_id.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
-sess_id.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-sess_id.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-sess_id.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
-sess_id.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-sess_id.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-sess_id.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-sess_id.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-sess_id.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-sess_id.o: ../include/openssl/stack.h ../include/openssl/tls1.h
-sess_id.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
+sess_id.o: ../include/openssl/comp.h ../include/openssl/crypto.h
+sess_id.o: ../include/openssl/des.h ../include/openssl/dh.h
+sess_id.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
+sess_id.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+sess_id.o: ../include/openssl/evp.h ../include/openssl/idea.h
+sess_id.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+sess_id.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
+sess_id.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+sess_id.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+sess_id.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+sess_id.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+sess_id.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+sess_id.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+sess_id.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+sess_id.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+sess_id.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+sess_id.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+sess_id.o: ../include/openssl/x509_vfy.h apps.h
  smime.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  smime.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  smime.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -719,16 +736,17 @@ smime.o: ../include/openssl/crypto.h ../include/openssl/des.h
  smime.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  smime.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  smime.o: ../include/openssl/err.h ../include/openssl/evp.h
-smime.o: ../include/openssl/idea.h ../include/openssl/md2.h
-smime.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-smime.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-smime.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-smime.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-smime.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-smime.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
-smime.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-smime.o: ../include/openssl/sha.h ../include/openssl/stack.h
-smime.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
+smime.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+smime.o: ../include/openssl/md2.h ../include/openssl/md5.h
+smime.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+smime.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+smime.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+smime.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
+smime.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+smime.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+smime.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+smime.o: ../include/openssl/stack.h ../include/openssl/x509.h
+smime.o: ../include/openssl/x509_vfy.h apps.h
  speed.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  speed.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  speed.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -737,16 +755,17 @@ speed.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  speed.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  speed.o: ../include/openssl/engine.h ../include/openssl/err.h
  speed.o: ../include/openssl/evp.h ../include/openssl/hmac.h
-speed.o: ../include/openssl/idea.h ../include/openssl/md2.h
-speed.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-speed.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-speed.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
-speed.o: ../include/openssl/rand.h ../include/openssl/rc2.h
-speed.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-speed.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-speed.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-speed.o: ../include/openssl/stack.h ../include/openssl/x509.h
-speed.o: ../include/openssl/x509_vfy.h ./testdsa.h ./testrsa.h apps.h
+speed.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+speed.o: ../include/openssl/md2.h ../include/openssl/md5.h
+speed.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+speed.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+speed.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+speed.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+speed.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+speed.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+speed.o: ../include/openssl/sha.h ../include/openssl/stack.h
+speed.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ./testdsa.h
+speed.o: ./testrsa.h apps.h
  spkac.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  spkac.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  spkac.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -792,15 +811,15 @@ version.o: ../include/openssl/crypto.h ../include/openssl/des.h
  version.o: ../include/openssl/dh.h ../include/openssl/dsa.h
  version.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
  version.o: ../include/openssl/evp.h ../include/openssl/idea.h
-version.o: ../include/openssl/md2.h ../include/openssl/md5.h
-version.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
-version.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-version.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
-version.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-version.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-version.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-version.o: ../include/openssl/stack.h ../include/openssl/x509.h
-version.o: ../include/openssl/x509_vfy.h apps.h
+version.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+version.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
+version.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+version.o: ../include/openssl/opensslv.h ../include/openssl/pkcs7.h
+version.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+version.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+version.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+version.o: ../include/openssl/sha.h ../include/openssl/stack.h
+version.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
  x509.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  x509.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  x509.o: ../include/openssl/buffer.h ../include/openssl/cast.h
diff --git a/apps/genrsa.c b/apps/genrsa.c

index 4cbccf8456e003bc3a7a89b070ce4f07216213e1..5cf47e69215c9a6f302b2df64ea104fe1b75f2db 100644 (file)
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -114,7 +114,7 @@ int MAIN(int argc, char **argv)
                         }
                 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)
                         {
diff --git a/apps/x509.c b/apps/x509.c

index 88ef1e064d5a071afe65b9e816828b0d161e81b3..cdfc24a5c7a6a2c442c030b2513a70a42192df55 100644 (file)
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -97,6 +97,7 @@ static char *x509_usage[]={
  " -hash           - print hash value\n",
  " -subject        - print subject DN\n",
  " -issuer         - print issuer DN\n",
+" -email          - print email address(es)\n",
  " -startdate      - notBefore field\n",
  " -enddate        - notAfter field\n",
  " -purpose        - print out certificate purposes\n",
@@ -161,7 +162,7 @@ int MAIN(int argc, char **argv)
         char *CAkeyfile=NULL,*CAserial=NULL;
         char *alias=NULL;
         int text=0,serial=0,hash=0,subject=0,issuer=0,startdate=0,enddate=0;
-       int noout=0,sign_flag=0,CA_flag=0,CA_createserial=0;
+       int noout=0,sign_flag=0,CA_flag=0,CA_createserial=0,email=0;
         int trustout=0,clrtrust=0,clrreject=0,aliasout=0,clrext=0;
         int C=0;
         int x509req=0,days=DEF_DAYS,modulus=0,pubkey=0;
@@ -327,6 +328,8 @@ int MAIN(int argc, char **argv)
                         }
                 else if (strcmp(*argv,"-C") == 0)
                         C= ++num;
+               else if (strcmp(*argv,"-email") == 0)
+                       email= ++num;
                 else if (strcmp(*argv,"-serial") == 0)
                         serial= ++num;
                 else if (strcmp(*argv,"-modulus") == 0)
@@ -617,6 +620,15 @@ bad:
                                 i2a_ASN1_INTEGER(STDout,x->cert_info->serialNumber);
                                 BIO_printf(STDout,"\n");
                                 }
+                       else if (email == i) 
+                               {
+                               int j;
+                               STACK *emlst;
+                               emlst = X509_get1_email(x);
+                               for(j = 0; j < sk_num(emlst); j++)
+                                       BIO_printf(STDout, "%s\n", sk_value(emlst, j));
+                               X509_email_free(emlst);
+                               }
                         else if (aliasout == i)
                                 {
                                 unsigned char *alstr;
diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl

index 2fa2f0d2f9b1b6c9849a9c2ee46308c07a0a5e58..1693004cc95628ed877cbb8bb481b463bac611ad 100644 (file)
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -155,21 +155,22 @@ dclean:
  
  # DO NOT DELETE THIS LINE -- make depend depends on it.
  
-cpt_err.o: ../include/openssl/crypto.h ../include/openssl/err.h
+cpt_err.o: ../include/openssl/bio.h ../include/openssl/crypto.h
+cpt_err.o: ../include/openssl/err.h ../include/openssl/lhash.h
  cpt_err.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
  cpt_err.o: ../include/openssl/stack.h
  cryptlib.o: ../include/openssl/bio.h ../include/openssl/buffer.h
  cryptlib.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
  cryptlib.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-cryptlib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-cryptlib.o: ../include/openssl/safestack.h ../include/openssl/stack.h
-cryptlib.o: cryptlib.h
+cryptlib.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
+cryptlib.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
+cryptlib.o: ../include/openssl/stack.h cryptlib.h
  cversion.o: ../include/openssl/bio.h ../include/openssl/buffer.h
  cversion.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
  cversion.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-cversion.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-cversion.o: ../include/openssl/safestack.h ../include/openssl/stack.h
-cversion.o: buildinf.h cryptlib.h
+cversion.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
+cversion.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
+cversion.o: ../include/openssl/stack.h buildinf.h cryptlib.h
  ex_data.o: ../include/openssl/bio.h ../include/openssl/buffer.h
  ex_data.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
  ex_data.o: ../include/openssl/e_os2.h ../include/openssl/err.h
@@ -179,8 +180,9 @@ ex_data.o: ../include/openssl/stack.h cryptlib.h
  mem.o: ../include/openssl/bio.h ../include/openssl/buffer.h
  mem.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
  mem.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-mem.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-mem.o: ../include/openssl/safestack.h ../include/openssl/stack.h cryptlib.h
+mem.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
+mem.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
+mem.o: ../include/openssl/stack.h cryptlib.h
  mem_dbg.o: ../include/openssl/bio.h ../include/openssl/buffer.h
  mem_dbg.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
  mem_dbg.o: ../include/openssl/e_os2.h ../include/openssl/err.h
@@ -190,6 +192,6 @@ mem_dbg.o: ../include/openssl/stack.h cryptlib.h
  tmdiff.o: ../include/openssl/bio.h ../include/openssl/buffer.h
  tmdiff.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
  tmdiff.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-tmdiff.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-tmdiff.o: ../include/openssl/safestack.h ../include/openssl/stack.h
-tmdiff.o: ../include/openssl/tmdiff.h cryptlib.h
+tmdiff.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
+tmdiff.o: ../include/openssl/opensslv.h ../include/openssl/safestack.h
+tmdiff.o: ../include/openssl/stack.h ../include/openssl/tmdiff.h cryptlib.h
diff --git a/crypto/asn1/Makefile.ssl b/crypto/asn1/Makefile.ssl

index 4f349679cadf322572a86c248591b05a8fa22e5a..05ff57e3b34ebc2d467cdeb9440aadc51871b32e 100644 (file)
--- a/crypto/asn1/Makefile.ssl
+++ b/crypto/asn1/Makefile.ssl
@@ -119,35 +119,37 @@ a_bitstr.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_bitstr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_bitstr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  a_bitstr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_bitstr.o: ../../include/openssl/opensslconf.h
+a_bitstr.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
  a_bitstr.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  a_bitstr.o: ../../include/openssl/stack.h ../cryptlib.h
  a_bmp.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_bmp.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_bmp.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  a_bmp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_bmp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_bmp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_bmp.o: ../cryptlib.h
+a_bmp.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+a_bmp.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_bmp.o: ../../include/openssl/stack.h ../cryptlib.h
  a_bool.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_bool.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_bool.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  a_bool.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_bool.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_bool.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_bool.o: ../cryptlib.h
+a_bool.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+a_bool.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_bool.o: ../../include/openssl/stack.h ../cryptlib.h
  a_bytes.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  a_bytes.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  a_bytes.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  a_bytes.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-a_bytes.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-a_bytes.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-a_bytes.o: ../../include/openssl/stack.h ../cryptlib.h
+a_bytes.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+a_bytes.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+a_bytes.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+a_bytes.o: ../cryptlib.h
  a_d2i_fp.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  a_d2i_fp.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  a_d2i_fp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  a_d2i_fp.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-a_d2i_fp.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+a_d2i_fp.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+a_d2i_fp.o: ../../include/openssl/opensslconf.h
  a_d2i_fp.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  a_d2i_fp.o: ../../include/openssl/stack.h ../cryptlib.h
  a_digest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -157,9 +159,10 @@ a_digest.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  a_digest.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  a_digest.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  a_digest.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-a_digest.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-a_digest.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-a_digest.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+a_digest.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+a_digest.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+a_digest.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+a_digest.o: ../../include/openssl/opensslconf.h
  a_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  a_digest.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
  a_digest.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
@@ -171,93 +174,98 @@ a_dup.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  a_dup.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  a_dup.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  a_dup.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-a_dup.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-a_dup.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-a_dup.o: ../../include/openssl/stack.h ../cryptlib.h
+a_dup.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+a_dup.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+a_dup.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+a_dup.o: ../cryptlib.h
  a_enum.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_enum.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_enum.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  a_enum.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_enum.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_enum.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_enum.o: ../cryptlib.h
+a_enum.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+a_enum.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_enum.o: ../../include/openssl/stack.h ../cryptlib.h
  a_gentm.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_gentm.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_gentm.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  a_gentm.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_gentm.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_gentm.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_gentm.o: ../cryptlib.h
+a_gentm.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+a_gentm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_gentm.o: ../../include/openssl/stack.h ../cryptlib.h
  a_hdr.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  a_hdr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  a_hdr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  a_hdr.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-a_hdr.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-a_hdr.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-a_hdr.o: ../../include/openssl/stack.h ../cryptlib.h
+a_hdr.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+a_hdr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+a_hdr.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+a_hdr.o: ../cryptlib.h
  a_i2d_fp.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  a_i2d_fp.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  a_i2d_fp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  a_i2d_fp.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-a_i2d_fp.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+a_i2d_fp.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+a_i2d_fp.o: ../../include/openssl/opensslconf.h
  a_i2d_fp.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  a_i2d_fp.o: ../../include/openssl/stack.h ../cryptlib.h
  a_int.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_int.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_int.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  a_int.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_int.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_int.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_int.o: ../cryptlib.h
+a_int.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+a_int.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_int.o: ../../include/openssl/stack.h ../cryptlib.h
  a_mbstr.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_mbstr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_mbstr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  a_mbstr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_mbstr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_mbstr.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_mbstr.o: ../cryptlib.h
+a_mbstr.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+a_mbstr.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_mbstr.o: ../../include/openssl/stack.h ../cryptlib.h
  a_meth.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_meth.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_meth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  a_meth.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_meth.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_meth.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_meth.o: ../cryptlib.h
+a_meth.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+a_meth.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_meth.o: ../../include/openssl/stack.h ../cryptlib.h
  a_null.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_null.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_null.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  a_null.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_null.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_null.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_null.o: ../cryptlib.h
+a_null.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+a_null.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_null.o: ../../include/openssl/stack.h ../cryptlib.h
  a_object.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_object.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_object.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  a_object.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_object.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+a_object.o: ../../include/openssl/lhash.h ../../include/openssl/objects.h
+a_object.o: ../../include/openssl/opensslconf.h
  a_object.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  a_object.o: ../../include/openssl/stack.h ../cryptlib.h
  a_octet.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_octet.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_octet.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  a_octet.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_octet.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_octet.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_octet.o: ../cryptlib.h
+a_octet.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+a_octet.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_octet.o: ../../include/openssl/stack.h ../cryptlib.h
  a_print.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_print.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_print.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  a_print.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_print.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_print.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_print.o: ../cryptlib.h
+a_print.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+a_print.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_print.o: ../../include/openssl/stack.h ../cryptlib.h
  a_set.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  a_set.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  a_set.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  a_set.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-a_set.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-a_set.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-a_set.o: ../../include/openssl/stack.h ../cryptlib.h
+a_set.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+a_set.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+a_set.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+a_set.o: ../cryptlib.h
  a_sign.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_sign.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  a_sign.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -265,51 +273,53 @@ a_sign.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  a_sign.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  a_sign.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  a_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-a_sign.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-a_sign.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-a_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-a_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-a_sign.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-a_sign.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-a_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-a_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-a_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-a_sign.o: ../cryptlib.h
+a_sign.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+a_sign.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+a_sign.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+a_sign.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+a_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+a_sign.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+a_sign.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+a_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+a_sign.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+a_sign.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  a_strnid.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_strnid.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_strnid.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  a_strnid.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_strnid.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+a_strnid.o: ../../include/openssl/lhash.h ../../include/openssl/objects.h
+a_strnid.o: ../../include/openssl/opensslconf.h
  a_strnid.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  a_strnid.o: ../../include/openssl/stack.h ../cryptlib.h
  a_time.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_time.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_time.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  a_time.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_time.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_time.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_time.o: ../cryptlib.h
+a_time.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+a_time.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_time.o: ../../include/openssl/stack.h ../cryptlib.h
  a_type.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  a_type.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  a_type.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  a_type.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-a_type.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-a_type.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-a_type.o: ../../include/openssl/stack.h ../cryptlib.h
+a_type.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+a_type.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+a_type.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+a_type.o: ../cryptlib.h
  a_utctm.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_utctm.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_utctm.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  a_utctm.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_utctm.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_utctm.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_utctm.o: ../cryptlib.h
+a_utctm.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+a_utctm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_utctm.o: ../../include/openssl/stack.h ../cryptlib.h
  a_utf8.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_utf8.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_utf8.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  a_utf8.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_utf8.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_utf8.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_utf8.o: ../cryptlib.h
+a_utf8.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+a_utf8.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_utf8.o: ../../include/openssl/stack.h ../cryptlib.h
  a_verify.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_verify.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  a_verify.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -317,9 +327,10 @@ a_verify.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  a_verify.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  a_verify.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  a_verify.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-a_verify.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-a_verify.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-a_verify.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+a_verify.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+a_verify.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+a_verify.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+a_verify.o: ../../include/openssl/opensslconf.h
  a_verify.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  a_verify.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
  a_verify.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
@@ -331,31 +342,36 @@ a_vis.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  a_vis.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  a_vis.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  a_vis.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-a_vis.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-a_vis.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-a_vis.o: ../cryptlib.h
-asn1_err.o: ../../include/openssl/asn1.h ../../include/openssl/bn.h
-asn1_err.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-asn1_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+a_vis.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+a_vis.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+a_vis.o: ../../include/openssl/stack.h ../cryptlib.h
+asn1_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+asn1_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
+asn1_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+asn1_err.o: ../../include/openssl/opensslconf.h
+asn1_err.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+asn1_err.o: ../../include/openssl/stack.h
  asn1_lib.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  asn1_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  asn1_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  asn1_lib.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-asn1_lib.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+asn1_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+asn1_lib.o: ../../include/openssl/opensslconf.h
  asn1_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  asn1_lib.o: ../../include/openssl/stack.h ../cryptlib.h
  asn1_par.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  asn1_par.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  asn1_par.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  asn1_par.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-asn1_par.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+asn1_par.o: ../../include/openssl/lhash.h ../../include/openssl/objects.h
+asn1_par.o: ../../include/openssl/opensslconf.h
  asn1_par.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  asn1_par.o: ../../include/openssl/stack.h ../cryptlib.h
  asn_pack.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  asn_pack.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  asn_pack.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  asn_pack.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-asn_pack.o: ../../include/openssl/opensslconf.h
+asn_pack.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
  asn_pack.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  asn_pack.o: ../../include/openssl/stack.h ../cryptlib.h
  d2i_dhp.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
@@ -363,16 +379,17 @@ d2i_dhp.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  d2i_dhp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  d2i_dhp.o: ../../include/openssl/dh.h ../../include/openssl/e_os.h
  d2i_dhp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-d2i_dhp.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-d2i_dhp.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-d2i_dhp.o: ../../include/openssl/stack.h ../cryptlib.h
+d2i_dhp.o: ../../include/openssl/lhash.h ../../include/openssl/objects.h
+d2i_dhp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+d2i_dhp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+d2i_dhp.o: ../cryptlib.h
  d2i_dsap.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  d2i_dsap.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  d2i_dsap.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  d2i_dsap.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  d2i_dsap.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-d2i_dsap.o: ../../include/openssl/err.h ../../include/openssl/objects.h
-d2i_dsap.o: ../../include/openssl/opensslconf.h
+d2i_dsap.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+d2i_dsap.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  d2i_dsap.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  d2i_dsap.o: ../../include/openssl/stack.h ../cryptlib.h
  d2i_pr.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -382,14 +399,15 @@ d2i_pr.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  d2i_pr.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  d2i_pr.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  d2i_pr.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-d2i_pr.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-d2i_pr.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-d2i_pr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-d2i_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-d2i_pr.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-d2i_pr.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-d2i_pr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-d2i_pr.o: ../../include/openssl/stack.h ../cryptlib.h
+d2i_pr.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+d2i_pr.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+d2i_pr.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+d2i_pr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+d2i_pr.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+d2i_pr.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+d2i_pr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+d2i_pr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+d2i_pr.o: ../cryptlib.h
  d2i_pu.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  d2i_pu.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  d2i_pu.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -397,20 +415,21 @@ d2i_pu.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  d2i_pu.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  d2i_pu.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  d2i_pu.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-d2i_pu.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-d2i_pu.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-d2i_pu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-d2i_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-d2i_pu.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-d2i_pu.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-d2i_pu.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-d2i_pu.o: ../../include/openssl/stack.h ../cryptlib.h
+d2i_pu.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+d2i_pu.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+d2i_pu.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+d2i_pu.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+d2i_pu.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+d2i_pu.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+d2i_pu.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+d2i_pu.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+d2i_pu.o: ../cryptlib.h
  d2i_r_pr.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  d2i_r_pr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  d2i_r_pr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  d2i_r_pr.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-d2i_r_pr.o: ../../include/openssl/err.h ../../include/openssl/objects.h
-d2i_r_pr.o: ../../include/openssl/opensslconf.h
+d2i_r_pr.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+d2i_r_pr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  d2i_r_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
  d2i_r_pr.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
  d2i_r_pr.o: ../cryptlib.h
@@ -418,8 +437,8 @@ d2i_r_pu.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  d2i_r_pu.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  d2i_r_pu.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  d2i_r_pu.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-d2i_r_pu.o: ../../include/openssl/err.h ../../include/openssl/objects.h
-d2i_r_pu.o: ../../include/openssl/opensslconf.h
+d2i_r_pu.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+d2i_r_pu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  d2i_r_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
  d2i_r_pu.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
  d2i_r_pu.o: ../cryptlib.h
@@ -428,8 +447,8 @@ d2i_s_pr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  d2i_s_pr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  d2i_s_pr.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  d2i_s_pr.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-d2i_s_pr.o: ../../include/openssl/err.h ../../include/openssl/objects.h
-d2i_s_pr.o: ../../include/openssl/opensslconf.h
+d2i_s_pr.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+d2i_s_pr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  d2i_s_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  d2i_s_pr.o: ../../include/openssl/stack.h ../cryptlib.h
  d2i_s_pu.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
@@ -437,36 +456,37 @@ d2i_s_pu.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  d2i_s_pu.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  d2i_s_pu.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  d2i_s_pu.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-d2i_s_pu.o: ../../include/openssl/err.h ../../include/openssl/objects.h
-d2i_s_pu.o: ../../include/openssl/opensslconf.h
+d2i_s_pu.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+d2i_s_pu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  d2i_s_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  d2i_s_pu.o: ../../include/openssl/stack.h ../cryptlib.h
  evp_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  evp_asn1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  evp_asn1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  evp_asn1.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-evp_asn1.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+evp_asn1.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+evp_asn1.o: ../../include/openssl/opensslconf.h
  evp_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  evp_asn1.o: ../../include/openssl/stack.h ../cryptlib.h
  f_enum.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  f_enum.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  f_enum.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  f_enum.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-f_enum.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-f_enum.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-f_enum.o: ../cryptlib.h
+f_enum.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+f_enum.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+f_enum.o: ../../include/openssl/stack.h ../cryptlib.h
  f_int.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  f_int.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  f_int.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  f_int.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-f_int.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-f_int.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-f_int.o: ../cryptlib.h
+f_int.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+f_int.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+f_int.o: ../../include/openssl/stack.h ../cryptlib.h
  f_string.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  f_string.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  f_string.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  f_string.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-f_string.o: ../../include/openssl/opensslconf.h
+f_string.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
  f_string.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  f_string.o: ../../include/openssl/stack.h ../cryptlib.h
  i2d_dhp.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
@@ -474,15 +494,16 @@ i2d_dhp.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  i2d_dhp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  i2d_dhp.o: ../../include/openssl/dh.h ../../include/openssl/e_os.h
  i2d_dhp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-i2d_dhp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-i2d_dhp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-i2d_dhp.o: ../cryptlib.h
+i2d_dhp.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+i2d_dhp.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+i2d_dhp.o: ../../include/openssl/stack.h ../cryptlib.h
  i2d_dsap.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  i2d_dsap.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  i2d_dsap.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  i2d_dsap.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  i2d_dsap.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-i2d_dsap.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+i2d_dsap.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+i2d_dsap.o: ../../include/openssl/opensslconf.h
  i2d_dsap.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  i2d_dsap.o: ../../include/openssl/stack.h ../cryptlib.h
  i2d_pr.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
@@ -492,14 +513,15 @@ i2d_pr.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  i2d_pr.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  i2d_pr.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  i2d_pr.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-i2d_pr.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-i2d_pr.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-i2d_pr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-i2d_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-i2d_pr.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-i2d_pr.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-i2d_pr.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-i2d_pr.o: ../../include/openssl/stack.h ../cryptlib.h
+i2d_pr.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+i2d_pr.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+i2d_pr.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+i2d_pr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+i2d_pr.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+i2d_pr.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+i2d_pr.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+i2d_pr.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+i2d_pr.o: ../cryptlib.h
  i2d_pu.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  i2d_pu.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  i2d_pu.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -507,20 +529,21 @@ i2d_pu.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  i2d_pu.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  i2d_pu.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  i2d_pu.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-i2d_pu.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-i2d_pu.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-i2d_pu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-i2d_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-i2d_pu.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-i2d_pu.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-i2d_pu.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-i2d_pu.o: ../../include/openssl/stack.h ../cryptlib.h
+i2d_pu.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+i2d_pu.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+i2d_pu.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+i2d_pu.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+i2d_pu.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+i2d_pu.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+i2d_pu.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+i2d_pu.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+i2d_pu.o: ../cryptlib.h
  i2d_r_pr.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  i2d_r_pr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  i2d_r_pr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  i2d_r_pr.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-i2d_r_pr.o: ../../include/openssl/err.h ../../include/openssl/objects.h
-i2d_r_pr.o: ../../include/openssl/opensslconf.h
+i2d_r_pr.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+i2d_r_pr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  i2d_r_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
  i2d_r_pr.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
  i2d_r_pr.o: ../cryptlib.h
@@ -528,8 +551,8 @@ i2d_r_pu.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  i2d_r_pu.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  i2d_r_pu.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  i2d_r_pu.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-i2d_r_pu.o: ../../include/openssl/err.h ../../include/openssl/objects.h
-i2d_r_pu.o: ../../include/openssl/opensslconf.h
+i2d_r_pu.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+i2d_r_pu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  i2d_r_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
  i2d_r_pu.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
  i2d_r_pu.o: ../cryptlib.h
@@ -538,8 +561,8 @@ i2d_s_pr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  i2d_s_pr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  i2d_s_pr.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  i2d_s_pr.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-i2d_s_pr.o: ../../include/openssl/err.h ../../include/openssl/objects.h
-i2d_s_pr.o: ../../include/openssl/opensslconf.h
+i2d_s_pr.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+i2d_s_pr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  i2d_s_pr.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  i2d_s_pr.o: ../../include/openssl/stack.h ../cryptlib.h
  i2d_s_pu.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
@@ -547,8 +570,8 @@ i2d_s_pu.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  i2d_s_pu.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  i2d_s_pu.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  i2d_s_pu.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-i2d_s_pu.o: ../../include/openssl/err.h ../../include/openssl/objects.h
-i2d_s_pu.o: ../../include/openssl/opensslconf.h
+i2d_s_pu.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+i2d_s_pu.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  i2d_s_pu.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  i2d_s_pu.o: ../../include/openssl/stack.h ../cryptlib.h
  n_pkey.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
@@ -559,22 +582,24 @@ n_pkey.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  n_pkey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  n_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  n_pkey.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-n_pkey.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-n_pkey.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-n_pkey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-n_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-n_pkey.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-n_pkey.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-n_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-n_pkey.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-n_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+n_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+n_pkey.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+n_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+n_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+n_pkey.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+n_pkey.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+n_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+n_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+n_pkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+n_pkey.o: ../cryptlib.h
  nsseq.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  nsseq.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-nsseq.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
-nsseq.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-nsseq.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-nsseq.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-nsseq.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+nsseq.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+nsseq.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
+nsseq.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+nsseq.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+nsseq.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+nsseq.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
  nsseq.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
  nsseq.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
  nsseq.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
@@ -592,16 +617,16 @@ p5_pbe.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  p5_pbe.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  p5_pbe.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p5_pbe.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-p5_pbe.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-p5_pbe.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-p5_pbe.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-p5_pbe.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
-p5_pbe.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p5_pbe.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-p5_pbe.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-p5_pbe.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-p5_pbe.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p5_pbe.o: ../cryptlib.h
+p5_pbe.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+p5_pbe.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+p5_pbe.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+p5_pbe.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+p5_pbe.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+p5_pbe.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+p5_pbe.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+p5_pbe.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+p5_pbe.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+p5_pbe.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  p5_pbev2.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  p5_pbev2.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  p5_pbev2.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -610,9 +635,9 @@ p5_pbev2.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  p5_pbev2.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  p5_pbev2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p5_pbev2.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-p5_pbev2.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-p5_pbev2.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-p5_pbev2.o: ../../include/openssl/opensslconf.h
+p5_pbev2.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+p5_pbev2.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+p5_pbev2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  p5_pbev2.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  p5_pbev2.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
  p5_pbev2.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
@@ -628,15 +653,16 @@ p7_dgst.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  p7_dgst.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  p7_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p7_dgst.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-p7_dgst.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-p7_dgst.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-p7_dgst.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-p7_dgst.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-p7_dgst.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p7_dgst.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p7_dgst.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p7_dgst.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-p7_dgst.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+p7_dgst.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+p7_dgst.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+p7_dgst.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+p7_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+p7_dgst.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+p7_dgst.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p7_dgst.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p7_dgst.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p7_dgst.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+p7_dgst.o: ../cryptlib.h
  p7_enc.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  p7_enc.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  p7_enc.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -645,15 +671,16 @@ p7_enc.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  p7_enc.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  p7_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p7_enc.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-p7_enc.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-p7_enc.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-p7_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-p7_enc.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-p7_enc.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p7_enc.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p7_enc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p7_enc.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-p7_enc.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+p7_enc.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+p7_enc.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+p7_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+p7_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+p7_enc.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+p7_enc.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p7_enc.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p7_enc.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p7_enc.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+p7_enc.o: ../cryptlib.h
  p7_enc_c.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  p7_enc_c.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  p7_enc_c.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -662,9 +689,9 @@ p7_enc_c.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  p7_enc_c.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  p7_enc_c.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p7_enc_c.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-p7_enc_c.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-p7_enc_c.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-p7_enc_c.o: ../../include/openssl/opensslconf.h
+p7_enc_c.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+p7_enc_c.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+p7_enc_c.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  p7_enc_c.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  p7_enc_c.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
  p7_enc_c.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
@@ -680,15 +707,16 @@ p7_evp.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  p7_evp.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  p7_evp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p7_evp.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-p7_evp.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-p7_evp.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-p7_evp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-p7_evp.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-p7_evp.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p7_evp.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p7_evp.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p7_evp.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-p7_evp.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+p7_evp.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+p7_evp.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+p7_evp.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+p7_evp.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+p7_evp.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+p7_evp.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p7_evp.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p7_evp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p7_evp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+p7_evp.o: ../cryptlib.h
  p7_i_s.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  p7_i_s.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  p7_i_s.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -697,15 +725,16 @@ p7_i_s.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  p7_i_s.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  p7_i_s.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p7_i_s.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-p7_i_s.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-p7_i_s.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-p7_i_s.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-p7_i_s.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-p7_i_s.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p7_i_s.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p7_i_s.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p7_i_s.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-p7_i_s.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+p7_i_s.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+p7_i_s.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+p7_i_s.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+p7_i_s.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+p7_i_s.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+p7_i_s.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p7_i_s.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p7_i_s.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p7_i_s.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+p7_i_s.o: ../cryptlib.h
  p7_lib.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  p7_lib.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  p7_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -714,15 +743,16 @@ p7_lib.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  p7_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  p7_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p7_lib.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-p7_lib.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-p7_lib.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-p7_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-p7_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-p7_lib.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p7_lib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p7_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p7_lib.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-p7_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+p7_lib.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+p7_lib.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+p7_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+p7_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+p7_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+p7_lib.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p7_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p7_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p7_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+p7_lib.o: ../cryptlib.h
  p7_recip.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  p7_recip.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  p7_recip.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -731,9 +761,9 @@ p7_recip.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  p7_recip.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  p7_recip.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p7_recip.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-p7_recip.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-p7_recip.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-p7_recip.o: ../../include/openssl/opensslconf.h
+p7_recip.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+p7_recip.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+p7_recip.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  p7_recip.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  p7_recip.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
  p7_recip.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
@@ -749,15 +779,16 @@ p7_s_e.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  p7_s_e.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  p7_s_e.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p7_s_e.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-p7_s_e.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-p7_s_e.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-p7_s_e.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-p7_s_e.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-p7_s_e.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p7_s_e.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p7_s_e.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p7_s_e.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-p7_s_e.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+p7_s_e.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+p7_s_e.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+p7_s_e.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+p7_s_e.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+p7_s_e.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+p7_s_e.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p7_s_e.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p7_s_e.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p7_s_e.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+p7_s_e.o: ../cryptlib.h
  p7_signd.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  p7_signd.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  p7_signd.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -766,9 +797,9 @@ p7_signd.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  p7_signd.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  p7_signd.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p7_signd.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-p7_signd.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-p7_signd.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-p7_signd.o: ../../include/openssl/opensslconf.h
+p7_signd.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+p7_signd.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+p7_signd.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  p7_signd.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  p7_signd.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
  p7_signd.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
@@ -784,9 +815,9 @@ p7_signi.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  p7_signi.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  p7_signi.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p7_signi.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-p7_signi.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-p7_signi.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-p7_signi.o: ../../include/openssl/opensslconf.h
+p7_signi.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+p7_signi.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+p7_signi.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  p7_signi.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  p7_signi.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
  p7_signi.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
@@ -802,15 +833,16 @@ p8_pkey.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  p8_pkey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  p8_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p8_pkey.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-p8_pkey.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-p8_pkey.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-p8_pkey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-p8_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-p8_pkey.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p8_pkey.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p8_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p8_pkey.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-p8_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+p8_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+p8_pkey.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+p8_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+p8_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+p8_pkey.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+p8_pkey.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p8_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p8_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p8_pkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+p8_pkey.o: ../cryptlib.h
  t_bitst.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  t_bitst.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  t_bitst.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -853,10 +885,10 @@ t_pkey.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  t_pkey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  t_pkey.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  t_pkey.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-t_pkey.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-t_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
-t_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-t_pkey.o: ../cryptlib.h
+t_pkey.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+t_pkey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+t_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+t_pkey.o: ../../include/openssl/stack.h ../cryptlib.h
  t_req.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  t_req.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  t_req.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -884,15 +916,16 @@ t_spki.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  t_spki.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  t_spki.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  t_spki.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-t_spki.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-t_spki.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-t_spki.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-t_spki.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-t_spki.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-t_spki.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-t_spki.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-t_spki.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-t_spki.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+t_spki.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+t_spki.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+t_spki.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+t_spki.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+t_spki.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+t_spki.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+t_spki.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+t_spki.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+t_spki.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+t_spki.o: ../cryptlib.h
  t_x509.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  t_x509.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  t_x509.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -920,15 +953,16 @@ t_x509a.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  t_x509a.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  t_x509a.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  t_x509a.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-t_x509a.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-t_x509a.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-t_x509a.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-t_x509a.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-t_x509a.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-t_x509a.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-t_x509a.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-t_x509a.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-t_x509a.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+t_x509a.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+t_x509a.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+t_x509a.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+t_x509a.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+t_x509a.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+t_x509a.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+t_x509a.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+t_x509a.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+t_x509a.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+t_x509a.o: ../cryptlib.h
  x_algor.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  x_algor.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  x_algor.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -937,15 +971,16 @@ x_algor.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  x_algor.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  x_algor.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x_algor.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-x_algor.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-x_algor.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-x_algor.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-x_algor.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-x_algor.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-x_algor.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-x_algor.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-x_algor.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-x_algor.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+x_algor.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+x_algor.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+x_algor.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x_algor.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+x_algor.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+x_algor.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_algor.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+x_algor.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x_algor.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+x_algor.o: ../cryptlib.h
  x_attrib.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  x_attrib.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  x_attrib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -954,9 +989,9 @@ x_attrib.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  x_attrib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  x_attrib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x_attrib.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-x_attrib.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-x_attrib.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-x_attrib.o: ../../include/openssl/opensslconf.h
+x_attrib.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+x_attrib.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+x_attrib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  x_attrib.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  x_attrib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
  x_attrib.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
@@ -972,15 +1007,16 @@ x_cinf.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  x_cinf.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  x_cinf.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x_cinf.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-x_cinf.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-x_cinf.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-x_cinf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-x_cinf.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-x_cinf.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-x_cinf.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-x_cinf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-x_cinf.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-x_cinf.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+x_cinf.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+x_cinf.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+x_cinf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x_cinf.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+x_cinf.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+x_cinf.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_cinf.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+x_cinf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x_cinf.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+x_cinf.o: ../cryptlib.h
  x_crl.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  x_crl.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  x_crl.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -989,15 +1025,16 @@ x_crl.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  x_crl.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  x_crl.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x_crl.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-x_crl.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-x_crl.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-x_crl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-x_crl.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-x_crl.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-x_crl.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-x_crl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-x_crl.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-x_crl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+x_crl.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+x_crl.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+x_crl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x_crl.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+x_crl.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+x_crl.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_crl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+x_crl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x_crl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+x_crl.o: ../cryptlib.h
  x_exten.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  x_exten.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  x_exten.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -1006,15 +1043,16 @@ x_exten.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  x_exten.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  x_exten.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x_exten.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-x_exten.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-x_exten.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-x_exten.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-x_exten.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-x_exten.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-x_exten.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-x_exten.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-x_exten.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-x_exten.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+x_exten.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+x_exten.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+x_exten.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x_exten.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+x_exten.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+x_exten.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_exten.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+x_exten.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x_exten.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+x_exten.o: ../cryptlib.h
  x_info.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  x_info.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  x_info.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -1023,15 +1061,16 @@ x_info.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  x_info.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  x_info.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x_info.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-x_info.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-x_info.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-x_info.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-x_info.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-x_info.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-x_info.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-x_info.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-x_info.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-x_info.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+x_info.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+x_info.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+x_info.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x_info.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+x_info.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+x_info.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_info.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+x_info.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x_info.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+x_info.o: ../cryptlib.h
  x_name.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  x_name.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  x_name.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -1040,15 +1079,16 @@ x_name.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  x_name.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  x_name.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x_name.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-x_name.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-x_name.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-x_name.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-x_name.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-x_name.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-x_name.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-x_name.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-x_name.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-x_name.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+x_name.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+x_name.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+x_name.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x_name.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+x_name.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+x_name.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_name.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+x_name.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x_name.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+x_name.o: ../cryptlib.h
  x_pkey.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  x_pkey.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  x_pkey.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -1057,15 +1097,16 @@ x_pkey.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  x_pkey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  x_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x_pkey.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-x_pkey.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-x_pkey.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-x_pkey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-x_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-x_pkey.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-x_pkey.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-x_pkey.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-x_pkey.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-x_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+x_pkey.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+x_pkey.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+x_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+x_pkey.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+x_pkey.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+x_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x_pkey.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+x_pkey.o: ../cryptlib.h
  x_pubkey.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  x_pubkey.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  x_pubkey.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -1074,9 +1115,9 @@ x_pubkey.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  x_pubkey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  x_pubkey.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x_pubkey.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-x_pubkey.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-x_pubkey.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-x_pubkey.o: ../../include/openssl/opensslconf.h
+x_pubkey.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+x_pubkey.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+x_pubkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  x_pubkey.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  x_pubkey.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
  x_pubkey.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
@@ -1092,15 +1133,16 @@ x_req.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  x_req.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  x_req.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x_req.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-x_req.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-x_req.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-x_req.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-x_req.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-x_req.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-x_req.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-x_req.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-x_req.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-x_req.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+x_req.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+x_req.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+x_req.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x_req.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+x_req.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+x_req.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_req.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+x_req.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x_req.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+x_req.o: ../cryptlib.h
  x_sig.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  x_sig.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  x_sig.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -1109,15 +1151,16 @@ x_sig.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  x_sig.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  x_sig.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x_sig.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-x_sig.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-x_sig.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-x_sig.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-x_sig.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-x_sig.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-x_sig.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-x_sig.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-x_sig.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-x_sig.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+x_sig.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+x_sig.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+x_sig.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x_sig.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+x_sig.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+x_sig.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_sig.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+x_sig.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x_sig.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+x_sig.o: ../cryptlib.h
  x_spki.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  x_spki.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  x_spki.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -1126,15 +1169,16 @@ x_spki.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  x_spki.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  x_spki.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x_spki.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-x_spki.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-x_spki.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-x_spki.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-x_spki.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-x_spki.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-x_spki.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-x_spki.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-x_spki.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-x_spki.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+x_spki.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+x_spki.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+x_spki.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x_spki.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+x_spki.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+x_spki.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_spki.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+x_spki.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x_spki.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+x_spki.o: ../cryptlib.h
  x_val.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  x_val.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  x_val.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -1143,15 +1187,16 @@ x_val.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  x_val.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  x_val.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x_val.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-x_val.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-x_val.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-x_val.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-x_val.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-x_val.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-x_val.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-x_val.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-x_val.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-x_val.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+x_val.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+x_val.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+x_val.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x_val.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+x_val.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+x_val.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_val.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+x_val.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x_val.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+x_val.o: ../cryptlib.h
  x_x509.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  x_x509.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  x_x509.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -1160,15 +1205,16 @@ x_x509.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  x_x509.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  x_x509.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x_x509.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-x_x509.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-x_x509.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-x_x509.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-x_x509.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-x_x509.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-x_x509.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-x_x509.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-x_x509.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-x_x509.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+x_x509.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+x_x509.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+x_x509.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x_x509.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+x_x509.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+x_x509.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_x509.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+x_x509.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x_x509.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+x_x509.o: ../cryptlib.h
  x_x509a.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  x_x509a.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  x_x509a.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -1177,12 +1223,13 @@ x_x509a.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  x_x509a.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  x_x509a.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x_x509a.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-x_x509a.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-x_x509a.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-x_x509a.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-x_x509a.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-x_x509a.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-x_x509a.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-x_x509a.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-x_x509a.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-x_x509a.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+x_x509a.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+x_x509a.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+x_x509a.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x_x509a.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+x_x509a.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+x_x509a.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+x_x509a.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+x_x509a.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+x_x509a.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+x_x509a.o: ../cryptlib.h
diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h

index 50a0cfb16250fc366fcafebf2fc7fe51526fa1c9..791636cbcb286ce0dbd55a5805109507c5fe4587 100644 (file)
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -60,6 +60,9 @@
  #define HEADER_ASN1_H
  
  #include <time.h>
+#ifndef NO_BIO
+#include <openssl/bio.h>
+#endif
  #include <openssl/bn.h>
  #include <openssl/stack.h>
  #include <openssl/safestack.h>
@@ -695,7 +698,7 @@ int         ASN1_BIT_STRING_set(ASN1_BIT_STRING *a, unsigned char *d,
  int            ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value);
  int            ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n);
  
-#ifdef HEADER_BIO_H
+#ifndef NO_BIO
  int ASN1_BIT_STRING_name_print(BIO *out, ASN1_BIT_STRING *bs,
                                 BIT_STRING_BITNAME *tbl, int indent);
  #endif
@@ -823,7 +826,7 @@ STACK *             d2i_ASN1_SET(STACK **a, unsigned char **pp, long length,
                         char *(*func)(), void (*free_func)(),
                         int ex_tag, int ex_class);
  
-#ifdef HEADER_BIO_H
+#ifndef NO_BIO
  int i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a);
  int a2i_ASN1_INTEGER(BIO *bp,ASN1_INTEGER *bs,char *buf,int size);
  int i2a_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *a);
@@ -878,7 +881,7 @@ char *ASN1_d2i_fp(char *(*xnew)(),char *(*d2i)(),FILE *fp,unsigned char **x);
  int ASN1_i2d_fp(int (*i2d)(),FILE *out,unsigned char *x);
  #endif
  
-#ifdef HEADER_BIO_H
+#ifndef NO_BIO
  char *ASN1_d2i_bio(char *(*xnew)(),char *(*d2i)(),BIO *bp,unsigned char **x);
  int ASN1_i2d_bio(int (*i2d)(),BIO *out,unsigned char *x);
  int ASN1_UTCTIME_print(BIO *fp,ASN1_UTCTIME *a);
diff --git a/crypto/bio/Makefile.ssl b/crypto/bio/Makefile.ssl

index 0ce93919dab09d4183f1971b1cbb60c214aab286..83f50045866b83451206fa3a8b1f9211cb56a66a 100644 (file)
--- a/crypto/bio/Makefile.ssl
+++ b/crypto/bio/Makefile.ssl
@@ -89,21 +89,21 @@ clean:
  b_dump.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  b_dump.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  b_dump.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-b_dump.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-b_dump.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-b_dump.o: ../cryptlib.h
+b_dump.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+b_dump.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+b_dump.o: ../../include/openssl/stack.h ../cryptlib.h
  b_print.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  b_print.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  b_print.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-b_print.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-b_print.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-b_print.o: ../cryptlib.h
+b_print.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+b_print.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+b_print.o: ../../include/openssl/stack.h ../cryptlib.h
  b_sock.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  b_sock.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  b_sock.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-b_sock.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-b_sock.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-b_sock.o: ../cryptlib.h
+b_sock.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+b_sock.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+b_sock.o: ../../include/openssl/stack.h ../cryptlib.h
  bf_buff.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  bf_buff.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  bf_buff.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -111,14 +111,15 @@ bf_buff.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  bf_buff.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  bf_buff.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  bf_buff.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-bf_buff.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-bf_buff.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-bf_buff.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-bf_buff.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-bf_buff.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-bf_buff.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-bf_buff.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-bf_buff.o: ../../include/openssl/stack.h ../cryptlib.h
+bf_buff.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+bf_buff.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+bf_buff.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+bf_buff.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bf_buff.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+bf_buff.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+bf_buff.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+bf_buff.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+bf_buff.o: ../cryptlib.h
  bf_nbio.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  bf_nbio.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  bf_nbio.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -126,15 +127,15 @@ bf_nbio.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  bf_nbio.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  bf_nbio.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  bf_nbio.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-bf_nbio.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-bf_nbio.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-bf_nbio.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-bf_nbio.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-bf_nbio.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-bf_nbio.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-bf_nbio.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-bf_nbio.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-bf_nbio.o: ../cryptlib.h
+bf_nbio.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+bf_nbio.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+bf_nbio.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+bf_nbio.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bf_nbio.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+bf_nbio.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+bf_nbio.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+bf_nbio.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+bf_nbio.o: ../../include/openssl/stack.h ../cryptlib.h
  bf_null.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  bf_null.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  bf_null.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -142,79 +143,81 @@ bf_null.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  bf_null.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  bf_null.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  bf_null.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-bf_null.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-bf_null.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-bf_null.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-bf_null.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-bf_null.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-bf_null.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-bf_null.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-bf_null.o: ../../include/openssl/stack.h ../cryptlib.h
+bf_null.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+bf_null.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+bf_null.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+bf_null.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bf_null.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+bf_null.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+bf_null.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+bf_null.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+bf_null.o: ../cryptlib.h
  bio_cb.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  bio_cb.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  bio_cb.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-bio_cb.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-bio_cb.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bio_cb.o: ../cryptlib.h
+bio_cb.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+bio_cb.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+bio_cb.o: ../../include/openssl/stack.h ../cryptlib.h
  bio_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
-bio_err.o: ../../include/openssl/err.h ../../include/openssl/opensslv.h
-bio_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+bio_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+bio_err.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+bio_err.o: ../../include/openssl/stack.h
  bio_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  bio_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  bio_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-bio_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-bio_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bio_lib.o: ../cryptlib.h
+bio_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+bio_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+bio_lib.o: ../../include/openssl/stack.h ../cryptlib.h
  bss_acpt.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  bss_acpt.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  bss_acpt.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-bss_acpt.o: ../../include/openssl/opensslconf.h
+bss_acpt.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
  bss_acpt.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  bss_acpt.o: ../../include/openssl/stack.h ../cryptlib.h
  bss_bio.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
  bss_bio.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-bss_bio.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-bss_bio.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-bss_bio.o: ../../include/openssl/stack.h
+bss_bio.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+bss_bio.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bss_bio.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
  bss_conn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  bss_conn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  bss_conn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-bss_conn.o: ../../include/openssl/opensslconf.h
+bss_conn.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
  bss_conn.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  bss_conn.o: ../../include/openssl/stack.h ../cryptlib.h
  bss_fd.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  bss_fd.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  bss_fd.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-bss_fd.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-bss_fd.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bss_fd.o: ../cryptlib.h bss_sock.c
+bss_fd.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+bss_fd.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+bss_fd.o: ../../include/openssl/stack.h ../cryptlib.h bss_sock.c
  bss_file.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  bss_file.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  bss_file.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-bss_file.o: ../../include/openssl/opensslconf.h
+bss_file.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
  bss_file.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  bss_file.o: ../../include/openssl/stack.h ../cryptlib.h
  bss_log.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  bss_log.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  bss_log.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-bss_log.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-bss_log.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bss_log.o: ../cryptlib.h
+bss_log.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+bss_log.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+bss_log.o: ../../include/openssl/stack.h ../cryptlib.h
  bss_mem.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  bss_mem.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  bss_mem.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-bss_mem.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-bss_mem.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bss_mem.o: ../cryptlib.h
+bss_mem.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+bss_mem.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+bss_mem.o: ../../include/openssl/stack.h ../cryptlib.h
  bss_null.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  bss_null.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  bss_null.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-bss_null.o: ../../include/openssl/opensslconf.h
+bss_null.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
  bss_null.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  bss_null.o: ../../include/openssl/stack.h ../cryptlib.h
  bss_sock.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  bss_sock.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  bss_sock.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-bss_sock.o: ../../include/openssl/opensslconf.h
+bss_sock.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
  bss_sock.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  bss_sock.o: ../../include/openssl/stack.h ../cryptlib.h
diff --git a/crypto/bn/Makefile.ssl b/crypto/bn/Makefile.ssl

index 3902c41c72225a24fc978d4d5e775beabf2074bf..d49b46617051f8d634205ac9188f847a04fad995 100644 (file)
--- a/crypto/bn/Makefile.ssl
+++ b/crypto/bn/Makefile.ssl
@@ -170,118 +170,139 @@ clean:
  bn_add.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_add.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bn_add.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-bn_add.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-bn_add.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-bn_add.o: ../../include/openssl/stack.h ../cryptlib.h bn_lcl.h
+bn_add.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+bn_add.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bn_add.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+bn_add.o: ../cryptlib.h bn_lcl.h
  bn_asm.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_asm.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bn_asm.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-bn_asm.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-bn_asm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-bn_asm.o: ../../include/openssl/stack.h ../cryptlib.h bn_lcl.h
+bn_asm.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+bn_asm.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bn_asm.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+bn_asm.o: ../cryptlib.h bn_lcl.h
  bn_blind.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_blind.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bn_blind.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-bn_blind.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+bn_blind.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+bn_blind.o: ../../include/openssl/opensslconf.h
  bn_blind.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  bn_blind.o: ../../include/openssl/stack.h ../cryptlib.h bn_lcl.h
  bn_ctx.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_ctx.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bn_ctx.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-bn_ctx.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-bn_ctx.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-bn_ctx.o: ../../include/openssl/stack.h ../cryptlib.h
+bn_ctx.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+bn_ctx.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bn_ctx.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+bn_ctx.o: ../cryptlib.h
  bn_div.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_div.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bn_div.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-bn_div.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-bn_div.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-bn_div.o: ../../include/openssl/stack.h ../cryptlib.h bn_lcl.h
-bn_err.o: ../../include/openssl/bn.h ../../include/openssl/err.h
-bn_err.o: ../../include/openssl/opensslconf.h
+bn_div.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+bn_div.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bn_div.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+bn_div.o: ../cryptlib.h bn_lcl.h
+bn_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+bn_err.o: ../../include/openssl/crypto.h ../../include/openssl/err.h
+bn_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+bn_err.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+bn_err.o: ../../include/openssl/stack.h
  bn_exp.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_exp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bn_exp.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-bn_exp.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-bn_exp.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-bn_exp.o: ../../include/openssl/stack.h ../cryptlib.h bn_lcl.h
+bn_exp.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+bn_exp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bn_exp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+bn_exp.o: ../cryptlib.h bn_lcl.h
  bn_exp2.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_exp2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bn_exp2.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-bn_exp2.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-bn_exp2.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-bn_exp2.o: ../../include/openssl/stack.h ../cryptlib.h bn_lcl.h
+bn_exp2.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+bn_exp2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bn_exp2.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+bn_exp2.o: ../cryptlib.h bn_lcl.h
  bn_gcd.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_gcd.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bn_gcd.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-bn_gcd.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-bn_gcd.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-bn_gcd.o: ../../include/openssl/stack.h ../cryptlib.h bn_lcl.h
+bn_gcd.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+bn_gcd.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bn_gcd.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+bn_gcd.o: ../cryptlib.h bn_lcl.h
  bn_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bn_lib.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-bn_lib.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-bn_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-bn_lib.o: ../../include/openssl/stack.h ../cryptlib.h bn_lcl.h
+bn_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+bn_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bn_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+bn_lib.o: ../cryptlib.h bn_lcl.h
  bn_mont.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_mont.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bn_mont.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-bn_mont.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-bn_mont.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-bn_mont.o: ../../include/openssl/stack.h ../cryptlib.h bn_lcl.h
+bn_mont.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+bn_mont.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bn_mont.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+bn_mont.o: ../cryptlib.h bn_lcl.h
  bn_mpi.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_mpi.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bn_mpi.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-bn_mpi.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-bn_mpi.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-bn_mpi.o: ../../include/openssl/stack.h ../cryptlib.h bn_lcl.h
+bn_mpi.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+bn_mpi.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bn_mpi.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+bn_mpi.o: ../cryptlib.h bn_lcl.h
  bn_mul.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_mul.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bn_mul.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-bn_mul.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-bn_mul.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-bn_mul.o: ../../include/openssl/stack.h ../cryptlib.h bn_lcl.h
+bn_mul.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+bn_mul.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bn_mul.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+bn_mul.o: ../cryptlib.h bn_lcl.h
  bn_prime.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_prime.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bn_prime.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-bn_prime.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+bn_prime.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+bn_prime.o: ../../include/openssl/opensslconf.h
  bn_prime.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
  bn_prime.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
  bn_prime.o: ../cryptlib.h bn_lcl.h bn_prime.h
  bn_print.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_print.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bn_print.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-bn_print.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+bn_print.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+bn_print.o: ../../include/openssl/opensslconf.h
  bn_print.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  bn_print.o: ../../include/openssl/stack.h ../cryptlib.h bn_lcl.h
  bn_rand.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_rand.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bn_rand.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-bn_rand.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-bn_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-bn_rand.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bn_rand.o: ../cryptlib.h bn_lcl.h
+bn_rand.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+bn_rand.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bn_rand.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+bn_rand.o: ../../include/openssl/stack.h ../cryptlib.h bn_lcl.h
  bn_recp.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_recp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bn_recp.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-bn_recp.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-bn_recp.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-bn_recp.o: ../../include/openssl/stack.h ../cryptlib.h bn_lcl.h
+bn_recp.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+bn_recp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bn_recp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+bn_recp.o: ../cryptlib.h bn_lcl.h
  bn_shift.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_shift.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bn_shift.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-bn_shift.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+bn_shift.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+bn_shift.o: ../../include/openssl/opensslconf.h
  bn_shift.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  bn_shift.o: ../../include/openssl/stack.h ../cryptlib.h bn_lcl.h
  bn_sqr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_sqr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bn_sqr.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-bn_sqr.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-bn_sqr.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-bn_sqr.o: ../../include/openssl/stack.h ../cryptlib.h bn_lcl.h
+bn_sqr.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+bn_sqr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bn_sqr.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+bn_sqr.o: ../cryptlib.h bn_lcl.h
  bn_word.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  bn_word.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  bn_word.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-bn_word.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-bn_word.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-bn_word.o: ../../include/openssl/stack.h ../cryptlib.h bn_lcl.h
+bn_word.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+bn_word.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bn_word.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+bn_word.o: ../cryptlib.h bn_lcl.h
diff --git a/crypto/bn/bn.h b/crypto/bn/bn.h

index 000ff48155f076fcee92da9e6e8a20cfc90e1b84..d292394c0fd13f5056b1829f453029fc95c8bffd 100644 (file)
--- a/crypto/bn/bn.h
+++ b/crypto/bn/bn.h
@@ -485,6 +485,7 @@ BN_ULONG bn_sub_words(BN_ULONG *rp, BN_ULONG *ap, BN_ULONG *bp,int num);
  #define BN_F_BN_CTX_NEW                                         106
  #define BN_F_BN_DIV                                     107
  #define BN_F_BN_EXPAND2                                         108
+#define BN_F_BN_MOD_EXP2_MONT                           118
  #define BN_F_BN_MOD_EXP_MONT                            109
  #define BN_F_BN_MOD_EXP_MONT_WORD                       117
  #define BN_F_BN_MOD_INVERSE                             110
diff --git a/crypto/bn/bn_err.c b/crypto/bn/bn_err.c

index e0cbd70b7dbec5e0ceade5a33ec414358cc2dc7f..86550c4c21d5804732d09d9f71fe7805c9240902 100644 (file)
--- a/crypto/bn/bn_err.c
+++ b/crypto/bn/bn_err.c
@@ -76,8 +76,9 @@ static ERR_STRING_DATA BN_str_functs[]=
  {ERR_PACK(0,BN_F_BN_CTX_NEW,0),        "BN_CTX_new"},
  {ERR_PACK(0,BN_F_BN_DIV,0),    "BN_div"},
  {ERR_PACK(0,BN_F_BN_EXPAND2,0),        "bn_expand2"},
+{ERR_PACK(0,BN_F_BN_MOD_EXP2_MONT,0),  "BN_mod_exp2_mont"},
  {ERR_PACK(0,BN_F_BN_MOD_EXP_MONT,0),   "BN_mod_exp_mont"},
-{ERR_PACK(0,BN_F_BN_MOD_EXP_MONT_WORD,0),      "BN_MOD_EXP_MONT_WORD"},
+{ERR_PACK(0,BN_F_BN_MOD_EXP_MONT_WORD,0),      "BN_mod_exp_mont_word"},
  {ERR_PACK(0,BN_F_BN_MOD_INVERSE,0),    "BN_mod_inverse"},
  {ERR_PACK(0,BN_F_BN_MOD_MUL_RECIPROCAL,0),     "BN_mod_mul_reciprocal"},
  {ERR_PACK(0,BN_F_BN_MPI2BN,0), "BN_mpi2bn"},
diff --git a/crypto/bn/bn_exp.c b/crypto/bn/bn_exp.c

index 96f34fa529b7cfc699571f97c0cb63a9df9ac296..863df241f81423dc8df99bbbf6a7ea2bc29f7611 100644 (file)
--- a/crypto/bn/bn_exp.c
+++ b/crypto/bn/bn_exp.c
@@ -55,6 +55,60 @@
   * copied and put under another distribution licence
   * [including the GNU Public Licence.]
   */
+/* ====================================================================
+ * Copyright (c) 1998-2000 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).
+ *
+ */
+
  
  #include <stdio.h>
  #include "cryptlib.h"
@@ -67,7 +121,7 @@
  #endif
  
  
-#define TABLE_SIZE     16
+#define TABLE_SIZE     32
  
  /* slow but works */
  int BN_mod_mul(BIGNUM *ret, BIGNUM *a, BIGNUM *b, const BIGNUM *m, BN_CTX *ctx)
@@ -373,27 +427,22 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
         ts=1;
  
         if (!BN_mod(&(val[0]),a,m,ctx)) goto err;               /* 1 */
-       if (!BN_mod_mul_reciprocal(aa,&(val[0]),&(val[0]),&recp,ctx))
-               goto err;                               /* 2 */
-
-       if (bits <= 17) /* This is probably 3 or 0x10001, so just do singles */
-               window=1;
-       else if (bits >= 256)
-               window=5;       /* max size of window */
-       else if (bits >= 128)
-               window=4;
-       else
-               window=3;
  
-       j=1<<(window-1);
-       for (i=1; i<j; i++)
+       window = BN_window_bits_for_exponent_size(bits);
+       if (window > 1)
                 {
-               BN_init(&val[i]);
-               if (!BN_mod_mul_reciprocal(&(val[i]),&(val[i-1]),aa,&recp,ctx))
-                       goto err;
+               if (!BN_mod_mul_reciprocal(aa,&(val[0]),&(val[0]),&recp,ctx))
+                       goto err;                               /* 2 */
+               j=1<<(window-1);
+               for (i=1; i<j; i++)
+                       {
+                       BN_init(&val[i]);
+                       if (!BN_mod_mul_reciprocal(&(val[i]),&(val[i-1]),aa,&recp,ctx))
+                               goto err;
+                       }
+               ts=i;
                 }
-       ts=i;
-
+               
         start=1;        /* This is used to avoid multiplication etc
                          * when there is only the value '1' in the
                          * buffer. */
@@ -520,25 +569,20 @@ int BN_mod_exp_mont(BIGNUM *rr, BIGNUM *a, const BIGNUM *p,
         else
                 aa=a;
         if (!BN_to_montgomery(&(val[0]),aa,mont,ctx)) goto err; /* 1 */
-       if (!BN_mod_mul_montgomery(d,&(val[0]),&(val[0]),mont,ctx)) goto err; /* 2 */
-
-       if (bits <= 20) /* This is probably 3 or 0x10001, so just do singles */
-               window=1;
-       else if (bits >= 256)
-               window=5;       /* max size of window */
-       else if (bits >= 128)
-               window=4;
-       else
-               window=3;
  
-       j=1<<(window-1);
-       for (i=1; i<j; i++)
+       window = BN_window_bits_for_exponent_size(bits);
+       if (window > 1)
                 {
-               BN_init(&(val[i]));
-               if (!BN_mod_mul_montgomery(&(val[i]),&(val[i-1]),d,mont,ctx))
-                       goto err;
+               if (!BN_mod_mul_montgomery(d,&(val[0]),&(val[0]),mont,ctx)) goto err; /* 2 */
+               j=1<<(window-1);
+               for (i=1; i<j; i++)
+                       {
+                       BN_init(&(val[i]));
+                       if (!BN_mod_mul_montgomery(&(val[i]),&(val[i-1]),d,mont,ctx))
+                               goto err;
+                       }
+               ts=i;
                 }
-       ts=i;
  
         start=1;        /* This is used to avoid multiplication etc
                          * when there is only the value '1' in the
@@ -611,11 +655,17 @@ err:
  
  int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
                           const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont)
-/* if we had BN_mod_exp_mont_2, we could even use windowing in it */
         {
+       BN_MONT_CTX *mont = NULL;
         int b, bits, ret=0;
+       BN_ULONG w, next_w;
         BIGNUM *d, *r, *t;
-       BN_MONT_CTX *mont = NULL;
+       BIGNUM *swap_tmp;
+#define BN_MOD_MUL_WORD(r, w, m) \
+               (BN_mul_word(r, (w)) && \
+               (BN_ucmp(r, (m)) >= 0 ? \
+                       (BN_mod(t, r, m, ctx) && (swap_tmp = r, r = t, t = swap_tmp, 1)) : \
+                       1))
  
         bn_check_top(p);
         bn_check_top(m);
@@ -641,8 +691,11 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
         if (!tried_atalla)
                 {
                 BN_set_word(t, a);
-               if (BN_mod_exp_word_atalla(rr, t, p, m))
+               if (BN_mod_exp_atalla(rr, t, p, m))
+                       {
+                       BN_CTX_end(ctx);
                         return 1;
+                       }
                 }
  /* If it fails, try the other methods */
  #endif
@@ -656,26 +709,45 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p,
                 }
  
         if (!BN_to_montgomery(r, BN_value_one(), mont, ctx)) goto err;
-       for (b = bits-1; b >= 0; b--)
+
+       /* bits-1 >= 0 */
+
+       /* The result is accumulated in the product r*w. */
+       w = a; /* bit 'bits-1' of 'p' is always set */
+       for (b = bits-2; b >= 0; b--)
                 {
-               if (BN_is_bit_set(p, b))
+               /* First, square r*w. */
+               next_w = w*w;
+               if ((next_w/w) != w) /* overflow */
                         {
-                       if (!BN_mul_word(r, a))
+                       if (!BN_MOD_MUL_WORD(r, w, m))
                                 goto err;
-                       if (BN_ucmp(r, m) >= 0)
+                       next_w = 1;
+                       }
+               w = next_w;
+               if (!BN_mod_mul_montgomery(r, r, r, mont, ctx))
+                       goto err;
+
+               /* Second, multiply r*w by 'a' if exponent bit is set. */
+               if (BN_is_bit_set(p, b))
+                       {
+                       next_w = w*a;
+                       if ((next_w/a) != w) /* overflow */
                                 {
-                               if (!BN_mod(t, r, m, ctx))
+                               if (!BN_MOD_MUL_WORD(r, w, m))
                                         goto err;
-                               { BIGNUM *swap_tmp = r; r = t; t = swap_tmp; }
+                               next_w = a;
                                 }
+                       w = next_w;
                         }
-               
-               if (b > 0)
-                       {
-                       if (!BN_mod_mul_montgomery(r, r, r, mont, ctx))
-                               goto err;
-                       }
                 }
+       /* Finally, set r:=r*w. */
+       if (w != 1)
+               {
+               if (!BN_MOD_MUL_WORD(r, w, m))
+                       goto err;
+               }
+
         BN_from_montgomery(rr, r, mont, ctx);
         ret = 1;
  err:
@@ -708,26 +780,21 @@ int BN_mod_exp_simple(BIGNUM *r, BIGNUM *a, BIGNUM *p, BIGNUM *m,
         BN_init(&(val[0]));
         ts=1;
         if (!BN_mod(&(val[0]),a,m,ctx)) goto err;               /* 1 */
-       if (!BN_mod_mul(d,&(val[0]),&(val[0]),m,ctx))
-               goto err;                               /* 2 */
-
-       if (bits <= 17) /* This is probably 3 or 0x10001, so just do singles */
-               window=1;
-       else if (bits >= 256)
-               window=5;       /* max size of window */
-       else if (bits >= 128)
-               window=4;
-       else
-               window=3;
  
-       j=1<<(window-1);
-       for (i=1; i<j; i++)
+       window = BN_window_bits_for_exponent_size(bits);
+       if (window > 1)
                 {
-               BN_init(&(val[i]));
-               if (!BN_mod_mul(&(val[i]),&(val[i-1]),d,m,ctx))
-                       goto err;
+               if (!BN_mod_mul(d,&(val[0]),&(val[0]),m,ctx))
+                       goto err;                               /* 2 */
+               j=1<<(window-1);
+               for (i=1; i<j; i++)
+                       {
+                       BN_init(&(val[i]));
+                       if (!BN_mod_mul(&(val[i]),&(val[i-1]),d,m,ctx))
+                               goto err;
+                       }
+               ts=i;
                 }
-       ts=i;
  
         start=1;        /* This is used to avoid multiplication etc
                          * when there is only the value '1' in the
diff --git a/crypto/bn/bn_exp2.c b/crypto/bn/bn_exp2.c

index 4f4e9e329989d5b415bba73dd14eda0a245e7f83..29029f4c724a6c8cfcbef584347ca068ee73d535 100644 (file)
--- a/crypto/bn/bn_exp2.c
+++ b/crypto/bn/bn_exp2.c
@@ -1,27 +1,128 @@
+/* crypto/bn/bn_exp2.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * 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 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 acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS 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 AUTHOR OR 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.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2000 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).
+ *
+ */
+
  #include <stdio.h>
  #include "cryptlib.h"
  #include "bn_lcl.h"
  
-/* I've done some timing with different table sizes.
- * The main hassle is that even with bits set at 3, this requires
- * 63 BIGNUMs to store the pre-calculated values.
- *          512   1024 
- * bits=1  75.4%  79.4%
- * bits=2  61.2%  62.4%
- * bits=3  61.3%  59.3%
- * The lack of speed improvement is also a function of the pre-calculation
- * which could be removed.
- */
-#define EXP2_TABLE_BITS        2 /* 1  2  3  4  5  */
-#define EXP2_TABLE_SIZE        4 /* 2  4  8 16 32  */
+#define TABLE_SIZE     32
  
  int BN_mod_exp2_mont(BIGNUM *rr, BIGNUM *a1, BIGNUM *p1, BIGNUM *a2,
              BIGNUM *p2, BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont)
         {
-       int i,j,k,bits,bits1,bits2,ret=0,wstart,wend,window,xvalue,yvalue;
-       int start=1,ts=0,x,y;
-       BIGNUM *d,*aa1,*aa2,*r;
-       BIGNUM val[EXP2_TABLE_SIZE][EXP2_TABLE_SIZE];
+       int i,j,bits,b,bits1,bits2,ret=0,wpos1,wpos2,window1,window2,wvalue1,wvalue2;
+       int r_is_one=1,ts1=0,ts2=0;
+       BIGNUM *d,*r;
+       BIGNUM *a_mod_m;
+       BIGNUM val1[TABLE_SIZE], val2[TABLE_SIZE];
         BN_MONT_CTX *mont=NULL;
  
         bn_check_top(a1);
@@ -32,7 +133,7 @@ int BN_mod_exp2_mont(BIGNUM *rr, BIGNUM *a1, BIGNUM *p1, BIGNUM *a2,
  
         if (!(m->d[0] & 1))
                 {
-               BNerr(BN_F_BN_MOD_EXP_MONT,BN_R_CALLED_WITH_EVEN_MODULUS);
+               BNerr(BN_F_BN_MOD_EXP2_MONT,BN_R_CALLED_WITH_EVEN_MODULUS);
                 return(0);
                 }
         bits1=BN_num_bits(p1);
@@ -42,17 +143,13 @@ int BN_mod_exp2_mont(BIGNUM *rr, BIGNUM *a1, BIGNUM *p1, BIGNUM *a2,
                 BN_one(rr);
                 return(1);
                 }
+       bits=(bits1 > bits2)?bits1:bits2;
  
         BN_CTX_start(ctx);
         d = BN_CTX_get(ctx);
         r = BN_CTX_get(ctx);
         if (d == NULL || r == NULL) goto err;
  
-       bits=(bits1 > bits2)?bits1:bits2;
-
-       /* If this is not done, things will break in the montgomery
-        * part */
-
         if (in_mont != NULL)
                 mont=in_mont;
         else
@@ -61,139 +158,143 @@ int BN_mod_exp2_mont(BIGNUM *rr, BIGNUM *a1, BIGNUM *p1, BIGNUM *a2,
                 if (!BN_MONT_CTX_set(mont,m,ctx)) goto err;
                 }
  
-       BN_init(&(val[0][0]));
-       BN_init(&(val[1][1]));
-       BN_init(&(val[0][1]));
-       BN_init(&(val[1][0]));
-       ts=1;
+       window1 = BN_window_bits_for_exponent_size(bits1);
+       window2 = BN_window_bits_for_exponent_size(bits2);
+
+       /*
+        * Build table for a1:   val1[i] := a1^(2*i + 1) mod m  for i = 0 .. 2^(window1-1)
+        */
+       BN_init(&val1[0]);
+       ts1=1;
         if (BN_ucmp(a1,m) >= 0)
                 {
-               BN_mod(&(val[1][0]),a1,m,ctx);
-               aa1= &(val[1][0]);
+               if (!BN_mod(&(val1[0]),a1,m,ctx))
+                       goto err;
+               a_mod_m = &(val1[0]);
                 }
         else
-               aa1=a1;
+               a_mod_m = a1;
+       if (!BN_to_montgomery(&(val1[0]),a_mod_m,mont,ctx)) goto err;
+       if (window1 > 1)
+               {
+               if (!BN_mod_mul_montgomery(d,&(val1[0]),&(val1[0]),mont,ctx)) goto err;
+
+               j=1<<(window1-1);
+               for (i=1; i<j; i++)
+                       {
+                       BN_init(&(val1[i]));
+                       if (!BN_mod_mul_montgomery(&(val1[i]),&(val1[i-1]),d,mont,ctx))
+                               goto err;
+                       }
+               ts1=i;
+               }
+
+
+       /*
+        * Build table for a2:   val2[i] := a2^(2*i + 1) mod m  for i = 0 .. 2^(window2-1)
+        */
+       BN_init(&val2[0]);
+       ts2=1;
         if (BN_ucmp(a2,m) >= 0)
                 {
-               BN_mod(&(val[0][1]),a2,m,ctx);
-               aa2= &(val[0][1]);
+               if (!BN_mod(&(val2[0]),a2,m,ctx))
+                       goto err;
+               a_mod_m = &(val2[0]);
                 }
         else
-               aa2=a2;
-       if (!BN_to_montgomery(&(val[1][0]),aa1,mont,ctx)) goto err;
-       if (!BN_to_montgomery(&(val[0][1]),aa2,mont,ctx)) goto err;
-       if (!BN_mod_mul_montgomery(&(val[1][1]),
-               &(val[1][0]),&(val[0][1]),mont,ctx))
-               goto err;
-
-#if 0
-       if (bits <= 20) /* This is probably 3 or 0x10001, so just do singles */
-               window=1;
-       else if (bits > 250)
-               window=5;       /* max size of window */
-       else if (bits >= 120)
-               window=4;
-       else
-               window=3;
-#else
-       window=EXP2_TABLE_BITS;
-#endif
-
-       k=1<<window;
-       for (x=0; x<k; x++)
+               a_mod_m = a2;
+       if (!BN_to_montgomery(&(val2[0]),a_mod_m,mont,ctx)) goto err;
+       if (window2 > 1)
                 {
-               if (x >= 2)
-                       {
-                       BN_init(&(val[x][0]));
-                       BN_init(&(val[x][1]));
-                       if (!BN_mod_mul_montgomery(&(val[x][0]),
-                               &(val[1][0]),&(val[x-1][0]),mont,ctx)) goto err;
-                       if (!BN_mod_mul_montgomery(&(val[x][1]),
-                               &(val[1][0]),&(val[x-1][1]),mont,ctx)) goto err;
-                       }
-               for (y=2; y<k; y++)
+               if (!BN_mod_mul_montgomery(d,&(val2[0]),&(val2[0]),mont,ctx)) goto err;
+
+               j=1<<(window2-1);
+               for (i=1; i<j; i++)
                         {
-                       BN_init(&(val[x][y]));
-                       if (!BN_mod_mul_montgomery(&(val[x][y]),
-                               &(val[x][y-1]),&(val[0][1]),mont,ctx))
+                       BN_init(&(val2[i]));
+                       if (!BN_mod_mul_montgomery(&(val2[i]),&(val2[i-1]),d,mont,ctx))
                                 goto err;
                         }
+               ts2=i;
                 }
-       ts=k;
-
-       start=1;        /* This is used to avoid multiplication etc
-                        * when there is only the value '1' in the
-                        * buffer. */
-       xvalue=0;       /* The 'x value' of the window */
-       yvalue=0;       /* The 'y value' of the window */
-       wstart=bits-1;  /* The top bit of the window */
-       wend=0;         /* The bottom bit of the window */
-
-        if (!BN_to_montgomery(r,BN_value_one(),mont,ctx)) goto err;
-       for (;;)
+
+
+       /* Now compute the power product, using independent windows. */
+       r_is_one=1;
+       wvalue1=0;  /* The 'value' of the first window */
+       wvalue2=0;  /* The 'value' of the second window */
+       wpos1=0;    /* If wvalue1 > 0, the bottom bit of the first window */
+       wpos2=0;    /* If wvalue2 > 0, the bottom bit of the second window */
+
+       if (!BN_to_montgomery(r,BN_value_one(),mont,ctx)) goto err;
+       for (b=bits-1; b>=0; b--)
                 {
-               xvalue=BN_is_bit_set(p1,wstart);
-               yvalue=BN_is_bit_set(p2,wstart);
-               if (!(xvalue || yvalue))
+               if (!r_is_one)
                         {
-                       if (!start)
+                       if (!BN_mod_mul_montgomery(r,r,r,mont,ctx))
+                               goto err;
+                       }
+               
+               if (!wvalue1)
+                       if (BN_is_bit_set(p1, b))
                                 {
-                               if (!BN_mod_mul_montgomery(r,r,r,mont,ctx))
-                                       goto err;
+                               /* consider bits b-window1+1 .. b for this window */
+                               i = b-window1+1;
+                               while (!BN_is_bit_set(p1, i)) /* works for i<0 */
+                                       i++;
+                               wpos1 = i;
+                               wvalue1 = 1;
+                               for (i = b-1; i >= wpos1; i--)
+                                       {
+                                       wvalue1 <<= 1;
+                                       if (BN_is_bit_set(p1, i))
+                                               wvalue1++;
+                                       }
                                 }
-                       wstart--;
-                       if (wstart < 0) break;
-                       continue;
-                       }
-               /* We now have wstart on a 'set' bit, we now need to work out
-                * how bit a window to do.  To do this we need to scan
-                * forward until the last set bit before the end of the
-                * window */
-               j=wstart;
-               /* xvalue=BN_is_bit_set(p1,wstart); already set */
-               /* yvalue=BN_is_bit_set(p1,wstart); already set */
-               wend=0;
-               for (i=1; i<window; i++)
-                       {
-                       if (wstart-i < 0) break;
-                       xvalue+=xvalue;
-                       xvalue|=BN_is_bit_set(p1,wstart-i);
-                       yvalue+=yvalue;
-                       yvalue|=BN_is_bit_set(p2,wstart-i);
-                       }
-
-               /* i is the size of the current window */
-               /* add the 'bytes above' */
-               if (!start)
-                       for (j=0; j<i; j++)
+               
+               if (!wvalue2)
+                       if (BN_is_bit_set(p2, b))
                                 {
-                               if (!BN_mod_mul_montgomery(r,r,r,mont,ctx))
-                                       goto err;
+                               /* consider bits b-window2+1 .. b for this window */
+                               i = b-window2+1;
+                               while (!BN_is_bit_set(p2, i))
+                                       i++;
+                               wpos2 = i;
+                               wvalue2 = 1;
+                               for (i = b-1; i >= wpos2; i--)
+                                       {
+                                       wvalue2 <<= 1;
+                                       if (BN_is_bit_set(p2, i))
+                                               wvalue2++;
+                                       }
                                 }
+
+               if (wvalue1 && b == wpos1)
+                       {
+                       /* wvalue1 is odd and < 2^window1 */
+                       if (!BN_mod_mul_montgomery(r,r,&(val1[wvalue1>>1]),mont,ctx))
+                               goto err;
+                       wvalue1 = 0;
+                       r_is_one = 0;
+                       }
                 
-               /* wvalue will be an odd number < 2^window */
-               if (xvalue || yvalue)
+               if (wvalue2 && b == wpos2)
                         {
-                       if (!BN_mod_mul_montgomery(r,r,&(val[xvalue][yvalue]),
-                               mont,ctx)) goto err;
+                       /* wvalue2 is odd and < 2^window2 */
+                       if (!BN_mod_mul_montgomery(r,r,&(val2[wvalue2>>1]),mont,ctx))
+                               goto err;
+                       wvalue2 = 0;
+                       r_is_one = 0;
                         }
-
-               /* move the 'window' down further */
-               wstart-=i;
-               start=0;
-               if (wstart < 0) break;
                 }
         BN_from_montgomery(rr,r,mont,ctx);
         ret=1;
  err:
         if ((in_mont == NULL) && (mont != NULL)) BN_MONT_CTX_free(mont);
         BN_CTX_end(ctx);
-       for (i=0; i<ts; i++)
-               {
-               for (j=0; j<ts; j++)
-                       {
-                       BN_clear_free(&(val[i][j]));
-                       }
-               }
+       for (i=0; i<ts1; i++)
+               BN_clear_free(&(val1[i]));
+       for (i=0; i<ts2; i++)
+               BN_clear_free(&(val2[i]));
         return(ret);
         }
diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h

index e36ccbc4c2d924889fc7f08586a35bbbc3877b7c..97c35ea5958c2c88cd47ac9f38025bff539c7095 100644 (file)
--- a/crypto/bn/bn_lcl.h
+++ b/crypto/bn/bn_lcl.h
@@ -55,6 +55,59 @@
   * copied and put under another distribution licence
   * [including the GNU Public Licence.]
   */
+/* ====================================================================
+ * Copyright (c) 1998-2000 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).
+ *
+ */
  
  #ifndef HEADER_BN_LCL_H
  #define HEADER_BN_LCL_H
@@ -65,6 +118,51 @@
  extern "C" {
  #endif
  
+
+/*
+ * BN_window_bits_for_exponent_size -- macro for sliding window mod_exp functions
+ *
+ *
+ * For window size 'w' (w >= 2) and a random 'b' bits exponent,
+ * the number of multiplications is a constant plus on average
+ *
+ *    2^(w-1) + (b-w)/(w+1);
+ *
+ * here  2^(w-1)  is for precomputing the table (we actually need
+ * entries only for windows that have the lowest bit set), and
+ * (b-w)/(w+1)  is an approximation for the expected number of
+ * w-bit windows, not counting the first one.
+ *
+ * Thus we should use
+ *
+ *    w >= 6  if        b > 671
+ *     w = 5  if  671 > b > 239
+ *     w = 4  if  239 > b >  79
+ *     w = 3  if   79 > b >  23
+ *    w <= 2  if   23 > b
+ *
+ * (with draws in between).  Very small exponents are often selected
+ * with low Hamming weight, so we use  w = 1  for b <= 23.
+ */
+#if 1
+#define BN_window_bits_for_exponent_size(b) \
+               ((b) > 671 ? 6 : \
+                (b) > 239 ? 5 : \
+                (b) >  79 ? 4 : \
+                (b) >  23 ? 3 : 1)
+#else
+/* Old SSLeay/OpenSSL table.
+ * Maximum window size was 5, so this table differs for b==1024;
+ * but it coincides for other interesting values (b==160, b==512).
+ */
+#define BN_window_bits_for_exponent_size(b) \
+               ((b) > 255 ? 5 : \
+                (b) > 127 ? 4 : \
+                (b) >  17 ? 3 : 1)
+#endif  
+
+
+
  /* Pentium pro 16,16,16,32,64 */
  /* Alpha       16,16,16,16.64 */
  #define BN_MULL_SIZE_NORMAL                    (16) /* 32 */
diff --git a/crypto/buffer/Makefile.ssl b/crypto/buffer/Makefile.ssl

index bbcba1f5d170596a1012c48dddceea4fa67843ec..741c1ee85aebaaa13cb213d5c329b31ce86777ab 100644 (file)
--- a/crypto/buffer/Makefile.ssl
+++ b/crypto/buffer/Makefile.ssl
@@ -78,10 +78,13 @@ clean:
  
  # DO NOT DELETE THIS LINE -- make depend depends on it.
  
-buf_err.o: ../../include/openssl/buffer.h ../../include/openssl/err.h
+buf_err.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+buf_err.o: ../../include/openssl/crypto.h ../../include/openssl/err.h
+buf_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslv.h
+buf_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
  buffer.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  buffer.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  buffer.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-buffer.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-buffer.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-buffer.o: ../cryptlib.h
+buffer.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+buffer.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+buffer.o: ../../include/openssl/stack.h ../cryptlib.h
diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile.ssl

index 0c253e17a62a2c80662594f92afe5a16e0a16428..2d026ca8ba7f48da863d94ee1436a9d9e3a54ba7 100644 (file)
--- a/crypto/des/Makefile.ssl
+++ b/crypto/des/Makefile.ssl
@@ -162,13 +162,15 @@ ede_cbcm_enc.o: ../../include/openssl/opensslconf.h des_locl.h
  enc_read.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  enc_read.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  enc_read.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-enc_read.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+enc_read.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+enc_read.o: ../../include/openssl/opensslconf.h
  enc_read.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  enc_read.o: ../../include/openssl/stack.h ../cryptlib.h des_locl.h
  enc_writ.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  enc_writ.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  enc_writ.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-enc_writ.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+enc_writ.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+enc_writ.o: ../../include/openssl/opensslconf.h
  enc_writ.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
  enc_writ.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
  enc_writ.o: ../cryptlib.h des_locl.h
@@ -193,7 +195,8 @@ read2pwd.o: ../../include/openssl/opensslconf.h des_locl.h
  read_pwd.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  read_pwd.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  read_pwd.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-read_pwd.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+read_pwd.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+read_pwd.o: ../../include/openssl/opensslconf.h
  read_pwd.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  read_pwd.o: ../../include/openssl/stack.h ../cryptlib.h des_locl.h
  rpc_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
diff --git a/crypto/dh/Makefile.ssl b/crypto/dh/Makefile.ssl

index d76d03a43c271834bab001ce9568b5f29cfa4f6f..c2e70fa2bec68f2523c367cc8f25184d656b5328 100644 (file)
--- a/crypto/dh/Makefile.ssl
+++ b/crypto/dh/Makefile.ssl
@@ -82,35 +82,36 @@ dh_check.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  dh_check.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  dh_check.o: ../../include/openssl/dh.h ../../include/openssl/e_os.h
  dh_check.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-dh_check.o: ../../include/openssl/opensslconf.h
+dh_check.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
  dh_check.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  dh_check.o: ../../include/openssl/stack.h ../cryptlib.h
-dh_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-dh_err.o: ../../include/openssl/dh.h ../../include/openssl/err.h
+dh_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+dh_err.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
+dh_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  dh_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
  dh_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
  dh_gen.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  dh_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  dh_gen.o: ../../include/openssl/dh.h ../../include/openssl/e_os.h
  dh_gen.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-dh_gen.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-dh_gen.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-dh_gen.o: ../cryptlib.h
+dh_gen.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+dh_gen.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+dh_gen.o: ../../include/openssl/stack.h ../cryptlib.h
  dh_key.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  dh_key.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  dh_key.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  dh_key.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  dh_key.o: ../../include/openssl/engine.h ../../include/openssl/err.h
-dh_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-dh_key.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-dh_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-dh_key.o: ../cryptlib.h
+dh_key.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+dh_key.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
+dh_key.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+dh_key.o: ../../include/openssl/stack.h ../cryptlib.h
  dh_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  dh_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  dh_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  dh_lib.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  dh_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h
-dh_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-dh_lib.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-dh_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-dh_lib.o: ../cryptlib.h
+dh_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+dh_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
+dh_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+dh_lib.o: ../../include/openssl/stack.h ../cryptlib.h
diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h

index 85e66b09ef3e8426478cea86961b2cb34b9d1605..7a8d9f88c2ebdb0d6171dec75cbb85710274e03f 100644 (file)
--- a/crypto/dh/dh.h
+++ b/crypto/dh/dh.h
@@ -63,6 +63,9 @@
  #error DH is disabled.
  #endif
  
+#ifndef NO_BIO
+#include <openssl/bio.h>
+#endif
  #include <openssl/bn.h>
  #include <openssl/crypto.h>
         
@@ -178,7 +181,7 @@ int i2d_DHparams(DH *a,unsigned char **pp);
  #ifndef NO_FP_API
  int    DHparams_print_fp(FILE *fp, DH *x);
  #endif
-#ifdef HEADER_BIO_H
+#ifndef NO_BIO
  int    DHparams_print(BIO *bp, DH *x);
  #else
  int    DHparams_print(char *bp, DH *x);
diff --git a/crypto/dsa/Makefile.ssl b/crypto/dsa/Makefile.ssl

index c04351c2567e34744db1434b7a83f71ad02d9337..4b75ec6a0fc1b2605c69a5f7295d2079e2db6915 100644 (file)
--- a/crypto/dsa/Makefile.ssl
+++ b/crypto/dsa/Makefile.ssl
@@ -85,45 +85,51 @@ dsa_asn1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  dsa_asn1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  dsa_asn1.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  dsa_asn1.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-dsa_asn1.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+dsa_asn1.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+dsa_asn1.o: ../../include/openssl/opensslconf.h
  dsa_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  dsa_asn1.o: ../../include/openssl/stack.h ../cryptlib.h
-dsa_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-dsa_err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-dsa_err.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+dsa_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+dsa_err.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
+dsa_err.o: ../../include/openssl/dsa.h ../../include/openssl/err.h
+dsa_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
  dsa_err.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  dsa_err.o: ../../include/openssl/stack.h
  dsa_gen.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  dsa_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  dsa_gen.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  dsa_gen.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-dsa_gen.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-dsa_gen.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-dsa_gen.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-dsa_gen.o: ../../include/openssl/stack.h ../cryptlib.h
+dsa_gen.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+dsa_gen.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+dsa_gen.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+dsa_gen.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+dsa_gen.o: ../cryptlib.h
  dsa_key.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  dsa_key.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  dsa_key.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  dsa_key.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-dsa_key.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-dsa_key.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-dsa_key.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-dsa_key.o: ../../include/openssl/stack.h ../cryptlib.h
+dsa_key.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+dsa_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+dsa_key.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+dsa_key.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+dsa_key.o: ../cryptlib.h
  dsa_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  dsa_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  dsa_lib.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
  dsa_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  dsa_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
-dsa_lib.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-dsa_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-dsa_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-dsa_lib.o: ../../include/openssl/stack.h ../cryptlib.h
+dsa_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+dsa_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+dsa_lib.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+dsa_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+dsa_lib.o: ../cryptlib.h
  dsa_ossl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  dsa_ossl.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  dsa_ossl.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
  dsa_ossl.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  dsa_ossl.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
-dsa_ossl.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+dsa_ossl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+dsa_ossl.o: ../../include/openssl/opensslconf.h
  dsa_ossl.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
  dsa_ossl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
  dsa_ossl.o: ../../include/openssl/stack.h ../cryptlib.h
@@ -132,7 +138,8 @@ dsa_sign.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  dsa_sign.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
  dsa_sign.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  dsa_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
-dsa_sign.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+dsa_sign.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+dsa_sign.o: ../../include/openssl/opensslconf.h
  dsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
  dsa_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
  dsa_sign.o: ../../include/openssl/stack.h ../cryptlib.h
@@ -142,7 +149,7 @@ dsa_vrf.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  dsa_vrf.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  dsa_vrf.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  dsa_vrf.o: ../../include/openssl/engine.h ../../include/openssl/err.h
-dsa_vrf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-dsa_vrf.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-dsa_vrf.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-dsa_vrf.o: ../cryptlib.h
+dsa_vrf.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+dsa_vrf.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
+dsa_vrf.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+dsa_vrf.o: ../../include/openssl/stack.h ../cryptlib.h
diff --git a/crypto/dsa/dsa.h b/crypto/dsa/dsa.h

index 9aa2480d90af15834ad07e32d0821034d10e16b5..65689a34266150c46177d1347dcdda8277e3fdd8 100644 (file)
--- a/crypto/dsa/dsa.h
+++ b/crypto/dsa/dsa.h
@@ -69,6 +69,9 @@
  #error DSA is disabled.
  #endif
  
+#ifndef NO_BIO
+#include <openssl/bio.h>
+#endif
  #include <openssl/bn.h>
  #include <openssl/crypto.h>
  #ifndef NO_DH
@@ -200,7 +203,7 @@ int i2d_DSAPublicKey(DSA *a, unsigned char **pp);
  int    i2d_DSAPrivateKey(DSA *a, unsigned char **pp);
  int    i2d_DSAparams(DSA *a,unsigned char **pp);
  
-#ifdef HEADER_BIO_H
+#ifndef NO_BIO
  int    DSAparams_print(BIO *bp, DSA *x);
  int    DSA_print(BIO *bp, DSA *x, int off);
  #endif
diff --git a/crypto/dso/Makefile.ssl b/crypto/dso/Makefile.ssl

index c551069204809c37fa380254fe98d1154dc783e2..b070a77850c6b2dc5dc4fe600a9ad044cf873ee1 100644 (file)
--- a/crypto/dso/Makefile.ssl
+++ b/crypto/dso/Makefile.ssl
@@ -83,40 +83,47 @@ clean:
  dso_dl.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  dso_dl.o: ../../include/openssl/crypto.h ../../include/openssl/dso.h
  dso_dl.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-dso_dl.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-dso_dl.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-dso_dl.o: ../../include/openssl/stack.h ../cryptlib.h
+dso_dl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+dso_dl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+dso_dl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+dso_dl.o: ../cryptlib.h
  dso_dlfcn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  dso_dlfcn.o: ../../include/openssl/crypto.h ../../include/openssl/dso.h
  dso_dlfcn.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-dso_dlfcn.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+dso_dlfcn.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+dso_dlfcn.o: ../../include/openssl/opensslconf.h
  dso_dlfcn.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  dso_dlfcn.o: ../../include/openssl/stack.h ../cryptlib.h
-dso_err.o: ../../include/openssl/crypto.h ../../include/openssl/dso.h
-dso_err.o: ../../include/openssl/err.h ../../include/openssl/opensslv.h
+dso_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
+dso_err.o: ../../include/openssl/dso.h ../../include/openssl/err.h
+dso_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslv.h
  dso_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
  dso_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  dso_lib.o: ../../include/openssl/crypto.h ../../include/openssl/dso.h
  dso_lib.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-dso_lib.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-dso_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-dso_lib.o: ../../include/openssl/stack.h ../cryptlib.h
+dso_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+dso_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+dso_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+dso_lib.o: ../cryptlib.h
  dso_null.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  dso_null.o: ../../include/openssl/crypto.h ../../include/openssl/dso.h
  dso_null.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-dso_null.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+dso_null.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+dso_null.o: ../../include/openssl/opensslconf.h
  dso_null.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  dso_null.o: ../../include/openssl/stack.h ../cryptlib.h
  dso_openssl.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  dso_openssl.o: ../../include/openssl/crypto.h ../../include/openssl/dso.h
  dso_openssl.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-dso_openssl.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+dso_openssl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+dso_openssl.o: ../../include/openssl/opensslconf.h
  dso_openssl.o: ../../include/openssl/opensslv.h
  dso_openssl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
  dso_openssl.o: ../cryptlib.h
  dso_win32.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  dso_win32.o: ../../include/openssl/crypto.h ../../include/openssl/dso.h
  dso_win32.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-dso_win32.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+dso_win32.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+dso_win32.o: ../../include/openssl/opensslconf.h
  dso_win32.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  dso_win32.o: ../../include/openssl/stack.h ../cryptlib.h
diff --git a/crypto/engine/Makefile.ssl b/crypto/engine/Makefile.ssl

index 86754a9c5d80c2cc33e9a091968cbe15c6ae5572..ec23152e729262dd64a6e5e371120e0486a38d66 100644 (file)
--- a/crypto/engine/Makefile.ssl
+++ b/crypto/engine/Makefile.ssl
@@ -23,9 +23,9 @@ APPS=
  
  LIB=$(TOP)/libcrypto.a
  LIBSRC= engine_err.c engine_lib.c engine_list.c engine_openssl.c \
-       hw_cswift.c
+       hw_cswift.c hw_ncipher.c
  LIBOBJ= engine_err.o engine_lib.o engine_list.o engine_openssl.o \
-       hw_cswift.o
+       hw_cswift.o hw_ncipher.o
  
  SRC= $(LIBSRC)
  
@@ -80,9 +80,10 @@ clean:
  
  # DO NOT DELETE THIS LINE -- make depend depends on it.
  
-engine_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-engine_err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-engine_err.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+engine_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+engine_err.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
+engine_err.o: ../../include/openssl/dsa.h ../../include/openssl/engine.h
+engine_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  engine_err.o: ../../include/openssl/opensslconf.h
  engine_err.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
  engine_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
@@ -92,7 +93,7 @@ engine_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  engine_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  engine_lib.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  engine_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h
-engine_lib.o: ../../include/openssl/opensslconf.h
+engine_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
  engine_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
  engine_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
  engine_lib.o: ../../include/openssl/stack.h ../cryptlib.h engine_int.h
@@ -101,6 +102,7 @@ engine_list.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  engine_list.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  engine_list.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  engine_list.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+engine_list.o: ../../include/openssl/lhash.h
  engine_list.o: ../../include/openssl/opensslconf.h
  engine_list.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
  engine_list.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
@@ -110,7 +112,7 @@ engine_openssl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  engine_openssl.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  engine_openssl.o: ../../include/openssl/dso.h ../../include/openssl/e_os.h
  engine_openssl.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
-engine_openssl.o: ../../include/openssl/err.h
+engine_openssl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  engine_openssl.o: ../../include/openssl/opensslconf.h
  engine_openssl.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
  engine_openssl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
@@ -120,7 +122,18 @@ hw_cswift.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  hw_cswift.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  hw_cswift.o: ../../include/openssl/dso.h ../../include/openssl/e_os.h
  hw_cswift.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
-hw_cswift.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+hw_cswift.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+hw_cswift.o: ../../include/openssl/opensslconf.h
  hw_cswift.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
  hw_cswift.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
  hw_cswift.o: ../../include/openssl/stack.h ../cryptlib.h engine_int.h
+hw_ncipher.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+hw_ncipher.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+hw_ncipher.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+hw_ncipher.o: ../../include/openssl/dso.h ../../include/openssl/e_os.h
+hw_ncipher.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
+hw_ncipher.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+hw_ncipher.o: ../../include/openssl/opensslconf.h
+hw_ncipher.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
+hw_ncipher.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+hw_ncipher.o: ../../include/openssl/stack.h ../cryptlib.h engine_int.h
diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h

index 5b24e1208bdc73f7808305b406b15dd0be6d68e0..ac1c3420bcd13c81ba2df6dc88b38acc45517644 100644 (file)
--- a/crypto/engine/engine.h
+++ b/crypto/engine/engine.h
@@ -287,6 +287,13 @@ void ERR_load_ENGINE_strings(void);
  #define ENGINE_F_ENGINE_SET_NAME                        130
  #define ENGINE_F_ENGINE_SET_RAND                        131
  #define ENGINE_F_ENGINE_SET_RSA                                 132
+#define ENGINE_F_HWCRHK_FINISH                          135
+#define ENGINE_F_HWCRHK_INIT                            136
+#define ENGINE_F_HWCRHK_MOD_EXP                                 137
+#define ENGINE_F_HWCRHK_MOD_EXP_CRT                     138
+#define ENGINE_F_HWCRHK_RAND_BYTES                      139
+#define ENGINE_F_HWCRHK_RSA_MOD_EXP                     140
+#define ENGINE_F_LOG_MESSAGE                            141
  
  /* Reason codes. */
  #define ENGINE_R_ALREADY_LOADED                                 100
@@ -297,14 +304,17 @@ void ERR_load_ENGINE_strings(void);
  #define ENGINE_R_ENGINE_IS_NOT_IN_LIST                  105
  #define ENGINE_R_FINISH_FAILED                          106
  #define ENGINE_R_GET_HANDLE_FAILED                      107
+#define ENGINE_R_HWCRYPTOHOOK_REPORTS                   119
  #define ENGINE_R_ID_OR_NAME_MISSING                     108
  #define ENGINE_R_INIT_FAILED                            109
  #define ENGINE_R_INTERNAL_LIST_ERROR                    110
  #define ENGINE_R_MISSING_KEY_COMPONENTS                         111
+#define ENGINE_R_NOT_INITIALISED                        117
  #define ENGINE_R_NOT_LOADED                             112
  #define ENGINE_R_NO_SUCH_ENGINE                                 116
  #define ENGINE_R_PROVIDE_PARAMETERS                     113
  #define ENGINE_R_REQUEST_FAILED                                 114
+#define ENGINE_R_REQUEST_FALLBACK                       118
  #define ENGINE_R_UNIT_FAILURE                           115
  
  #ifdef  __cplusplus
diff --git a/crypto/engine/engine_err.c b/crypto/engine/engine_err.c

index 6f7c2c68ee4a09ce9d3aba74579f6bf850f7d4e7..91527a762191b562f4dd8ceb57687d5d0c04dedf 100644 (file)
--- a/crypto/engine/engine_err.c
+++ b/crypto/engine/engine_err.c
@@ -101,6 +101,13 @@ static ERR_STRING_DATA ENGINE_str_functs[]=
  {ERR_PACK(0,ENGINE_F_ENGINE_SET_NAME,0),       "ENGINE_set_name"},
  {ERR_PACK(0,ENGINE_F_ENGINE_SET_RAND,0),       "ENGINE_set_RAND"},
  {ERR_PACK(0,ENGINE_F_ENGINE_SET_RSA,0),        "ENGINE_set_RSA"},
+{ERR_PACK(0,ENGINE_F_HWCRHK_FINISH,0), "hwcrhk_finish"},
+{ERR_PACK(0,ENGINE_F_HWCRHK_INIT,0),   "hwcrhk_init"},
+{ERR_PACK(0,ENGINE_F_HWCRHK_MOD_EXP,0),        "hwcrhk_mod_exp"},
+{ERR_PACK(0,ENGINE_F_HWCRHK_MOD_EXP_CRT,0),    "hwcrhk_mod_exp_crt"},
+{ERR_PACK(0,ENGINE_F_HWCRHK_RAND_BYTES,0),     "hwcrhk_rand_bytes"},
+{ERR_PACK(0,ENGINE_F_HWCRHK_RSA_MOD_EXP,0),    "hwcrhk_rsa_mod_exp"},
+{ERR_PACK(0,ENGINE_F_LOG_MESSAGE,0),   "log_message"},
  {0,NULL}
         };
  
@@ -114,14 +121,17 @@ static ERR_STRING_DATA ENGINE_str_reasons[]=
  {ENGINE_R_ENGINE_IS_NOT_IN_LIST          ,"engine is not in the list"},
  {ENGINE_R_FINISH_FAILED                  ,"finish failed"},
  {ENGINE_R_GET_HANDLE_FAILED              ,"could not obtain hardware handle"},
+{ENGINE_R_HWCRYPTOHOOK_REPORTS           ,"hwcryptohook reports"},
  {ENGINE_R_ID_OR_NAME_MISSING             ,"'id' or 'name' missing"},
  {ENGINE_R_INIT_FAILED                    ,"init failed"},
  {ENGINE_R_INTERNAL_LIST_ERROR            ,"internal list error"},
  {ENGINE_R_MISSING_KEY_COMPONENTS         ,"missing key components"},
+{ENGINE_R_NOT_INITIALISED                ,"not initialised"},
  {ENGINE_R_NOT_LOADED                     ,"not loaded"},
  {ENGINE_R_NO_SUCH_ENGINE                 ,"no such engine"},
  {ENGINE_R_PROVIDE_PARAMETERS             ,"provide parameters"},
  {ENGINE_R_REQUEST_FAILED                 ,"request failed"},
+{ENGINE_R_REQUEST_FALLBACK               ,"request fallback"},
  {ENGINE_R_UNIT_FAILURE                   ,"unit failure"},
  {0,NULL}
         };
diff --git a/crypto/engine/hw_ncipher.c b/crypto/engine/hw_ncipher.c

new file mode 100644 (file)

index 0000000..e285c05
--- /dev/null
+++ b/crypto/engine/hw_ncipher.c
@@ -0,0 +1,703 @@
+/* crypto/engine/hw_ncipher.c -*- mode: C; c-file-style: "eay" -*- */
+/* Written by Richard Levitte (richard@levitte.org), Geoff Thorpe
+ * (geoff@geoffthorpe.net) and Dr Stephen N Henson (shenson@bigfoot.com)
+ * for the OpenSSL project 2000.
+ */
+/* ====================================================================
+ * Copyright (c) 1999 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
+ *    licensing@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).
+ *
+ */
+
+#include <stdio.h>
+#include <openssl/crypto.h>
+#include "cryptlib.h"
+#include <openssl/dso.h>
+#include "engine_int.h"
+#include <openssl/engine.h>
+
+#ifdef HW_NCIPHER
+
+/* Attribution notice: nCipher har said several times that it's OK for
+ * us to implement a general interface to their boxes, and recently declared
+ * their HWCryptoHook to be public, adn therefore available for us to use.
+ * Thanks, nCipher.
+ *
+ * The hwcryptohook.h included here is from May 2000.
+ * [Richard Levitte]
+ */
+#include "vendor_defns/hwcryptohook.h"
+
+static int hwcrhk_init();
+static int hwcrhk_finish();
+
+#if 0 /* Not yet supported */
+/* Functions to handle mutexes */
+static int hwcrhk_mutex_init(HWCryptoHook_Mutex*, HWCryptoHook_CallerContext*);
+static int hwcrhk_mutex_lock(HWCryptoHook_Mutex*);
+static void hwcrhk_mutex_unlock(HWCryptoHook_Mutex*);
+static void hwcrhk_mutex_destroy(HWCryptoHook_Mutex*);
+#endif
+
+/* BIGNUM stuff */
+static int hwcrhk_mod_exp(BIGNUM *r, BIGNUM *a, const BIGNUM *p,
+               const BIGNUM *m, BN_CTX *ctx);
+
+/* RSA stuff */
+static int hwcrhk_rsa_mod_exp(BIGNUM *r, BIGNUM *I, RSA *rsa);
+/* This function is aliased to mod_exp (with the mont stuff dropped). */
+static int hwcrhk_mod_exp_mont(BIGNUM *r, BIGNUM *a, const BIGNUM *p,
+               const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+
+/* DH stuff */
+/* This function is alised to mod_exp (with the DH and mont dropped). */
+static int hwcrhk_mod_exp_dh(DH *dh, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
+               const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+
+/* RAND stuff */
+static int hwcrhk_rand_bytes(unsigned char *buf, int num);
+
+/* KM stuff */
+static void hwcrhk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
+       int index,long argl, void *argp);
+
+
+/* Our internal RSA_METHOD that we provide pointers to */
+static RSA_METHOD hwcrhk_rsa =
+       {
+       "nCipher RSA method",
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       hwcrhk_rsa_mod_exp,
+       hwcrhk_mod_exp_mont,
+       NULL,
+       NULL,
+       0,
+       NULL,
+       NULL,
+       NULL
+       };
+
+/* Our internal DH_METHOD that we provide pointers to */
+static DH_METHOD hwcrhk_dh =
+       {
+       "nCipher DH method",
+       NULL,
+       NULL,
+       hwcrhk_mod_exp_dh,
+       NULL,
+       NULL,
+       0,
+       NULL
+       };
+
+static RAND_METHOD hwcrhk_rand =
+       {
+       /* "nCipher RAND method", */
+       NULL,
+       hwcrhk_rand_bytes,
+       NULL,
+       NULL,
+       hwcrhk_rand_bytes,
+       NULL
+       };
+
+/* Our ENGINE structure. */
+static ENGINE engine_hwcrhk =
+        {
+       "hwcrhk",
+       "nCipher hardware engine support",
+       &hwcrhk_rsa,
+       NULL,
+       &hwcrhk_dh,
+       &hwcrhk_rand,
+       hwcrhk_mod_exp,
+       NULL,
+       hwcrhk_init,
+       hwcrhk_finish,
+       0, /* no flags */
+       0, 0, /* no references */
+       NULL, NULL /* unlinked */
+        };
+
+/* Internal stuff for HWCryptoHook */
+
+/* Some structures needed for proper use of thread locks */
+/* hwcryptohook.h has some typedefs that turn struct HWCryptoHook_MutexValue
+   into HWCryptoHook_Mutex */
+struct HWCryptoHook_MutexValue
+       {
+       int lockid;
+       };
+
+/* hwcryptohook.h has some typedefs that turn
+   struct HWCryptoHook_PassphraseContextValue
+   into HWCryptoHook_PassphraseContext */
+struct HWCryptoHook_PassphraseContextValue
+       {
+       void *any;
+       };
+
+/* hwcryptohook.h has some typedefs that turn
+   struct HWCryptoHook_CallerContextValue
+   into HWCryptoHook_CallerContext */
+struct HWCryptoHook_CallerContextValue
+       {
+       void *any;
+       };
+
+/* The MPI structure in HWCryptoHook is pretty compatible with OpenSSL
+   BIGNUM's, so lets define a couple of conversion macros */
+#define BN2MPI(mp, bn) \
+    {mp.size = bn->top * sizeof(BN_ULONG); mp.buf = (unsigned char *)bn->d;}
+#define MPI2BN(bn, mp) \
+    {mp.size = bn->max * sizeof(BN_ULONG); mp.buf = (unsigned char *)bn->d;}
+
+#if 0 /* Card and password management is not yet supported */
+/* HWCryptoHook callbacks.  insert_cart() and get_pass() are not yet
+   defined, because we haven't quite decided on the proper form yet.
+   log_message() just adds an entry in the error stack.  I don't know
+   if that's good or bad...  */
+static int insert_card(const char *prompt_info,
+       const char *wrong_info,
+       HWCryptoHook_PassphraseContext *ppctx,
+       HWCryptoHook_CallerContext *cactx);
+static int get_pass(const char *prompt_info,
+       int *len_io, char *buf,
+       HWCryptoHook_PassphraseContext *ppctx,
+       HWCryptoHook_CallerContext *cactx);
+#endif
+static void log_message(void *logstream, const char *message);
+
+/* Stuff to pass to the HWCryptoHook library */
+static HWCryptoHook_InitInfo hwcrhk_globals = {
+       0,                      /* Flags */
+       NULL,                   /* logstream */
+       sizeof(BN_ULONG),       /* limbsize */
+       0,                      /* mslimb first: false for BNs */
+       -1,                     /* msbyte first: use native */
+       0,                      /* Max mutexes, 0 = no small limit */
+       0,                      /* Max simultaneous, 0 = default */
+
+       /* The next few are mutex stuff: we write wrapper functions
+          round the OS mutex functions.
+          Currently, the support in OpenSSL is just not good enough,
+          so this part is currently skipped, but worked on. */
+       sizeof(HWCryptoHook_Mutex),
+       0, /* hwcrhk_mutex_init, */
+       0, /* hwcrhk_mutex_lock, */
+       0, /* hwcrhk_mutex_unlock, */
+       0, /* hwcrhk_mutex_destroy, */
+
+       /* The next few are condvar stuff: we write wrapper functions
+          round the OS functions.  Currently not implemented and not
+          and absolute necessity even in threaded programs, therefore
+          0'ed.  Will hopefully be implemented some day, since it
+          enhances the efficiency of HWCryptoHook.  */
+       0, /* sizeof(HWCryptoHook_CondVar), */
+       0, /* hwcrhk_cv_init, */
+       0, /* hwcrhk_cv_wait, */
+       0, /* hwcrhk_cv_signal, */
+       0, /* hwcrhk_cv_broadcast, */
+       0, /* hwcrhk_cv_destroy, */
+
+       0, /* get_pass, */      /* pass phrase */
+       0, /* insert_card, */   /* insert a card */
+       log_message             /* Log message */
+};
+
+
+/* Now, to our own code */
+
+/* As this is only ever called once, there's no need for locking
+ * (indeed - the lock will already be held by our caller!!!) */
+ENGINE *ENGINE_hwcrhk()
+       {
+       RSA_METHOD *meth1;
+       DH_METHOD *meth2;
+
+       /* We know that the "PKCS1_SSLeay()" functions hook properly
+        * to the cswift-specific mod_exp and mod_exp_crt so we use
+        * those functions. NB: We don't use ENGINE_openssl() or
+        * anything "more generic" because something like the RSAref
+        * code may not hook properly, and if you own one of these
+        * cards then you have the right to do RSA operations on it
+        * anyway! */ 
+       meth1 = RSA_PKCS1_SSLeay();
+       hwcrhk_rsa.rsa_pub_enc = meth1->rsa_pub_enc;
+       hwcrhk_rsa.rsa_pub_dec = meth1->rsa_pub_dec;
+       hwcrhk_rsa.rsa_priv_enc = meth1->rsa_priv_enc;
+       hwcrhk_rsa.rsa_priv_dec = meth1->rsa_priv_dec;
+
+       /* Much the same for Diffie-Hellman */
+       meth2 = DH_OpenSSL();
+       hwcrhk_dh.generate_key = meth2->generate_key;
+       hwcrhk_dh.compute_key = meth2->compute_key;
+       return &engine_hwcrhk;
+       }
+
+/* This is a process-global DSO handle used for loading and unloading
+ * the HWCryptoHook library. NB: This is only set (or unset) during an
+ * init() or finish() call (reference counts permitting) and they're
+ * operating with global locks, so this should be thread-safe
+ * implicitly. */
+static DSO *hwcrhk_dso = NULL;
+static HWCryptoHook_ContextHandle hwcrhk_context = 0;
+static int hndidx = -1;        /* Index for KM handle.  Not really used yet. */
+
+/* These are the function pointers that are (un)set when the library has
+ * successfully (un)loaded. */
+HWCryptoHook_Init_t *p_hwcrhk_Init = NULL;
+HWCryptoHook_Finish_t *p_hwcrhk_Finish = NULL;
+HWCryptoHook_ModExp_t *p_hwcrhk_ModExp = NULL;
+HWCryptoHook_RSA_t *p_hwcrhk_RSA = NULL;
+HWCryptoHook_RandomBytes_t *p_hwcrhk_RandomBytes = NULL;
+HWCryptoHook_RSAUnloadKey_t *p_hwcrhk_RSAUnloadKey = NULL;
+HWCryptoHook_ModExpCRT_t *p_hwcrhk_ModExpCRT = NULL;
+
+/* Used in the DSO operations. */
+static const char *HWCRHK_LIBNAME = "nfhwcrhk";
+static const char *n_hwcrhk_Init = "HWCryptoHook_Init";
+static const char *n_hwcrhk_Finish = "HWCryptoHook_Finish";
+static const char *n_hwcrhk_ModExp = "HWCryptoHook_ModExp";
+static const char *n_hwcrhk_RSA = "HWCryptoHook_RSA";
+static const char *n_hwcrhk_RandomBytes = "HWCryptoHook_RandomBytes";
+static const char *n_hwcrhk_RSAUnloadKey = "HWCryptoHook_RSAUnloadKey";
+static const char *n_hwcrhk_ModExpCRT = "HWCryptoHook_ModExpCRT";
+
+/* HWCryptoHook library functions and mechanics - these are used by the
+ * higher-level functions further down. NB: As and where there's no
+ * error checking, take a look lower down where these functions are
+ * called, the checking and error handling is probably down there. */
+
+/* utility function to obtain a context */
+static int get_context(HWCryptoHook_ContextHandle *hac)
+       {
+       char tempbuf[1024];
+       HWCryptoHook_ErrMsgBuf rmsg;
+
+       rmsg.buf = tempbuf;
+       rmsg.size = 1024;
+
+        *hac = p_hwcrhk_Init(&hwcrhk_globals, sizeof(hwcrhk_globals), &rmsg,
+               NULL);
+       if (!*hac)
+                return 0;
+        return 1;
+       }
+ 
+/* similarly to release one. */
+static void release_context(HWCryptoHook_ContextHandle hac)
+       {
+       p_hwcrhk_Finish(hac);
+       }
+
+/* (de)initialisation functions. */
+static int hwcrhk_init()
+       {
+       HWCryptoHook_Init_t *p1;
+       HWCryptoHook_Finish_t *p2;
+       HWCryptoHook_ModExp_t *p3;
+       HWCryptoHook_RSA_t *p4;
+       HWCryptoHook_RSAUnloadKey_t *p5;
+       HWCryptoHook_RandomBytes_t *p6;
+       HWCryptoHook_ModExpCRT_t *p7;
+
+       if(hwcrhk_dso != NULL)
+               {
+               ENGINEerr(ENGINE_F_HWCRHK_INIT,ENGINE_R_ALREADY_LOADED);
+               goto err;
+               }
+       /* Attempt to load libnfhwcrhk.so/nfhwcrhk.dll/whatever. */
+       hwcrhk_dso = DSO_load(NULL, HWCRHK_LIBNAME, NULL,
+               DSO_FLAG_NAME_TRANSLATION);
+       if(hwcrhk_dso == NULL)
+               {
+               ENGINEerr(ENGINE_F_HWCRHK_INIT,ENGINE_R_DSO_FAILURE);
+               goto err;
+               }
+       if(!(p1 = DSO_bind(hwcrhk_dso, n_hwcrhk_Init)) ||
+               !(p2 = DSO_bind(hwcrhk_dso, n_hwcrhk_Finish)) ||
+               !(p3 = DSO_bind(hwcrhk_dso, n_hwcrhk_ModExp)) ||
+               !(p4 = DSO_bind(hwcrhk_dso, n_hwcrhk_RSA)) ||
+               !(p5 = DSO_bind(hwcrhk_dso, n_hwcrhk_RSAUnloadKey)) ||
+               !(p6 = DSO_bind(hwcrhk_dso, n_hwcrhk_RandomBytes)) ||
+               !(p7 = DSO_bind(hwcrhk_dso, n_hwcrhk_ModExpCRT)))
+               {
+               ENGINEerr(ENGINE_F_HWCRHK_INIT,ENGINE_R_DSO_FAILURE);
+               goto err;
+               }
+       /* Copy the pointers */
+       p_hwcrhk_Init = p1;
+       p_hwcrhk_Finish = p2;
+       p_hwcrhk_ModExp = p3;
+       p_hwcrhk_RSA = p4;
+       p_hwcrhk_RSAUnloadKey = p5;
+       p_hwcrhk_RandomBytes = p6;
+       p_hwcrhk_ModExpCRT = p7;
+       /* Try and get a context - if not, we may have a DSO but no
+        * accelerator! */
+       if(!get_context(&hwcrhk_context))
+               {
+               ENGINEerr(ENGINE_F_HWCRHK_INIT,ENGINE_R_UNIT_FAILURE);
+               goto err;
+               }
+       /* Everything's fine. */
+       hndidx = RSA_get_ex_new_index(0, "nFast HWCryptoHook RSA key handle",
+               NULL, NULL, hwcrhk_ex_free);
+       return 1;
+err:
+       if(hwcrhk_dso)
+               DSO_free(hwcrhk_dso);
+       return 0;
+       }
+
+static int hwcrhk_finish()
+       {
+       if(hwcrhk_dso == NULL)
+               {
+               ENGINEerr(ENGINE_F_HWCRHK_FINISH,ENGINE_R_NOT_LOADED);
+               return 0;
+               }
+       release_context(hwcrhk_context);
+       if(!DSO_free(hwcrhk_dso))
+               {
+               ENGINEerr(ENGINE_F_HWCRHK_FINISH,ENGINE_R_DSO_FAILURE);
+               return 0;
+               }
+       hwcrhk_dso = NULL;
+       p_hwcrhk_Init = NULL;
+       p_hwcrhk_Finish = NULL;
+       p_hwcrhk_ModExp = NULL;
+       p_hwcrhk_RSA = NULL;
+       p_hwcrhk_RSAUnloadKey = NULL;
+       p_hwcrhk_ModExpCRT = NULL;
+       p_hwcrhk_RandomBytes = NULL;
+       return 1;
+       }
+
+/* A little mod_exp */
+static int hwcrhk_mod_exp(BIGNUM *r, BIGNUM *a, const BIGNUM *p,
+                       const BIGNUM *m, BN_CTX *ctx)
+       {
+       char tempbuf[1024];
+       HWCryptoHook_ErrMsgBuf rmsg;
+       /* Since HWCryptoHook_MPI is pretty compatible with BIGNUM's,
+          we use them directly, plus a little macro magic.  We only
+          thing we need to make sure of is that enough space is allocated. */
+       HWCryptoHook_MPI m_a, m_p, m_n, m_r;
+       int to_return, ret;
+ 
+       to_return = 0; /* expect failure */
+       rmsg.buf = tempbuf;
+       rmsg.size = 1024;
+
+       if(!hwcrhk_context)
+               {
+               ENGINEerr(ENGINE_F_HWCRHK_MOD_EXP,ENGINE_R_NOT_INITIALISED);
+               goto err;
+               }
+       /* Prepare the params */
+       bn_expand2(r, m->top);  /* Check for error !! */
+       BN2MPI(m_a, a);
+       BN2MPI(m_p, p);
+       BN2MPI(m_n, m);
+       MPI2BN(r, m_r);
+
+       /* Perform the operation */
+       ret = p_hwcrhk_ModExp(hwcrhk_context, m_a, m_p, m_n, &m_r, &rmsg);
+
+       /* Convert the response */
+       r->top = m_r.size / sizeof(BN_ULONG);
+       bn_fix_top(r);
+
+       if (ret < 0)
+               {
+               /* FIXME: When this error is returned, HWCryptoHook is
+                  telling us that falling back to software computation
+                  might be a good thing. */
+               if(ret == HWCRYPTOHOOK_ERROR_FALLBACK)
+                       {
+                       ENGINEerr(ENGINE_F_HWCRHK_MOD_EXP,ENGINE_R_REQUEST_FALLBACK);
+                       }
+               else
+                       {
+                       ENGINEerr(ENGINE_F_HWCRHK_MOD_EXP,ENGINE_R_REQUEST_FAILED);
+                       }
+               ERR_add_error_data(1,rmsg.buf);
+               goto err;
+               }
+
+       to_return = 1;
+err:
+       return to_return;
+       }
+ 
+static int hwcrhk_rsa_mod_exp(BIGNUM *r, BIGNUM *I, RSA *rsa)
+       {
+       char tempbuf[1024];
+       HWCryptoHook_ErrMsgBuf rmsg;
+       HWCryptoHook_RSAKeyHandle *hptr;
+       int to_return = 0, ret;
+
+       if(!rsa->p || !rsa->q || !rsa->dmp1 || !rsa->dmq1 || !rsa->iqmp)
+               {
+               ENGINEerr(ENGINE_F_HWCRHK_RSA_MOD_EXP,ENGINE_R_MISSING_KEY_COMPONENTS);
+               goto err;
+               }
+       if(!hwcrhk_context)
+               {
+               ENGINEerr(ENGINE_F_HWCRHK_MOD_EXP,ENGINE_R_NOT_INITIALISED);
+               goto err;
+               }
+
+       /* This provides support for nForce keys.  Since that's opaque data
+          all we do is provide a handle to the proper key and let HWCryptoHook
+          take care of the rest. */
+       if ((hptr = (HWCryptoHook_RSAKeyHandle *) RSA_get_ex_data(rsa, hndidx))
+               != NULL)
+               {
+               HWCryptoHook_MPI m_a, m_r;
+
+               rmsg.buf = tempbuf;
+               rmsg.size = 1024;
+
+               /* Prepare the params */
+               bn_expand2(r, rsa->n->top); /* Check for error !! */
+               BN2MPI(m_a, I);
+               MPI2BN(r, m_r);
+
+               /* Perform the operation */
+               ret = p_hwcrhk_RSA(m_a, *hptr, &m_r, &rmsg);
+
+               /* Convert the response */
+               r->top = m_r.size / sizeof(BN_ULONG);
+               bn_fix_top(r);
+
+               if (ret < 0)
+                       {
+                       /* FIXME: When this error is returned, HWCryptoHook is
+                          telling us that falling back to software computation
+                          might be a good thing. */
+                       if(ret == HWCRYPTOHOOK_ERROR_FALLBACK)
+                               {
+                               ENGINEerr(ENGINE_F_HWCRHK_RSA_MOD_EXP,ENGINE_R_REQUEST_FALLBACK);
+                               }
+                       else
+                               {
+                               ENGINEerr(ENGINE_F_HWCRHK_RSA_MOD_EXP,ENGINE_R_REQUEST_FAILED);
+                               }
+                       ERR_add_error_data(1,rmsg.buf);
+                       goto err;
+                       }
+               }
+       else
+               {
+               HWCryptoHook_MPI m_a, m_p, m_q, m_dmp1, m_dmq1, m_iqmp, m_r;
+
+               rmsg.buf = tempbuf;
+               rmsg.size = 1024;
+
+               /* Prepare the params */
+               bn_expand2(r, rsa->n->top); /* Check for error !! */
+               BN2MPI(m_a, I);
+               BN2MPI(m_p, rsa->p);
+               BN2MPI(m_q, rsa->q);
+               BN2MPI(m_dmp1, rsa->dmp1);
+               BN2MPI(m_dmq1, rsa->dmq1);
+               BN2MPI(m_iqmp, rsa->iqmp);
+               MPI2BN(r, m_r);
+
+               /* Perform the operation */
+               ret = p_hwcrhk_ModExpCRT(hwcrhk_context, m_a, m_p, m_q,
+                       m_dmp1, m_dmq1, m_iqmp, &m_r, NULL);
+
+               /* Convert the response */
+               r->top = m_r.size / sizeof(BN_ULONG);
+               bn_fix_top(r);
+
+               if (ret < 0)
+                       {
+                       /* FIXME: When this error is returned, HWCryptoHook is
+                          telling us that falling back to software computation
+                          might be a good thing. */
+                       if(ret == HWCRYPTOHOOK_ERROR_FALLBACK)
+                               {
+                               ENGINEerr(ENGINE_F_HWCRHK_RSA_MOD_EXP,ENGINE_R_REQUEST_FALLBACK);
+                               }
+                       else
+                               {
+                               ENGINEerr(ENGINE_F_HWCRHK_RSA_MOD_EXP,ENGINE_R_REQUEST_FAILED);
+                               }
+                       ERR_add_error_data(1,rmsg.buf);
+                       goto err;
+                       }
+               }
+err:
+       return to_return;
+       }
+
+/* This function is aliased to mod_exp (with the mont stuff dropped). */
+static int hwcrhk_mod_exp_mont(BIGNUM *r, BIGNUM *a, const BIGNUM *p,
+               const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
+       {
+       return hwcrhk_mod_exp(r, a, p, m, ctx);
+       }
+
+/* This function is aliased to mod_exp (with the dh and mont dropped). */
+static int hwcrhk_mod_exp_dh(DH *dh, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
+               const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
+       {
+       return hwcrhk_mod_exp(r, a, p, m, ctx);
+       }
+
+/* Random bytes are good */
+static int hwcrhk_rand_bytes(unsigned char *buf, int num)
+       {
+       char tempbuf[1024];
+       HWCryptoHook_ErrMsgBuf rmsg;
+       int to_return = 0; /* assume failure */
+       int ret;
+
+       rmsg.buf = tempbuf;
+       rmsg.size = 1024;
+
+       if(!hwcrhk_context)
+               {
+               ENGINEerr(ENGINE_F_HWCRHK_RAND_BYTES,ENGINE_R_NOT_INITIALISED);
+               goto err;
+               }
+
+       ret = p_hwcrhk_RandomBytes(hwcrhk_context, buf, num, &rmsg);
+       if (ret < 0)
+               {
+               /* FIXME: When this error is returned, HWCryptoHook is
+                  telling us that falling back to software computation
+                  might be a good thing. */
+               if(ret == HWCRYPTOHOOK_ERROR_FALLBACK)
+                       {
+                       ENGINEerr(ENGINE_F_HWCRHK_RAND_BYTES,ENGINE_R_REQUEST_FALLBACK);
+                       }
+               else
+                       {
+                       ENGINEerr(ENGINE_F_HWCRHK_RAND_BYTES,ENGINE_R_REQUEST_FAILED);
+                       }
+               ERR_add_error_data(1,rmsg.buf);
+               goto err;
+               }
+       to_return = 1;
+ err:
+       return to_return;
+       }
+
+/* This cleans up an RSA KM key, called when ex_data is freed */
+
+static void hwcrhk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
+       int index,long argl, void *argp)
+{
+       char tempbuf[1024];
+       HWCryptoHook_ErrMsgBuf rmsg;
+       HWCryptoHook_RSAKeyHandle *hptr;
+       int ret;
+
+       rmsg.buf = tempbuf;
+       rmsg.size = 1024;
+
+       hptr = (HWCryptoHook_RSAKeyHandle *) item;
+       if(!hptr) return;
+       ret = p_hwcrhk_RSAUnloadKey(*hptr, NULL);
+       OPENSSL_free(hptr);
+}
+
+#if 0 /* FIXME: We don't really have any support for dynamically allocated
+        threads in OpenSSL. */
+/* Mutex calls: since the HWCryptoHook model closely follows the POSIX model
+ * these just wrap the POSIX functions and add some logging.
+ */
+
+static int hwcrhk_mutex_init(HWCryptoHook_Mutex* mt, HWCryptoHook_CallerContext *cactx)
+{
+    int ret;
+    ret = CRYPTO_init_lock(mt->lockid, NULL);
+    return ret;
+}
+
+static int hwcrhk_mutex_lock(HWCryptoHook_Mutex *mt)
+{
+    int ret;
+    ret = CRYPTO_w_lock(mt->lockid);
+    return ret;
+}
+
+void hwcrhk_mutex_unlock(HWCryptoHook_Mutex * mt)
+{
+    int ret;
+    ret = CRYPTO_w_unlock(mt->lockid);
+}
+
+
+static void hwcrhk_mutex_destroy(HWCryptoHook_Mutex *mt)
+{
+    int ret;
+    ret = CRYPTO_destroy_lock(mt->lockid);
+}
+#endif
+
+static void log_message(void *logstream, const char *message)
+       {
+       ENGINEerr(ENGINE_F_LOG_MESSAGE,ENGINE_R_HWCRYPTOHOOK_REPORTS);
+       ERR_add_error_data(1,message);
+       }
+
+#endif /* HW_NCIPHER */
+
diff --git a/crypto/engine/vendor_defns/hwcryptohook.h b/crypto/engine/vendor_defns/hwcryptohook.h

new file mode 100644 (file)

index 0000000..4f534af
--- /dev/null
+++ b/crypto/engine/vendor_defns/hwcryptohook.h
@@ -0,0 +1,476 @@
+/*
+ * ModExp / RSA (with/without KM) plugin API
+ *
+ * The application will load a dynamic library which
+ * exports entrypoint(s) defined in this file.
+ *
+ * This set of entrypoints provides only a multithreaded,
+ * synchronous-within-each-thread, facility.
+ *
+ *
+ * This file is Copyright 1998-1999 nCipher Corporation Limited.
+ *
+ * This file is provided for your information and assistance.  You are
+ * permitted to copy it verbatim, to use it to create compatible
+ * software, and for review and comment.  However, you may not
+ * distribute changed versions or other derivative works.  All other
+ * rights are reserved.
+ *
+ * IN NO EVENT SHALL NCIPHER CORPORATION LIMITED (`NCIPHER') AND/OR
+ * ANY OTHER AUTHORS OR DISTRIBUTORS OF THIS FILE BE LIABLE for any
+ * damages arising directly or indirectly from this file, its use or
+ * this licence.  Without prejudice to the generality of the
+ * foregoing: all liability shall be excluded for direct, indirect,
+ * special, incidental, consequential or other damages or any loss of
+ * profits, business, revenue goodwill or anticipated savings;
+ * liability shall be excluded even if nCipher or anyone else has been
+ * advised of the possibility of damage.  In any event, if the
+ * exclusion of liability is not effective, the liability of nCipher
+ * or any author or distributor shall be limited to the lesser of the
+ * price paid and 1,000 pounds sterling. This licence only fails to
+ * exclude or limit liability for death or personal injury arising out
+ * of negligence, and only to the extent that such an exclusion or
+ * limitation is not effective.
+ *
+ * NCIPHER AND THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ALL
+ * AND ANY WARRANTIES (WHETHER EXPRESS OR IMPLIED), including, but not
+ * limited to, any implied warranties of merchantability, fitness for
+ * a particular purpose, satisfactory quality, and/or non-infringement
+ * of any third party rights.
+ *
+ * US Government use: This software and documentation is Commercial
+ * Computer Software and Computer Software Documentation, as defined in
+ * sub-paragraphs (a)(1) and (a)(5) of DFAR 252.227-7014, "Rights in
+ * Noncommercial Computer Software and Noncommercial Computer Software
+ * Documentation."  Use, duplication or disclosure by the Government is
+ * subject to the terms and conditions specified here.
+ *
+ * By using or distributing this file you will be accepting these
+ * terms and conditions, including the limitation of liability and
+ * lack of warranty.  If you do not wish to accept these terms and
+ * conditions, DO NOT USE THE FILE.
+ *
+ *
+ * The actual dynamically loadable plugin, and the library files for
+ * static linking, which are also provided in this distribution, are
+ * not covered by the licence described above.  You should have
+ * received a separate licence with terms and conditions for these
+ * library files; if you received the library files without a licence,
+ * please contact nCipher.
+ *
+ *
+ * $Id: hwcryptohook.h,v 1.1.2.1 2000/06/13 16:19:53 levitte Exp $
+ */
+
+#ifndef HWCRYPTOHOOK_H
+#define HWCRYPTOHOOK_H
+
+#include <sys/types.h>
+#include <stdio.h>
+
+#ifndef HWCRYPTOHOOK_DECLARE_APPTYPES
+#define HWCRYPTOHOOK_DECLARE_APPTYPES 1
+#endif
+
+#define HWCRYPTOHOOK_ERROR_FAILED   -1
+#define HWCRYPTOHOOK_ERROR_FALLBACK -2
+#define HWCRYPTOHOOK_ERROR_MPISIZE  -3
+
+#if HWCRYPTOHOOK_DECLARE_APPTYPES
+
+/* These structs are defined by the application and opaque to the
+ * crypto plugin.  The application may define these as it sees fit.
+ * Default declarations are provided here, but the application may
+ *  #define HWCRYPTOHOOK_DECLARE_APPTYPES 0
+ * to prevent these declarations, and instead provide its own
+ * declarations of these types.  (Pointers to them must still be
+ * ordinary pointers to structs or unions, or the resulting combined
+ * program will have a type inconsistency.)
+ */
+typedef struct HWCryptoHook_MutexValue HWCryptoHook_Mutex;
+typedef struct HWCryptoHook_CondVarValue HWCryptoHook_CondVar;
+typedef struct HWCryptoHook_PassphraseContextValue HWCryptoHook_PassphraseContext;
+typedef struct HWCryptoHook_CallerContextValue HWCryptoHook_CallerContext;
+
+#endif /* HWCRYPTOHOOK_DECLARE_APPTYPES */
+
+/* These next two structs are opaque to the application.  The crypto
+ * plugin will return pointers to them; the caller simply manipulates
+ * the pointers.
+ */
+typedef struct HWCryptoHook_Context *HWCryptoHook_ContextHandle;
+typedef struct HWCryptoHook_RSAKey *HWCryptoHook_RSAKeyHandle;
+
+typedef struct {
+  char *buf;
+  size_t size;
+} HWCryptoHook_ErrMsgBuf;
+/* Used for error reporting.  When a HWCryptoHook function fails it
+ * will return a sentinel value (0 for pointer-valued functions, or a
+ * negative number, usually HWCRYPTOHOOK_ERROR_FAILED, for
+ * integer-valued ones).  It will, if an ErrMsgBuf is passed, also put
+ * an error message there.
+ * 
+ * size is the size of the buffer.  When the buffer is filled, it will
+ * always be null-terminated.  If you pass 0 buf buf you must pass 0
+ * for size, and nothing will be recorded (just as if you passed 0 for
+ * the struct pointer).  Size will not be modified when an error is
+ * recorded.  The buffer is always null-terminated even if there is an
+ * overrun.
+ *
+ * The contents of the buffer are not defined if there is no error.
+ */
+
+typedef struct HWCryptoHook_MPIStruct {
+  unsigned char *buf;
+  size_t size;
+} HWCryptoHook_MPI;
+/* When one of these is returned, a pointer is passed to the function.
+ * At call, size is the space available.  Afterwards it is updated.
+ * buf (the pointer) is not updated.  size is in bytes and may be
+ * zero, but must be a multiple of the limb size.  Zero limbs at the
+ * MS end are not permitted.
+ */
+
+#define HWCryptoHook_InitFlags_FallbackModExp    0x0002UL
+#define HWCryptoHook_InitFlags_FallbackRSAImmed  0x0004UL
+/* Enable requesting fallback to software in case of problems with the
+ * hardware support.  This indicates to the crypto provider that the
+ * application is prepared to fall back to software operation if the
+ * ModExp* or RSAImmed* functions return HWCRYPTOHOOK_ERROR_FALLBACK.
+ * Without this flag those calls will never return
+ * HWCRYPTOHOOK_ERROR_FALLBACK.  The flag will also cause the crypto
+ * provider to avoid repeatedly attempting to contact dead hardware
+ * within a short interval, if appropriate.
+ */
+
+#define HWCryptoHook_InitFlags_SimpleForkCheck   0x0010UL
+/* Without _SimpleForkCheck the library is allowed to assume that the
+ * application will not fork and call the library in the child(ren).
+ *
+ * When it is specified, this is allowed.  However, after a fork
+ * neither parent nor child may unload any loaded keys or call
+ * _Finish.  Instead, they should call exit (or die with a signal)
+ * without calling _Finish.  After all the children have died the
+ * parent may unload keys or call _Finish.
+ *
+ * This flag only has any effect on UN*X platforms.
+ */
+
+typedef struct {
+  unsigned long flags;
+  void *logstream; /* usually a FILE*.  See below. */
+
+  size_t limbsize; /* bignum format - size of radix type, must be power of 2 */
+  int mslimbfirst; /* 0 or 1 */
+  int msbytefirst; /* 0 or 1; -1 = native */
+
+  /* All the callback functions should return 0 on success, or a
+   * nonzero integer (whose value will be visible in the error message
+   * put in the buffer passed to the call).
+   *
+   * If a callback is not available pass a null function pointer.
+   *
+   * The callbacks may not call down again into the crypto plugin.
+   */
+  
+  /* For thread-safety.  Set everything to 0 if you promise only to be
+   * singlethreaded.  maxsimultaneous is the number of calls to
+   * ModExp[Crt]/RSAImmed{Priv,Pub}/RSA.  If you don't know what to
+   * put there then say 0 and the hook library will use a default.
+   *
+   * maxmutexes is a small limit on the number of simultaneous mutexes
+   * which will be requested by the library.  If there is no small
+   * limit, set it to 0.  If the crypto plugin cannot create the
+   * advertised number of mutexes the calls to its functions may fail.
+   * If a low number of mutexes is advertised the plugin will try to
+   * do the best it can.  Making larger numbers of mutexes available
+   * may improve performance and parallelism by reducing contention
+   * over critical sections.  Unavailability of any mutexes, implying
+   * single-threaded operation, should be indicated by the setting
+   * mutex_init et al to 0.
+   */
+  int maxmutexes;
+  int maxsimultaneous;
+  size_t mutexsize;
+  int (*mutex_init)(HWCryptoHook_Mutex*, HWCryptoHook_CallerContext *cactx);
+  int (*mutex_acquire)(HWCryptoHook_Mutex*);
+  void (*mutex_release)(HWCryptoHook_Mutex*);
+  void (*mutex_destroy)(HWCryptoHook_Mutex*);
+
+  /* For greater efficiency, can use condition vars internally for
+   * synchronisation.  In this case maxsimultaneous is ignored, but
+   * the other mutex stuff must be available.  In singlethreaded
+   * programs, set everything to 0.
+   */
+  size_t condvarsize;
+  int (*condvar_init)(HWCryptoHook_CondVar*, HWCryptoHook_CallerContext *cactx);
+  int (*condvar_wait)(HWCryptoHook_CondVar*, HWCryptoHook_Mutex*);
+  void (*condvar_signal)(HWCryptoHook_CondVar*);
+  void (*condvar_broadcast)(HWCryptoHook_CondVar*);
+  void (*condvar_destroy)(HWCryptoHook_CondVar*);
+  
+  /* The semantics of acquiring and releasing mutexes and broadcasting
+   * and waiting on condition variables are expected to be those from
+   * POSIX threads (pthreads).  The mutexes may be (in pthread-speak)
+   * fast mutexes, recursive mutexes, or nonrecursive ones.
+   * 
+   * The _release/_signal/_broadcast and _destroy functions must
+   * always succeed when given a valid argument; if they are given an
+   * invalid argument then the program (crypto plugin + application)
+   * has an internal error, and they should abort the program.
+   */
+
+  int (*getpassphrase)(const char *prompt_info,
+                      int *len_io, char *buf,
+                      HWCryptoHook_PassphraseContext *ppctx,
+                      HWCryptoHook_CallerContext *cactx);
+  /* Passphrases and the prompt_info, if they contain high-bit-set
+   * characters, are UTF-8.  The prompt_info may be a null pointer if
+   * no prompt information is available (it should not be an empty
+   * string).  It will not contain text like `enter passphrase';
+   * instead it might say something like `Operator Card for John
+   * Smith' or `SmartCard in nFast Module #1, Slot #1'.
+   *
+   * buf points to a buffer in which to return the passphrase; on
+   * entry *len_io is the length of the buffer.  It should be updated
+   * by the callback.  The returned passphrase should not be
+   * null-terminated by the callback.
+   */
+  
+  int (*getphystoken)(const char *prompt_info,
+                     const char *wrong_info,
+                     HWCryptoHook_PassphraseContext *ppctx,
+                     HWCryptoHook_CallerContext *cactx);
+  /* Requests that the human user physically insert a different
+   * smartcard, DataKey, etc.  The plugin should check whether the
+   * currently inserted token(s) are appropriate, and if they are it
+   * should not make this call.
+   *
+   * prompt_info is as before.  wrong_info is a description of the
+   * currently inserted token(s) so that the user is told what
+   * something is.  wrong_info, like prompt_info, may be null, but
+   * should not be an empty string.  Its contents should be
+   * syntactically similar to that of prompt_info. 
+   */
+  
+  /* Note that a single LoadKey operation might cause several calls to
+   * getpassphrase and/or requestphystoken.  If requestphystoken is
+   * not provided (ie, a null pointer is passed) then the plugin may
+   * not support loading keys for which authorisation by several cards
+   * is required.  If getpassphrase is not provided then cards with
+   * passphrases may not be supported.
+   *
+   * getpassphrase and getphystoken do not need to check that the
+   * passphrase has been entered correctly or the correct token
+   * inserted; the crypto plugin will do that.  If this is not the
+   * case then the crypto plugin is responsible for calling these
+   * routines again as appropriate until the correct token(s) and
+   * passphrase(s) are supplied as required, or until any retry limits
+   * implemented by the crypto plugin are reached.
+   *
+   * In either case, the application must allow the user to say `no'
+   * or `cancel' to indicate that they do not know the passphrase or
+   * have the appropriate token; this should cause the callback to
+   * return nonzero indicating error.
+   */
+
+  void (*logmessage)(void *logstream, const char *message);
+  /* A log message will be generated at least every time something goes
+   * wrong and an ErrMsgBuf is filled in (or would be if one was
+   * provided).  Other diagnostic information may be written there too,
+   * including more detailed reasons for errors which are reported in an
+   * ErrMsgBuf.
+   *
+   * When a log message is generated, this callback is called.  It
+   * should write a message to the relevant logging arrangements.
+   *
+   * The message string passed will be null-terminated and may be of arbitrary
+   * length.  It will not be prefixed by the time and date, nor by the
+   * name of the library that is generating it - if this is required,
+   * the logmessage callback must do it.  The message will not have a
+   * trailing newline (though it may contain internal newlines).
+   *
+   * If a null pointer is passed for logmessage a default function is
+   * used.  The default function treats logstream as a FILE* which has
+   * been converted to a void*.  If logstream is 0 it does nothing.
+   * Otherwise it prepends the date and time and library name and
+   * writes the message to logstream.  Each line will be prefixed by a
+   * descriptive string containing the date, time and identity of the
+   * crypto plugin.  Errors on the logstream are not reported
+   * anywhere, and the default function doesn't flush the stream, so
+   * the application must set the buffering how it wants it.
+   *
+   * The crypto plugin may also provide a facility to have copies of
+   * log messages sent elsewhere, and or for adjusting the verbosity
+   * of the log messages; any such facilities will be configured by
+   * external means.
+   */
+
+} HWCryptoHook_InitInfo;
+
+typedef
+HWCryptoHook_ContextHandle HWCryptoHook_Init_t(const HWCryptoHook_InitInfo *initinfo,
+                                              size_t initinfosize,
+                                              HWCryptoHook_ErrMsgBuf *errors,
+                                              HWCryptoHook_CallerContext *cactx);
+extern HWCryptoHook_Init_t HWCryptoHook_Init;
+
+/* Caller should set initinfosize to the size of the HWCryptoHook struct,
+ * so it can be extended later.
+ *
+ * On success, a message for display or logging by the server,
+ * including the name and version number of the plugin, will be filled
+ * in into *errors; on failure *errors is used for error handling, as
+ * usual.
+ */
+
+/* All these functions return 0 on success, HWCRYPTOHOOK_ERROR_FAILED
+ * on most failures.  HWCRYPTOHOOK_ERROR_MPISIZE means at least one of
+ * the output MPI buffer(s) was too small; the sizes of all have been
+ * set to the desired size (and for those where the buffer was large
+ * enough, the value may have been copied in), and no error message
+ * has been recorded.
+ *
+ * You may pass 0 for the errors struct.  In any case, unless you set
+ * _NoStderr at init time then messages may be reported to stderr.
+ */
+
+/* The RSAImmed* functions (and key managed RSA) only work with
+ * modules which have an RSA patent licence - currently that means KM
+ * units; the ModExp* ones work with all modules, so you need a patent
+ * licence in the software in the US.
+ */
+
+typedef
+void HWCryptoHook_Finish_t(HWCryptoHook_ContextHandle hwctx);
+extern HWCryptoHook_Finish_t HWCryptoHook_Finish;
+/* You must not have any calls going or keys loaded when you call this. */
+
+typedef
+int HWCryptoHook_RandomBytes_t(HWCryptoHook_ContextHandle hwctx,
+                              unsigned char *buf, size_t len,
+                              const HWCryptoHook_ErrMsgBuf *errors);
+extern HWCryptoHook_RandomBytes_t HWCryptoHook_RandomBytes;
+
+typedef
+int HWCryptoHook_ModExp_t(HWCryptoHook_ContextHandle hwctx,
+                         HWCryptoHook_MPI a,
+                         HWCryptoHook_MPI p,
+                         HWCryptoHook_MPI n,
+                         HWCryptoHook_MPI *r,
+                         const HWCryptoHook_ErrMsgBuf *errors);
+extern HWCryptoHook_ModExp_t HWCryptoHook_ModExp;
+
+typedef
+int HWCryptoHook_RSAImmedPub_t(HWCryptoHook_ContextHandle hwctx,
+                              HWCryptoHook_MPI m,
+                              HWCryptoHook_MPI e,
+                              HWCryptoHook_MPI n,
+                              HWCryptoHook_MPI *r,
+                              const HWCryptoHook_ErrMsgBuf *errors);
+extern HWCryptoHook_RSAImmedPub_t HWCryptoHook_RSAImmedPub;
+
+typedef
+int HWCryptoHook_ModExpCRT_t(HWCryptoHook_ContextHandle hwctx,
+                            HWCryptoHook_MPI a,
+                            HWCryptoHook_MPI p,
+                            HWCryptoHook_MPI q,
+                            HWCryptoHook_MPI dmp1,
+                            HWCryptoHook_MPI dmq1,
+                            HWCryptoHook_MPI iqmp,
+                            HWCryptoHook_MPI *r,
+                            const HWCryptoHook_ErrMsgBuf *errors);
+extern HWCryptoHook_ModExpCRT_t HWCryptoHook_ModExpCRT;
+
+typedef
+int HWCryptoHook_RSAImmedPriv_t(HWCryptoHook_ContextHandle hwctx,
+                               HWCryptoHook_MPI m,
+                               HWCryptoHook_MPI p,
+                               HWCryptoHook_MPI q,
+                               HWCryptoHook_MPI dmp1,
+                               HWCryptoHook_MPI dmq1,
+                               HWCryptoHook_MPI iqmp,
+                               HWCryptoHook_MPI *r,
+                               const HWCryptoHook_ErrMsgBuf *errors);
+extern HWCryptoHook_RSAImmedPriv_t HWCryptoHook_RSAImmedPriv;
+
+/* The RSAImmed* and ModExp* functions may return E_FAILED or
+ * E_FALLBACK for failure.
+ *
+ * E_FAILED means the failure is permanent and definite and there
+ *    should be no attempt to fall back to software.  (Eg, for some
+ *    applications, which support only the acceleration-only
+ *    functions, the `key material' may actually be an encoded key
+ *    identifier, and doing the operation in software would give wrong
+ *    answers.)
+ *
+ * E_FALLBACK means that doing the computation in software would seem
+ *    reasonable.  If an application pays attention to this and is
+ *    able to fall back, it should also set the Fallback init flags.
+ */
+
+typedef
+int HWCryptoHook_RSALoadKey_t(HWCryptoHook_ContextHandle hwctx,
+                             const char *key_ident,
+                             HWCryptoHook_RSAKeyHandle *keyhandle_r,
+                             const HWCryptoHook_ErrMsgBuf *errors,
+                             HWCryptoHook_PassphraseContext *ppctx);
+extern HWCryptoHook_RSALoadKey_t HWCryptoHook_RSALoadKey;
+/* The key_ident is a null-terminated string configured by the
+ * user via the application's usual configuration mechanisms.
+ * It is provided to the user by the crypto provider's key management
+ * system.  The user must be able to enter at least any string of between
+ * 1 and 1023 characters inclusive, consisting of printable 7-bit
+ * ASCII characters.  The provider should avoid using
+ * any characters except alphanumerics and the punctuation
+ * characters  _ - + . / @ ~  (the user is expected to be able
+ * to enter these without quoting).  The string may be case-sensitive.
+ * The application may allow the user to enter other NULL-terminated strings,
+ * and the provider must cope (returning an error if the string is not
+ * valid).
+ *
+ * If the key does not exist, it is _not_ an error - in that case,
+ * keyhandle_r will be set to 0 instead of to a key handle.
+ */
+
+typedef
+int HWCryptoHook_RSAGetPublicKey_t(HWCryptoHook_RSAKeyHandle k,
+                                  HWCryptoHook_MPI *n,
+                                  HWCryptoHook_MPI *e,
+                                  const HWCryptoHook_ErrMsgBuf *errors);
+extern HWCryptoHook_RSAGetPublicKey_t HWCryptoHook_RSAGetPublicKey;
+/* The crypto plugin will not store certificates.
+ *
+ * Although this function for acquiring the public key value is
+ * provided, it is not the purpose of this API to deal fully with the
+ * handling of the public key.
+ *
+ * It is expected that the crypto supplier's key generation program
+ * will provide general facilities for producing X.509
+ * self-certificates and certificate requests in PEM format.  These
+ * will be given to the user so that they can configure them in the
+ * application, send them to CAs, or whatever.
+ *
+ * In case this kind of certificate handling is not appropriate, the
+ * crypto supplier's key generation program should be able to be
+ * configured not to generate such a self-certificate or certificate
+ * request.  Then the application will need to do all of this, and
+ * will need to store and handle the public key and certificates
+ * itself.
+ */
+
+typedef
+int HWCryptoHook_RSAUnloadKey_t(HWCryptoHook_RSAKeyHandle k,
+                               const HWCryptoHook_ErrMsgBuf *errors);
+extern HWCryptoHook_RSAUnloadKey_t HWCryptoHook_RSAUnloadKey;
+/* Might fail due to locking problems, or other serious internal problems. */
+
+typedef
+int HWCryptoHook_RSA_t(HWCryptoHook_MPI m,
+                      HWCryptoHook_RSAKeyHandle k,
+                      HWCryptoHook_MPI *r,
+                      const HWCryptoHook_ErrMsgBuf *errors);
+extern HWCryptoHook_RSA_t HWCryptoHook_RSA;
+
+#endif /*HWCRYPTOHOOK_H*/
diff --git a/crypto/err/err.h b/crypto/err/err.h

index 3b1b980d4fa943ceff714e12f0ec9aeab83214e5..7388a4a937e1dffbcd21b3e0553cbe467fdb3bde 100644 (file)
--- a/crypto/err/err.h
+++ b/crypto/err/err.h
@@ -64,6 +64,13 @@
  #include <stdlib.h>
  #endif
  
+#ifndef NO_BIO
+#include <openssl/bio.h>
+#endif
+#ifndef NO_LHASH
+#include <openssl/lhash.h>
+#endif
+
  #ifdef __cplusplus
  extern "C" {
  #endif
@@ -244,7 +251,7 @@ const char *ERR_reason_error_string(unsigned long e);
  #ifndef NO_FP_API
  void ERR_print_errors_fp(FILE *fp);
  #endif
-#ifdef HEADER_BIO_H
+#ifndef NO_BIO
  void ERR_print_errors(BIO *bp);
  void ERR_add_error_data(int num, ...);
  #endif
@@ -256,7 +263,7 @@ void ERR_free_strings(void);
  void ERR_remove_state(unsigned long pid); /* if zero we look it up */
  ERR_STATE *ERR_get_state(void);
  
-#ifdef HEADER_LHASH_H
+#ifndef NO_LHASH
  LHASH *ERR_get_string_table(void);
  LHASH *ERR_get_err_state_table(void); /* even less thread-safe than
                                        * ERR_get_string_table :-) */
diff --git a/crypto/evp/Makefile.ssl b/crypto/evp/Makefile.ssl

index de43060eafbcaa5bb66aec6b10b0439fbe3164b1..0bfcf3cf36bb1dc346795ccc57babc2a9803cd8b 100644 (file)
--- a/crypto/evp/Makefile.ssl
+++ b/crypto/evp/Makefile.ssl
@@ -104,14 +104,15 @@ bio_b64.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  bio_b64.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  bio_b64.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  bio_b64.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-bio_b64.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-bio_b64.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-bio_b64.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-bio_b64.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-bio_b64.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-bio_b64.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-bio_b64.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-bio_b64.o: ../../include/openssl/stack.h ../cryptlib.h
+bio_b64.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+bio_b64.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+bio_b64.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+bio_b64.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bio_b64.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+bio_b64.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+bio_b64.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+bio_b64.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+bio_b64.o: ../cryptlib.h
  bio_enc.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  bio_enc.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  bio_enc.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -119,14 +120,15 @@ bio_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  bio_enc.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  bio_enc.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  bio_enc.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-bio_enc.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-bio_enc.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-bio_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-bio_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-bio_enc.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-bio_enc.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-bio_enc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-bio_enc.o: ../../include/openssl/stack.h ../cryptlib.h
+bio_enc.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+bio_enc.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+bio_enc.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+bio_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bio_enc.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+bio_enc.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+bio_enc.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+bio_enc.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+bio_enc.o: ../cryptlib.h
  bio_md.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  bio_md.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  bio_md.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -134,14 +136,15 @@ bio_md.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  bio_md.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  bio_md.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  bio_md.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-bio_md.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-bio_md.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-bio_md.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-bio_md.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-bio_md.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-bio_md.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-bio_md.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-bio_md.o: ../../include/openssl/stack.h ../cryptlib.h
+bio_md.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+bio_md.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+bio_md.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+bio_md.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bio_md.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+bio_md.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+bio_md.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+bio_md.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+bio_md.o: ../cryptlib.h
  bio_ok.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  bio_ok.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  bio_ok.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -149,15 +152,15 @@ bio_ok.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  bio_ok.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  bio_ok.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  bio_ok.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-bio_ok.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-bio_ok.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-bio_ok.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-bio_ok.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-bio_ok.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-bio_ok.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-bio_ok.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-bio_ok.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-bio_ok.o: ../cryptlib.h
+bio_ok.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+bio_ok.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+bio_ok.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+bio_ok.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+bio_ok.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+bio_ok.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+bio_ok.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+bio_ok.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+bio_ok.o: ../../include/openssl/stack.h ../cryptlib.h
  c_all.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  c_all.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  c_all.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -165,14 +168,15 @@ c_all.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  c_all.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  c_all.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  c_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-c_all.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-c_all.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-c_all.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-c_all.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-c_all.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-c_all.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-c_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-c_all.o: ../../include/openssl/stack.h ../cryptlib.h
+c_all.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+c_all.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+c_all.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+c_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+c_all.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+c_all.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+c_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+c_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+c_all.o: ../cryptlib.h
  c_allc.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  c_allc.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  c_allc.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -180,16 +184,17 @@ c_allc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  c_allc.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  c_allc.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  c_allc.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-c_allc.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-c_allc.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-c_allc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-c_allc.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
-c_allc.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-c_allc.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-c_allc.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-c_allc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-c_allc.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-c_allc.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+c_allc.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+c_allc.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+c_allc.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+c_allc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+c_allc.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+c_allc.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+c_allc.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+c_allc.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+c_allc.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+c_allc.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+c_allc.o: ../cryptlib.h
  c_alld.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  c_alld.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  c_alld.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -197,16 +202,17 @@ c_alld.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  c_alld.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  c_alld.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  c_alld.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-c_alld.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-c_alld.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-c_alld.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-c_alld.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
-c_alld.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-c_alld.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-c_alld.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-c_alld.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-c_alld.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-c_alld.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+c_alld.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+c_alld.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+c_alld.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+c_alld.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+c_alld.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+c_alld.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+c_alld.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+c_alld.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+c_alld.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+c_alld.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+c_alld.o: ../cryptlib.h
  digest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  digest.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  digest.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -214,14 +220,15 @@ digest.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  digest.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  digest.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  digest.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-digest.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-digest.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-digest.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-digest.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-digest.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-digest.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-digest.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-digest.o: ../../include/openssl/stack.h ../cryptlib.h
+digest.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+digest.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+digest.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+digest.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+digest.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+digest.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+digest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+digest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+digest.o: ../cryptlib.h
  e_bf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  e_bf.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  e_bf.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -229,14 +236,15 @@ e_bf.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  e_bf.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  e_bf.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  e_bf.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-e_bf.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-e_bf.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-e_bf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-e_bf.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-e_bf.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-e_bf.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_bf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-e_bf.o: ../../include/openssl/stack.h ../cryptlib.h evp_locl.h
+e_bf.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+e_bf.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+e_bf.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+e_bf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+e_bf.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+e_bf.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+e_bf.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_bf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h ../cryptlib.h
+e_bf.o: evp_locl.h
  e_cast.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  e_cast.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  e_cast.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -244,14 +252,15 @@ e_cast.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  e_cast.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  e_cast.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  e_cast.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-e_cast.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-e_cast.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-e_cast.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-e_cast.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-e_cast.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-e_cast.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_cast.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-e_cast.o: ../../include/openssl/stack.h ../cryptlib.h evp_locl.h
+e_cast.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+e_cast.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+e_cast.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+e_cast.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+e_cast.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+e_cast.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+e_cast.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_cast.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_cast.o: ../cryptlib.h evp_locl.h
  e_des.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  e_des.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  e_des.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -259,14 +268,15 @@ e_des.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  e_des.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  e_des.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  e_des.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-e_des.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-e_des.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-e_des.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-e_des.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-e_des.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-e_des.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_des.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-e_des.o: ../../include/openssl/stack.h ../cryptlib.h evp_locl.h
+e_des.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+e_des.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+e_des.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+e_des.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+e_des.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+e_des.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+e_des.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_des.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_des.o: ../cryptlib.h evp_locl.h
  e_des3.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  e_des3.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  e_des3.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -274,14 +284,15 @@ e_des3.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  e_des3.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  e_des3.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  e_des3.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-e_des3.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-e_des3.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-e_des3.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-e_des3.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-e_des3.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-e_des3.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_des3.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-e_des3.o: ../../include/openssl/stack.h ../cryptlib.h evp_locl.h
+e_des3.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+e_des3.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+e_des3.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+e_des3.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+e_des3.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+e_des3.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+e_des3.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_des3.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_des3.o: ../cryptlib.h evp_locl.h
  e_idea.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  e_idea.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  e_idea.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -289,14 +300,15 @@ e_idea.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  e_idea.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  e_idea.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  e_idea.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-e_idea.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-e_idea.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-e_idea.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-e_idea.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-e_idea.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-e_idea.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_idea.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-e_idea.o: ../../include/openssl/stack.h ../cryptlib.h evp_locl.h
+e_idea.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+e_idea.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+e_idea.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+e_idea.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+e_idea.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+e_idea.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+e_idea.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_idea.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_idea.o: ../cryptlib.h evp_locl.h
  e_null.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  e_null.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  e_null.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -304,14 +316,15 @@ e_null.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  e_null.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  e_null.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  e_null.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-e_null.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-e_null.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-e_null.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-e_null.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-e_null.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-e_null.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_null.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-e_null.o: ../../include/openssl/stack.h ../cryptlib.h
+e_null.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+e_null.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+e_null.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+e_null.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+e_null.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+e_null.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+e_null.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_null.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_null.o: ../cryptlib.h
  e_rc2.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  e_rc2.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  e_rc2.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -319,14 +332,15 @@ e_rc2.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  e_rc2.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  e_rc2.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  e_rc2.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-e_rc2.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-e_rc2.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-e_rc2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-e_rc2.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-e_rc2.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-e_rc2.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_rc2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-e_rc2.o: ../../include/openssl/stack.h ../cryptlib.h evp_locl.h
+e_rc2.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+e_rc2.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+e_rc2.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+e_rc2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+e_rc2.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+e_rc2.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+e_rc2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_rc2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_rc2.o: ../cryptlib.h evp_locl.h
  e_rc4.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  e_rc4.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  e_rc4.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -334,14 +348,15 @@ e_rc4.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  e_rc4.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  e_rc4.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  e_rc4.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-e_rc4.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-e_rc4.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-e_rc4.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-e_rc4.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-e_rc4.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-e_rc4.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_rc4.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-e_rc4.o: ../../include/openssl/stack.h ../cryptlib.h
+e_rc4.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+e_rc4.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+e_rc4.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+e_rc4.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+e_rc4.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+e_rc4.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+e_rc4.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_rc4.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_rc4.o: ../cryptlib.h
  e_rc5.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  e_rc5.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  e_rc5.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -349,14 +364,15 @@ e_rc5.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  e_rc5.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  e_rc5.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  e_rc5.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-e_rc5.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-e_rc5.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-e_rc5.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-e_rc5.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-e_rc5.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-e_rc5.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-e_rc5.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-e_rc5.o: ../../include/openssl/stack.h ../cryptlib.h evp_locl.h
+e_rc5.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+e_rc5.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+e_rc5.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+e_rc5.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+e_rc5.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+e_rc5.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+e_rc5.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+e_rc5.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+e_rc5.o: ../cryptlib.h evp_locl.h
  e_xcbc_d.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  e_xcbc_d.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  e_xcbc_d.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -364,9 +380,10 @@ e_xcbc_d.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  e_xcbc_d.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  e_xcbc_d.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  e_xcbc_d.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-e_xcbc_d.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-e_xcbc_d.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-e_xcbc_d.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+e_xcbc_d.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+e_xcbc_d.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+e_xcbc_d.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+e_xcbc_d.o: ../../include/openssl/opensslconf.h
  e_xcbc_d.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
  e_xcbc_d.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
  e_xcbc_d.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
@@ -379,14 +396,15 @@ encode.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  encode.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  encode.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  encode.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-encode.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-encode.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-encode.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-encode.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-encode.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-encode.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-encode.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-encode.o: ../../include/openssl/stack.h ../cryptlib.h
+encode.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+encode.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+encode.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+encode.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+encode.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+encode.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+encode.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+encode.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+encode.o: ../cryptlib.h
  evp_enc.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  evp_enc.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  evp_enc.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -394,28 +412,29 @@ evp_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  evp_enc.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  evp_enc.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  evp_enc.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-evp_enc.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-evp_enc.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-evp_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-evp_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-evp_enc.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-evp_enc.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-evp_enc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-evp_enc.o: ../../include/openssl/stack.h ../cryptlib.h evp_locl.h
+evp_enc.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+evp_enc.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+evp_enc.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+evp_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+evp_enc.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+evp_enc.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+evp_enc.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+evp_enc.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+evp_enc.o: ../cryptlib.h evp_locl.h
  evp_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  evp_err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  evp_err.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
  evp_err.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  evp_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
  evp_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-evp_err.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-evp_err.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-evp_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-evp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-evp_err.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-evp_err.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-evp_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-evp_err.o: ../../include/openssl/stack.h
+evp_err.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+evp_err.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+evp_err.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+evp_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+evp_err.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+evp_err.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+evp_err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+evp_err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
  evp_key.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  evp_key.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  evp_key.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -423,16 +442,16 @@ evp_key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  evp_key.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  evp_key.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  evp_key.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-evp_key.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-evp_key.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-evp_key.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-evp_key.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-evp_key.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-evp_key.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-evp_key.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-evp_key.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-evp_key.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-evp_key.o: ../cryptlib.h
+evp_key.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+evp_key.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+evp_key.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+evp_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+evp_key.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+evp_key.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+evp_key.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+evp_key.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+evp_key.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+evp_key.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  evp_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  evp_lib.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  evp_lib.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -440,14 +459,15 @@ evp_lib.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  evp_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  evp_lib.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  evp_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-evp_lib.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-evp_lib.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-evp_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-evp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h
-evp_lib.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-evp_lib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-evp_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-evp_lib.o: ../../include/openssl/stack.h ../cryptlib.h
+evp_lib.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+evp_lib.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+evp_lib.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+evp_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+evp_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+evp_lib.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+evp_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+evp_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+evp_lib.o: ../cryptlib.h
  evp_pbe.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  evp_pbe.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  evp_pbe.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -455,16 +475,16 @@ evp_pbe.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  evp_pbe.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  evp_pbe.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  evp_pbe.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-evp_pbe.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-evp_pbe.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-evp_pbe.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-evp_pbe.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-evp_pbe.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-evp_pbe.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-evp_pbe.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-evp_pbe.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-evp_pbe.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-evp_pbe.o: ../cryptlib.h
+evp_pbe.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+evp_pbe.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+evp_pbe.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+evp_pbe.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+evp_pbe.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+evp_pbe.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+evp_pbe.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+evp_pbe.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+evp_pbe.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+evp_pbe.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  evp_pkey.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  evp_pkey.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  evp_pkey.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -472,9 +492,10 @@ evp_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  evp_pkey.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  evp_pkey.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  evp_pkey.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-evp_pkey.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-evp_pkey.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-evp_pkey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+evp_pkey.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+evp_pkey.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+evp_pkey.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+evp_pkey.o: ../../include/openssl/opensslconf.h
  evp_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  evp_pkey.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
  evp_pkey.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
@@ -489,16 +510,16 @@ m_dss.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  m_dss.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  m_dss.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  m_dss.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-m_dss.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-m_dss.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-m_dss.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-m_dss.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-m_dss.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-m_dss.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-m_dss.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-m_dss.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-m_dss.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_dss.o: ../cryptlib.h
+m_dss.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+m_dss.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+m_dss.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+m_dss.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+m_dss.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+m_dss.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+m_dss.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+m_dss.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+m_dss.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+m_dss.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  m_dss1.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  m_dss1.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  m_dss1.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -506,16 +527,16 @@ m_dss1.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  m_dss1.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  m_dss1.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  m_dss1.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-m_dss1.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-m_dss1.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-m_dss1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-m_dss1.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-m_dss1.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-m_dss1.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-m_dss1.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-m_dss1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-m_dss1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_dss1.o: ../cryptlib.h
+m_dss1.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+m_dss1.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+m_dss1.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+m_dss1.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+m_dss1.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+m_dss1.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+m_dss1.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+m_dss1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+m_dss1.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+m_dss1.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  m_md2.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  m_md2.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  m_md2.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -523,16 +544,16 @@ m_md2.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  m_md2.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  m_md2.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  m_md2.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-m_md2.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-m_md2.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-m_md2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-m_md2.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-m_md2.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-m_md2.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-m_md2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-m_md2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-m_md2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_md2.o: ../cryptlib.h
+m_md2.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+m_md2.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+m_md2.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+m_md2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+m_md2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+m_md2.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+m_md2.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+m_md2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+m_md2.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+m_md2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  m_md5.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  m_md5.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  m_md5.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -540,16 +561,16 @@ m_md5.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  m_md5.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  m_md5.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  m_md5.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-m_md5.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-m_md5.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-m_md5.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-m_md5.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-m_md5.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-m_md5.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-m_md5.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-m_md5.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-m_md5.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_md5.o: ../cryptlib.h
+m_md5.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+m_md5.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+m_md5.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+m_md5.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+m_md5.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+m_md5.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+m_md5.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+m_md5.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+m_md5.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+m_md5.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  m_mdc2.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  m_mdc2.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  m_mdc2.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -557,16 +578,16 @@ m_mdc2.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  m_mdc2.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  m_mdc2.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  m_mdc2.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-m_mdc2.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-m_mdc2.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-m_mdc2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-m_mdc2.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-m_mdc2.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-m_mdc2.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-m_mdc2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-m_mdc2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-m_mdc2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_mdc2.o: ../cryptlib.h
+m_mdc2.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+m_mdc2.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+m_mdc2.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+m_mdc2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+m_mdc2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+m_mdc2.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+m_mdc2.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+m_mdc2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+m_mdc2.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+m_mdc2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  m_null.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  m_null.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  m_null.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -574,16 +595,16 @@ m_null.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  m_null.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  m_null.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  m_null.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-m_null.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-m_null.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-m_null.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-m_null.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-m_null.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-m_null.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-m_null.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-m_null.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-m_null.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_null.o: ../cryptlib.h
+m_null.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+m_null.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+m_null.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+m_null.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+m_null.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+m_null.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+m_null.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+m_null.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+m_null.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+m_null.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  m_ripemd.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  m_ripemd.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  m_ripemd.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -591,9 +612,10 @@ m_ripemd.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  m_ripemd.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  m_ripemd.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  m_ripemd.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-m_ripemd.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-m_ripemd.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-m_ripemd.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+m_ripemd.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+m_ripemd.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+m_ripemd.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+m_ripemd.o: ../../include/openssl/opensslconf.h
  m_ripemd.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  m_ripemd.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
  m_ripemd.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
@@ -608,16 +630,16 @@ m_sha.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  m_sha.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  m_sha.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  m_sha.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-m_sha.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-m_sha.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-m_sha.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-m_sha.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-m_sha.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-m_sha.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-m_sha.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-m_sha.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-m_sha.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_sha.o: ../cryptlib.h
+m_sha.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+m_sha.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+m_sha.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+m_sha.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+m_sha.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+m_sha.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+m_sha.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+m_sha.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+m_sha.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+m_sha.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  m_sha1.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  m_sha1.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  m_sha1.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -625,16 +647,16 @@ m_sha1.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  m_sha1.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  m_sha1.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  m_sha1.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-m_sha1.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-m_sha1.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-m_sha1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-m_sha1.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-m_sha1.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-m_sha1.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-m_sha1.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-m_sha1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-m_sha1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_sha1.o: ../cryptlib.h
+m_sha1.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+m_sha1.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+m_sha1.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+m_sha1.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+m_sha1.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+m_sha1.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+m_sha1.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+m_sha1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+m_sha1.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+m_sha1.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  names.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  names.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  names.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -642,16 +664,16 @@ names.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  names.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  names.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  names.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-names.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-names.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-names.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-names.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-names.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-names.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-names.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-names.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-names.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-names.o: ../cryptlib.h
+names.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+names.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+names.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+names.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+names.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+names.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+names.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+names.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+names.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+names.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  p5_crpt.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  p5_crpt.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  p5_crpt.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -659,16 +681,16 @@ p5_crpt.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  p5_crpt.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  p5_crpt.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  p5_crpt.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-p5_crpt.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-p5_crpt.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-p5_crpt.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p5_crpt.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-p5_crpt.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p5_crpt.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-p5_crpt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-p5_crpt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-p5_crpt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p5_crpt.o: ../cryptlib.h
+p5_crpt.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+p5_crpt.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+p5_crpt.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+p5_crpt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+p5_crpt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+p5_crpt.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+p5_crpt.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+p5_crpt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+p5_crpt.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+p5_crpt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  p5_crpt2.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  p5_crpt2.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  p5_crpt2.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -677,9 +699,9 @@ p5_crpt2.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  p5_crpt2.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  p5_crpt2.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  p5_crpt2.o: ../../include/openssl/hmac.h ../../include/openssl/idea.h
-p5_crpt2.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-p5_crpt2.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-p5_crpt2.o: ../../include/openssl/opensslconf.h
+p5_crpt2.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+p5_crpt2.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+p5_crpt2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  p5_crpt2.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  p5_crpt2.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
  p5_crpt2.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
@@ -694,16 +716,17 @@ p_dec.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  p_dec.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  p_dec.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  p_dec.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-p_dec.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-p_dec.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-p_dec.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p_dec.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-p_dec.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
-p_dec.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p_dec.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p_dec.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p_dec.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-p_dec.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+p_dec.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+p_dec.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+p_dec.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+p_dec.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+p_dec.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+p_dec.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+p_dec.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p_dec.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p_dec.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p_dec.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+p_dec.o: ../cryptlib.h
  p_enc.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  p_enc.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  p_enc.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -711,16 +734,17 @@ p_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  p_enc.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  p_enc.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  p_enc.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-p_enc.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-p_enc.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-p_enc.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p_enc.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-p_enc.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
-p_enc.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p_enc.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p_enc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p_enc.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-p_enc.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+p_enc.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+p_enc.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+p_enc.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+p_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+p_enc.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+p_enc.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+p_enc.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p_enc.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p_enc.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p_enc.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+p_enc.o: ../cryptlib.h
  p_lib.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  p_lib.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  p_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -729,15 +753,16 @@ p_lib.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  p_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  p_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p_lib.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-p_lib.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-p_lib.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-p_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-p_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-p_lib.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p_lib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p_lib.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-p_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+p_lib.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+p_lib.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+p_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+p_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+p_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+p_lib.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+p_lib.o: ../cryptlib.h
  p_open.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  p_open.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  p_open.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -745,16 +770,16 @@ p_open.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  p_open.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  p_open.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  p_open.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-p_open.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-p_open.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-p_open.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p_open.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-p_open.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p_open.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-p_open.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-p_open.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-p_open.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p_open.o: ../cryptlib.h
+p_open.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+p_open.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+p_open.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+p_open.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+p_open.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+p_open.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+p_open.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+p_open.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+p_open.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+p_open.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  p_seal.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  p_seal.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  p_seal.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -762,16 +787,17 @@ p_seal.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  p_seal.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  p_seal.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  p_seal.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-p_seal.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-p_seal.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-p_seal.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p_seal.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-p_seal.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
-p_seal.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p_seal.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p_seal.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p_seal.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-p_seal.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+p_seal.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+p_seal.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+p_seal.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+p_seal.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+p_seal.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+p_seal.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+p_seal.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p_seal.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p_seal.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p_seal.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+p_seal.o: ../cryptlib.h
  p_sign.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  p_sign.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  p_sign.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -779,16 +805,16 @@ p_sign.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  p_sign.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  p_sign.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  p_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-p_sign.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-p_sign.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-p_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-p_sign.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p_sign.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-p_sign.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-p_sign.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-p_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p_sign.o: ../cryptlib.h
+p_sign.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+p_sign.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+p_sign.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+p_sign.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+p_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+p_sign.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+p_sign.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+p_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+p_sign.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+p_sign.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  p_verify.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  p_verify.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  p_verify.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -796,9 +822,10 @@ p_verify.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  p_verify.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  p_verify.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  p_verify.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-p_verify.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-p_verify.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-p_verify.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+p_verify.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+p_verify.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+p_verify.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+p_verify.o: ../../include/openssl/opensslconf.h
  p_verify.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  p_verify.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
  p_verify.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h

index 56a7e081899e95a38e5468866cf8c267e0c04742..f3b2b7456a479dc39e5ad68251382d67d490ffff 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -67,6 +67,9 @@
  # undef OPENSSL_ALGORITHM_DEFINES
  #endif
  
+#ifndef NO_BIO
+#include <openssl/bio.h>
+#endif
  #ifndef NO_MD2
  #include <openssl/md2.h>
  #endif
@@ -593,7 +596,7 @@ int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a);
  int EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
  int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr);
  
-#ifdef HEADER_BIO_H
+#ifndef NO_BIO
  BIO_METHOD *BIO_f_md(void);
  BIO_METHOD *BIO_f_base64(void);
  BIO_METHOD *BIO_f_cipher(void);
diff --git a/crypto/evp/evp_locl.h b/crypto/evp/evp_locl.h

index f3414b9a7be581e7bb882d7926885c0f554be9e2..ce49d5b7d814d6b823115103408048cde5ac42fc 100644 (file)
--- a/crypto/evp/evp_locl.h
+++ b/crypto/evp/evp_locl.h
@@ -70,28 +70,28 @@
  static int cname##_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, unsigned int inl) \
  {\
         BLOCK_CIPHER_ecb_loop() \
-               cprefix##_ecb_encrypt(in + i, out + i, &ctx->c.##kname, ctx->encrypt);\
+               cprefix##_ecb_encrypt(in + i, out + i, &ctx->c.kname, ctx->encrypt);\
         return 1;\
  }
  
  #define BLOCK_CIPHER_func_ofb(cname, cprefix, kname) \
  static int cname##_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, unsigned int inl) \
  {\
-       cprefix##_ofb64_encrypt(in, out, (long)inl, &ctx->c.##kname, ctx->iv, &ctx->num);\
+       cprefix##_ofb64_encrypt(in, out, (long)inl, &ctx->c.kname, ctx->iv, &ctx->num);\
         return 1;\
  }
  
  #define BLOCK_CIPHER_func_cbc(cname, cprefix, kname) \
  static int cname##_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, unsigned int inl) \
  {\
-       cprefix##_cbc_encrypt(in, out, (long)inl, &ctx->c.##kname, ctx->iv, ctx->encrypt);\
+       cprefix##_cbc_encrypt(in, out, (long)inl, &ctx->c.kname, ctx->iv, ctx->encrypt);\
         return 1;\
  }
  
  #define BLOCK_CIPHER_func_cfb(cname, cprefix, kname) \
  static int cname##_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, unsigned int inl) \
  {\
-       cprefix##_cfb64_encrypt(in, out, (long)inl, &ctx->c.##kname, ctx->iv, &ctx->num, ctx->encrypt);\
+       cprefix##_cfb64_encrypt(in, out, (long)inl, &ctx->c.kname, ctx->iv, &ctx->num, ctx->encrypt);\
         return 1;\
  }
  
@@ -111,7 +111,7 @@ static EVP_CIPHER cname##_cbc = {\
         cname##_cbc_cipher,\
         cleanup,\
         sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+\
-               sizeof((((EVP_CIPHER_CTX *)NULL)->c.##kstruct)),\
+               sizeof((((EVP_CIPHER_CTX *)NULL)->c.kstruct)),\
         set_asn1, get_asn1,\
         ctrl, \
         NULL \
@@ -124,7 +124,7 @@ static EVP_CIPHER cname##_cfb = {\
         cname##_cfb_cipher,\
         cleanup,\
         sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+\
-               sizeof((((EVP_CIPHER_CTX *)NULL)->c.##kstruct)),\
+               sizeof((((EVP_CIPHER_CTX *)NULL)->c.kstruct)),\
         set_asn1, get_asn1,\
         ctrl,\
         NULL \
@@ -137,7 +137,7 @@ static EVP_CIPHER cname##_ofb = {\
         cname##_ofb_cipher,\
         cleanup,\
         sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+\
-               sizeof((((EVP_CIPHER_CTX *)NULL)->c.##kstruct)),\
+               sizeof((((EVP_CIPHER_CTX *)NULL)->c.kstruct)),\
         set_asn1, get_asn1,\
         ctrl,\
         NULL \
@@ -150,7 +150,7 @@ static EVP_CIPHER cname##_ecb = {\
         cname##_ecb_cipher,\
         cleanup,\
         sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+\
-               sizeof((((EVP_CIPHER_CTX *)NULL)->c.##kstruct)),\
+               sizeof((((EVP_CIPHER_CTX *)NULL)->c.kstruct)),\
         set_asn1, get_asn1,\
         ctrl,\
         NULL \
diff --git a/crypto/evp/p_open.c b/crypto/evp/p_open.c

index 85d5097644a51a1d0f5360c00c58fecf8975d953..2760c00fec10bc307b4a8217944d9b09a57e9a3b 100644 (file)
--- a/crypto/evp/p_open.c
+++ b/crypto/evp/p_open.c
@@ -68,26 +68,26 @@ int EVP_OpenInit(EVP_CIPHER_CTX *ctx, EVP_CIPHER *type, unsigned char *ek,
         {
         unsigned char *key=NULL;
         int i,size=0,ret=0;
-       
+
+       if(type) {      
+               EVP_CIPHER_CTX_init(ctx);
+               if(!EVP_DecryptInit(ctx,type,NULL,NULL)) return 0;
+       }
+
+       if(!priv) return 1;
+
         if (priv->type != EVP_PKEY_RSA)
                 {
                 EVPerr(EVP_F_EVP_OPENINIT,EVP_R_PUBLIC_KEY_NOT_RSA);
-               ret= -1;
                 goto err;
                  }
  
-       if(type) {      
-               EVP_CIPHER_CTX_init(ctx);
-               EVP_DecryptInit(ctx,type,NULL,NULL);
-       }
-
         size=RSA_size(priv->pkey.rsa);
         key=(unsigned char *)OPENSSL_malloc(size+2);
         if (key == NULL)
                 {
                 /* ERROR */
                 EVPerr(EVP_F_EVP_OPENINIT,ERR_R_MALLOC_FAILURE);
-               ret= -1;
                 goto err;
                 }
  
diff --git a/crypto/evp/p_seal.c b/crypto/evp/p_seal.c

index 47efc0d3d880d7b810816e003a9591f106e8200b..2fd1d7e0c2b038164835064b63a8e3de46575c60 100644 (file)
--- a/crypto/evp/p_seal.c
+++ b/crypto/evp/p_seal.c
@@ -72,11 +72,11 @@ int EVP_SealInit(EVP_CIPHER_CTX *ctx, EVP_CIPHER *type, unsigned char **ek,
         unsigned char key[EVP_MAX_KEY_LENGTH];
         int i;
         
-       if (npubk <= 0) return(0);
         if(type) {
                 EVP_CIPHER_CTX_init(ctx);
-               EVP_EncryptInit(ctx,type,NULL,NULL);
+               if(!EVP_EncryptInit(ctx,type,NULL,NULL)) return 0;
         }
+       if (npubk <= 0) return(0);
         if (RAND_bytes(key,EVP_MAX_KEY_LENGTH) <= 0)
                 return(0);
         if (EVP_CIPHER_CTX_iv_length(ctx))
diff --git a/crypto/lhash/Makefile.ssl b/crypto/lhash/Makefile.ssl

index 836997d0483731cf7115c4e16f4b83dae82beb53..9afba2f9011ce53befb4a1e11af40aec094f9f03 100644 (file)
--- a/crypto/lhash/Makefile.ssl
+++ b/crypto/lhash/Makefile.ssl
@@ -84,6 +84,6 @@ lh_stats.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  lh_stats.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
  lh_stats.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  lh_stats.o: ../../include/openssl/stack.h ../cryptlib.h
-lhash.o: ../../include/openssl/crypto.h ../../include/openssl/lhash.h
-lhash.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-lhash.o: ../../include/openssl/stack.h
+lhash.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
+lhash.o: ../../include/openssl/lhash.h ../../include/openssl/opensslv.h
+lhash.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
diff --git a/crypto/lhash/lh_stats.c b/crypto/lhash/lh_stats.c

index 80b931c12b76c6a128822d534666657d764c7997..ee0600060e07901d00fa42bcde325d25a763dcd6 100644 (file)
--- a/crypto/lhash/lh_stats.c
+++ b/crypto/lhash/lh_stats.c
@@ -63,9 +63,12 @@
   * and things should work as expected */
  #include "cryptlib.h"
  
+#ifndef NO_BIO
+#include <openssl/bio.h>
+#endif
  #include <openssl/lhash.h>
  
-#ifndef HEADER_BIO_H
+#ifdef NO_BIO
  
  void lh_stats(LHASH *lh, FILE *out)
         {
diff --git a/crypto/lhash/lhash.h b/crypto/lhash/lhash.h

index 868d5352605fa0e3749f3e01ae378c9dfafd8a28..b8ff021906975180902c4719e4d9dbca226d1890 100644 (file)
--- a/crypto/lhash/lhash.h
+++ b/crypto/lhash/lhash.h
@@ -67,6 +67,10 @@
  #include <stdio.h>
  #endif
  
+#ifndef NO_BIO
+#include <openssl/bio.h>
+#endif
+
  #ifdef  __cplusplus
  extern "C" {
  #endif
@@ -132,7 +136,7 @@ void lh_node_stats(LHASH *lh, FILE *out);
  void lh_node_usage_stats(LHASH *lh, FILE *out);
  #endif
  
-#ifdef HEADER_BIO_H
+#ifndef NO_BIO
  void lh_stats_bio(LHASH *lh, BIO *out);
  void lh_node_stats_bio(LHASH *lh, BIO *out);
  void lh_node_usage_stats_bio(LHASH *lh, BIO *out);
diff --git a/crypto/md2/Makefile.ssl b/crypto/md2/Makefile.ssl

index cf90965dd73dfbeecc57a016a12b46e56775adc1..4d93a773e6417bf491708d371931a558f7b86db5 100644 (file)
--- a/crypto/md2/Makefile.ssl
+++ b/crypto/md2/Makefile.ssl
@@ -83,6 +83,7 @@ md2_dgst.o: ../../include/openssl/opensslv.h
  md2_one.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  md2_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  md2_one.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-md2_one.o: ../../include/openssl/md2.h ../../include/openssl/opensslconf.h
-md2_one.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-md2_one.o: ../../include/openssl/stack.h ../cryptlib.h
+md2_one.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+md2_one.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+md2_one.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+md2_one.o: ../cryptlib.h
diff --git a/crypto/mdc2/Makefile.ssl b/crypto/mdc2/Makefile.ssl

index 4ed72c08aa35888fbd90fc25af3bc66aa2c2ebf9..ee07ba3eb7b0d406dbaab350a9e226a6811bdc49 100644 (file)
--- a/crypto/mdc2/Makefile.ssl
+++ b/crypto/mdc2/Makefile.ssl
@@ -81,8 +81,8 @@ clean:
  mdc2_one.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  mdc2_one.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  mdc2_one.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-mdc2_one.o: ../../include/openssl/err.h ../../include/openssl/mdc2.h
-mdc2_one.o: ../../include/openssl/opensslconf.h
+mdc2_one.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+mdc2_one.o: ../../include/openssl/mdc2.h ../../include/openssl/opensslconf.h
  mdc2_one.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
  mdc2_one.o: ../../include/openssl/stack.h ../cryptlib.h
  mdc2dgst.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
diff --git a/crypto/objects/Makefile.ssl b/crypto/objects/Makefile.ssl

index ea5348e90d53674d3f8ae0e8ce2f41830c30dca1..83a7235588b1d7462a11745d0b2d1d4ca75c329c 100644 (file)
--- a/crypto/objects/Makefile.ssl
+++ b/crypto/objects/Makefile.ssl
@@ -93,9 +93,10 @@ obj_dat.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
  obj_dat.o: ../cryptlib.h obj_dat.h
  obj_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  obj_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-obj_err.o: ../../include/openssl/err.h ../../include/openssl/objects.h
-obj_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-obj_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+obj_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+obj_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+obj_err.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+obj_err.o: ../../include/openssl/stack.h
  obj_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  obj_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
  obj_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
diff --git a/crypto/objects/objects.h b/crypto/objects/objects.h

index 2f11517a9a4a41c07b925217d4bdf8e57896018c..f0d9fd7a2d1f15d31de92bea87dcefcef71735f8 100644 (file)
--- a/crypto/objects/objects.h
+++ b/crypto/objects/objects.h
@@ -979,8 +979,8 @@ typedef struct obj_name_st
  
  
  int OBJ_NAME_init(void);
-int OBJ_NAME_new_index(unsigned long (*hash_func)(),int (*cmp_func)(),
-       void (*free_func)());
+int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *),int (*cmp_func)(const void *, const void *),
+       void (*free_func)(const char *, int, const char *));
  const char *OBJ_NAME_get(const char *name,int type);
  int OBJ_NAME_add(const char *name,int type,const char *data);
  int OBJ_NAME_remove(const char *name,int type);
@@ -997,7 +997,7 @@ int         OBJ_txt2nid(char *s);
  int            OBJ_ln2nid(const char *s);
  int            OBJ_sn2nid(const char *s);
  int            OBJ_cmp(ASN1_OBJECT *a,ASN1_OBJECT *b);
-char *         OBJ_bsearch(char *key,char *base,int num,int size,int (*cmp)());
+char *         OBJ_bsearch(char *key,char *base,int num,int size,int (*cmp)(const void *, const void *));
  
  void           ERR_load_OBJ_strings(void );
  
diff --git a/crypto/pem/Makefile.ssl b/crypto/pem/Makefile.ssl

index b4e7524ea2d14ab3bcff96baa361d1e7037bd12a..bd799e4413842db66a716c73649b4104ebabd398 100644 (file)
--- a/crypto/pem/Makefile.ssl
+++ b/crypto/pem/Makefile.ssl
@@ -86,24 +86,25 @@ pem_all.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  pem_all.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  pem_all.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  pem_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pem_all.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-pem_all.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-pem_all.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-pem_all.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
-pem_all.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
-pem_all.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-pem_all.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-pem_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-pem_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-pem_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-pem_all.o: ../cryptlib.h
+pem_all.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+pem_all.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+pem_all.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+pem_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+pem_all.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+pem_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+pem_all.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+pem_all.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+pem_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+pem_all.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+pem_all.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  pem_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  pem_err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-pem_err.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-pem_err.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-pem_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-pem_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pem_err.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
+pem_err.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
+pem_err.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+pem_err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+pem_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+pem_err.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+pem_err.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
  pem_err.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
  pem_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  pem_err.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
@@ -120,9 +121,10 @@ pem_info.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  pem_info.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  pem_info.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  pem_info.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pem_info.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-pem_info.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-pem_info.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+pem_info.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+pem_info.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+pem_info.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+pem_info.o: ../../include/openssl/opensslconf.h
  pem_info.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
  pem_info.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
  pem_info.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
@@ -138,18 +140,18 @@ pem_lib.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  pem_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  pem_lib.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  pem_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pem_lib.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-pem_lib.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-pem_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-pem_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
-pem_lib.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h
-pem_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
-pem_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-pem_lib.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-pem_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-pem_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-pem_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-pem_lib.o: ../cryptlib.h
+pem_lib.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+pem_lib.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+pem_lib.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+pem_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+pem_lib.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+pem_lib.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+pem_lib.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
+pem_lib.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+pem_lib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+pem_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+pem_lib.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+pem_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  pem_seal.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  pem_seal.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  pem_seal.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -157,9 +159,10 @@ pem_seal.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  pem_seal.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  pem_seal.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  pem_seal.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pem_seal.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-pem_seal.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-pem_seal.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+pem_seal.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+pem_seal.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+pem_seal.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+pem_seal.o: ../../include/openssl/opensslconf.h
  pem_seal.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
  pem_seal.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
  pem_seal.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
@@ -175,9 +178,10 @@ pem_sign.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  pem_sign.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  pem_sign.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  pem_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pem_sign.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-pem_sign.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-pem_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+pem_sign.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+pem_sign.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+pem_sign.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+pem_sign.o: ../../include/openssl/opensslconf.h
  pem_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
  pem_sign.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
  pem_sign.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h

index 38b98015c4cecef9396a3425b69fd9dbeb52249e..46aafa68153d8d122a44b6c6e2ab96d84202b330 100644 (file)
--- a/crypto/pem/pem.h
+++ b/crypto/pem/pem.h
@@ -59,6 +59,12 @@
  #ifndef HEADER_PEM_H
  #define HEADER_PEM_H
  
+#ifndef NO_BIO
+#include <openssl/bio.h>
+#endif
+#ifndef NO_STACK
+#include <openssl/stack.h>
+#endif
  #include <openssl/evp.h>
  #include <openssl/x509.h>
  #include <openssl/pem2.h>
@@ -165,7 +171,7 @@ typedef struct pem_ctx_st
         int num_recipient;
         PEM_USER **recipient;
  
-#ifdef HEADER_STACK_H
+#ifndef NO_STACK
         STACK *x509_chain;      /* certificate chain */
  #else
         char *x509_chain;       /* certificate chain */
@@ -289,7 +295,7 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
  
  #endif
  
-#ifdef HEADER_BIO_H
+#ifndef NO_BIO
  #define DECLARE_PEM_read_bio(name, type) \
         type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u);
  
@@ -477,7 +483,7 @@ int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher);
  int    PEM_do_header (EVP_CIPHER_INFO *cipher, unsigned char *data,long *len,
         pem_password_cb *callback,void *u);
  
-#ifdef HEADER_BIO_H
+#ifndef NO_BIO
  int    PEM_read_bio(BIO *bp, char **name, char **header,
                 unsigned char **data,long *len);
  int    PEM_write_bio(BIO *bp,const char *name,char *hdr,unsigned char *data,
diff --git a/crypto/pkcs12/Makefile.ssl b/crypto/pkcs12/Makefile.ssl

index ea97ab08f4f5080a5c4f12b89d316f7fec9bf9e5..d570947a3680cce66f06e185886c7e142573a2d3 100644 (file)
--- a/crypto/pkcs12/Makefile.ssl
+++ b/crypto/pkcs12/Makefile.ssl
@@ -91,16 +91,17 @@ p12_add.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  p12_add.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  p12_add.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  p12_add.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-p12_add.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-p12_add.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-p12_add.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p12_add.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
-p12_add.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-p12_add.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p12_add.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p12_add.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p12_add.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-p12_add.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+p12_add.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+p12_add.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+p12_add.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+p12_add.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+p12_add.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+p12_add.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+p12_add.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p12_add.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p12_add.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p12_add.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+p12_add.o: ../cryptlib.h
  p12_attr.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  p12_attr.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  p12_attr.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -108,9 +109,10 @@ p12_attr.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  p12_attr.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  p12_attr.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  p12_attr.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-p12_attr.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-p12_attr.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-p12_attr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+p12_attr.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+p12_attr.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+p12_attr.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+p12_attr.o: ../../include/openssl/opensslconf.h
  p12_attr.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
  p12_attr.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
  p12_attr.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
@@ -126,9 +128,9 @@ p12_bags.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  p12_bags.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  p12_bags.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p12_bags.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-p12_bags.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-p12_bags.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-p12_bags.o: ../../include/openssl/opensslconf.h
+p12_bags.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+p12_bags.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+p12_bags.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  p12_bags.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
  p12_bags.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
  p12_bags.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
@@ -143,9 +145,10 @@ p12_crpt.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  p12_crpt.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  p12_crpt.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  p12_crpt.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-p12_crpt.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-p12_crpt.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-p12_crpt.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+p12_crpt.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+p12_crpt.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+p12_crpt.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+p12_crpt.o: ../../include/openssl/opensslconf.h
  p12_crpt.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
  p12_crpt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
  p12_crpt.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
@@ -160,16 +163,17 @@ p12_crt.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  p12_crt.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  p12_crt.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  p12_crt.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-p12_crt.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-p12_crt.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-p12_crt.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p12_crt.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
-p12_crt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-p12_crt.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p12_crt.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p12_crt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p12_crt.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-p12_crt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+p12_crt.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+p12_crt.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+p12_crt.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+p12_crt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+p12_crt.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+p12_crt.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+p12_crt.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p12_crt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p12_crt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p12_crt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+p12_crt.o: ../cryptlib.h
  p12_decr.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  p12_decr.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  p12_decr.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -177,9 +181,10 @@ p12_decr.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  p12_decr.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  p12_decr.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  p12_decr.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-p12_decr.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-p12_decr.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-p12_decr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+p12_decr.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+p12_decr.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+p12_decr.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+p12_decr.o: ../../include/openssl/opensslconf.h
  p12_decr.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
  p12_decr.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
  p12_decr.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
@@ -194,9 +199,10 @@ p12_init.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  p12_init.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  p12_init.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  p12_init.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-p12_init.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-p12_init.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-p12_init.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+p12_init.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+p12_init.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+p12_init.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+p12_init.o: ../../include/openssl/opensslconf.h
  p12_init.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
  p12_init.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
  p12_init.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
@@ -211,16 +217,17 @@ p12_key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  p12_key.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  p12_key.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  p12_key.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-p12_key.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-p12_key.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-p12_key.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p12_key.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
-p12_key.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-p12_key.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p12_key.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p12_key.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p12_key.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-p12_key.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+p12_key.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+p12_key.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+p12_key.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+p12_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+p12_key.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+p12_key.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+p12_key.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p12_key.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p12_key.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p12_key.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+p12_key.o: ../cryptlib.h
  p12_kiss.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  p12_kiss.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  p12_kiss.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -228,9 +235,10 @@ p12_kiss.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  p12_kiss.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  p12_kiss.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  p12_kiss.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-p12_kiss.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-p12_kiss.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-p12_kiss.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+p12_kiss.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+p12_kiss.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+p12_kiss.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+p12_kiss.o: ../../include/openssl/opensslconf.h
  p12_kiss.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
  p12_kiss.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
  p12_kiss.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
@@ -246,16 +254,16 @@ p12_lib.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  p12_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  p12_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p12_lib.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-p12_lib.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-p12_lib.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-p12_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-p12_lib.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
-p12_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p12_lib.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-p12_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-p12_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-p12_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p12_lib.o: ../cryptlib.h
+p12_lib.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+p12_lib.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+p12_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+p12_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
+p12_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+p12_lib.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+p12_lib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+p12_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+p12_lib.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+p12_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  p12_mac.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
  p12_mac.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
  p12_mac.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
@@ -264,16 +272,16 @@ p12_mac.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  p12_mac.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  p12_mac.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p12_mac.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-p12_mac.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-p12_mac.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-p12_mac.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-p12_mac.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
-p12_mac.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-p12_mac.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-p12_mac.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-p12_mac.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-p12_mac.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-p12_mac.o: ../cryptlib.h
+p12_mac.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+p12_mac.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+p12_mac.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+p12_mac.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
+p12_mac.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+p12_mac.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+p12_mac.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+p12_mac.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+p12_mac.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+p12_mac.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  p12_mutl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  p12_mutl.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  p12_mutl.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -282,9 +290,9 @@ p12_mutl.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  p12_mutl.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  p12_mutl.o: ../../include/openssl/err.h ../../include/openssl/evp.h
  p12_mutl.o: ../../include/openssl/hmac.h ../../include/openssl/idea.h
-p12_mutl.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-p12_mutl.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-p12_mutl.o: ../../include/openssl/opensslconf.h
+p12_mutl.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+p12_mutl.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+p12_mutl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  p12_mutl.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
  p12_mutl.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
  p12_mutl.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
@@ -295,11 +303,12 @@ p12_mutl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  p12_mutl.o: ../cryptlib.h
  p12_npas.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  p12_npas.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-p12_npas.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-p12_npas.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-p12_npas.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-p12_npas.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-p12_npas.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
+p12_npas.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
+p12_npas.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+p12_npas.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+p12_npas.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+p12_npas.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+p12_npas.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
  p12_npas.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
  p12_npas.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  p12_npas.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
@@ -318,9 +327,9 @@ p12_sbag.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  p12_sbag.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  p12_sbag.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  p12_sbag.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-p12_sbag.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-p12_sbag.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-p12_sbag.o: ../../include/openssl/opensslconf.h
+p12_sbag.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+p12_sbag.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+p12_sbag.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  p12_sbag.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
  p12_sbag.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
  p12_sbag.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
@@ -335,23 +344,25 @@ p12_utl.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  p12_utl.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  p12_utl.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  p12_utl.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-p12_utl.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-p12_utl.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-p12_utl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-p12_utl.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
-p12_utl.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-p12_utl.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-p12_utl.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-p12_utl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-p12_utl.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-p12_utl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
+p12_utl.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+p12_utl.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+p12_utl.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+p12_utl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+p12_utl.o: ../../include/openssl/pkcs12.h ../../include/openssl/pkcs7.h
+p12_utl.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+p12_utl.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+p12_utl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+p12_utl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+p12_utl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+p12_utl.o: ../cryptlib.h
  pk12err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  pk12err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-pk12err.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-pk12err.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-pk12err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-pk12err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pk12err.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
+pk12err.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
+pk12err.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+pk12err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+pk12err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+pk12err.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+pk12err.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
  pk12err.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
  pk12err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  pk12err.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs12.h
diff --git a/crypto/pkcs7/Makefile.ssl b/crypto/pkcs7/Makefile.ssl

index a0c4d324ad35871ae6ceb788fabd9ca875bddbd6..7232ba1b819c18a046916d10ca0b81d2c3d40579 100644 (file)
--- a/crypto/pkcs7/Makefile.ssl
+++ b/crypto/pkcs7/Makefile.ssl
@@ -99,11 +99,12 @@ clean:
  
  pk7_attr.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  pk7_attr.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-pk7_attr.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-pk7_attr.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-pk7_attr.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-pk7_attr.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pk7_attr.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
+pk7_attr.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
+pk7_attr.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+pk7_attr.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+pk7_attr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+pk7_attr.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+pk7_attr.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
  pk7_attr.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
  pk7_attr.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  pk7_attr.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
@@ -140,16 +141,16 @@ pk7_lib.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  pk7_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  pk7_lib.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  pk7_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pk7_lib.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-pk7_lib.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-pk7_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-pk7_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-pk7_lib.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-pk7_lib.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-pk7_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-pk7_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-pk7_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-pk7_lib.o: ../cryptlib.h
+pk7_lib.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+pk7_lib.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+pk7_lib.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+pk7_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+pk7_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+pk7_lib.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+pk7_lib.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+pk7_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+pk7_lib.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+pk7_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  pk7_mime.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  pk7_mime.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  pk7_mime.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -157,9 +158,10 @@ pk7_mime.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  pk7_mime.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  pk7_mime.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  pk7_mime.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pk7_mime.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-pk7_mime.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-pk7_mime.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+pk7_mime.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+pk7_mime.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+pk7_mime.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+pk7_mime.o: ../../include/openssl/opensslconf.h
  pk7_mime.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  pk7_mime.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
  pk7_mime.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
@@ -188,11 +190,12 @@ pk7_smime.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  pk7_smime.o: ../../include/openssl/x509v3.h ../cryptlib.h
  pkcs7err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  pkcs7err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-pkcs7err.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-pkcs7err.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-pkcs7err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-pkcs7err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-pkcs7err.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
+pkcs7err.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
+pkcs7err.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+pkcs7err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+pkcs7err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+pkcs7err.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+pkcs7err.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
  pkcs7err.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
  pkcs7err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  pkcs7err.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
diff --git a/crypto/rand/Makefile.ssl b/crypto/rand/Makefile.ssl

index d9e0b3782dd1c7c593641ed5cf8f402744f7a13f..48a01a317b4231f43ce1a771f78755e6a792835b 100644 (file)
--- a/crypto/rand/Makefile.ssl
+++ b/crypto/rand/Makefile.ssl
@@ -78,13 +78,17 @@ clean:
  
  # DO NOT DELETE THIS LINE -- make depend depends on it.
  
-md_rand.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
-md_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+md_rand.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
+md_rand.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+md_rand.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
  md_rand.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
  md_rand.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
  md_rand.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
  rand_egd.o: ../../include/openssl/opensslconf.h ../../include/openssl/rand.h
-rand_err.o: ../../include/openssl/err.h ../../include/openssl/rand.h
+rand_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
+rand_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+rand_err.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
+rand_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
  rand_lib.o: ../../include/openssl/rand.h
  randfile.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  randfile.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
diff --git a/crypto/rsa/Makefile.ssl b/crypto/rsa/Makefile.ssl

index aa6fdffa97db438dd22cda4db7ec9b4071dac399..fec03937ffe9dc320feda6474b09d7cf69a29c38 100644 (file)
--- a/crypto/rsa/Makefile.ssl
+++ b/crypto/rsa/Makefile.ssl
@@ -80,8 +80,9 @@ clean:
  
  # DO NOT DELETE THIS LINE -- make depend depends on it.
  
-rsa_chk.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-rsa_chk.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+rsa_chk.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+rsa_chk.o: ../../include/openssl/crypto.h ../../include/openssl/err.h
+rsa_chk.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
  rsa_chk.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
  rsa_chk.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
  rsa_eay.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
@@ -89,21 +90,22 @@ rsa_eay.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  rsa_eay.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  rsa_eay.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  rsa_eay.o: ../../include/openssl/engine.h ../../include/openssl/err.h
-rsa_eay.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-rsa_eay.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
-rsa_eay.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-rsa_eay.o: ../cryptlib.h
-rsa_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-rsa_err.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+rsa_eay.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+rsa_eay.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
+rsa_eay.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+rsa_eay.o: ../../include/openssl/stack.h ../cryptlib.h
+rsa_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+rsa_err.o: ../../include/openssl/crypto.h ../../include/openssl/err.h
+rsa_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
  rsa_err.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
  rsa_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
  rsa_gen.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  rsa_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  rsa_gen.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-rsa_gen.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-rsa_gen.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h
-rsa_gen.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-rsa_gen.o: ../cryptlib.h
+rsa_gen.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+rsa_gen.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+rsa_gen.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+rsa_gen.o: ../../include/openssl/stack.h ../cryptlib.h
  rsa_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  rsa_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  rsa_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
@@ -116,21 +118,24 @@ rsa_lib.o: ../../include/openssl/stack.h ../cryptlib.h
  rsa_none.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  rsa_none.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  rsa_none.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-rsa_none.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+rsa_none.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+rsa_none.o: ../../include/openssl/opensslconf.h
  rsa_none.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
  rsa_none.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
  rsa_none.o: ../../include/openssl/stack.h ../cryptlib.h
  rsa_null.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  rsa_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  rsa_null.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-rsa_null.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+rsa_null.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+rsa_null.o: ../../include/openssl/opensslconf.h
  rsa_null.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
  rsa_null.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
  rsa_null.o: ../../include/openssl/stack.h ../cryptlib.h
  rsa_oaep.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  rsa_oaep.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  rsa_oaep.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-rsa_oaep.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
+rsa_oaep.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+rsa_oaep.o: ../../include/openssl/opensslconf.h
  rsa_oaep.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
  rsa_oaep.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
  rsa_oaep.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
@@ -138,10 +143,11 @@ rsa_oaep.o: ../cryptlib.h
  rsa_pk1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  rsa_pk1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  rsa_pk1.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-rsa_pk1.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-rsa_pk1.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-rsa_pk1.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-rsa_pk1.o: ../../include/openssl/stack.h ../cryptlib.h
+rsa_pk1.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+rsa_pk1.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+rsa_pk1.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+rsa_pk1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+rsa_pk1.o: ../cryptlib.h
  rsa_saos.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  rsa_saos.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  rsa_saos.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -149,9 +155,10 @@ rsa_saos.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  rsa_saos.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  rsa_saos.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  rsa_saos.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-rsa_saos.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-rsa_saos.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-rsa_saos.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+rsa_saos.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+rsa_saos.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+rsa_saos.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+rsa_saos.o: ../../include/openssl/opensslconf.h
  rsa_saos.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  rsa_saos.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
  rsa_saos.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
@@ -167,9 +174,9 @@ rsa_sign.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  rsa_sign.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  rsa_sign.o: ../../include/openssl/engine.h ../../include/openssl/err.h
  rsa_sign.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-rsa_sign.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-rsa_sign.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-rsa_sign.o: ../../include/openssl/opensslconf.h
+rsa_sign.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+rsa_sign.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+rsa_sign.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  rsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  rsa_sign.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
  rsa_sign.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
@@ -180,7 +187,8 @@ rsa_sign.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  rsa_ssl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
  rsa_ssl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
  rsa_ssl.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-rsa_ssl.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-rsa_ssl.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-rsa_ssl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-rsa_ssl.o: ../../include/openssl/stack.h ../cryptlib.h
+rsa_ssl.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+rsa_ssl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+rsa_ssl.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
+rsa_ssl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+rsa_ssl.o: ../cryptlib.h
diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h

index 9129e5d501ec8b660c67739b101bd4a4156bfc8b..e629c534b04cf1a58b3c820e87a581ae441bf612 100644 (file)
--- a/crypto/rsa/rsa.h
+++ b/crypto/rsa/rsa.h
@@ -59,6 +59,9 @@
  #ifndef HEADER_RSA_H
  #define HEADER_RSA_H
  
+#ifndef NO_BIO
+#include <openssl/bio.h>
+#endif
  #include <openssl/bn.h>
  #include <openssl/crypto.h>
  
@@ -221,7 +224,7 @@ int         i2d_RSAPrivateKey(RSA *a, unsigned char **pp);
  int    RSA_print_fp(FILE *fp, RSA *r,int offset);
  #endif
  
-#ifdef HEADER_BIO_H
+#ifndef NO_BIO
  int    RSA_print(BIO *bp, RSA *r,int offset);
  #endif
  
diff --git a/crypto/stack/Makefile.ssl b/crypto/stack/Makefile.ssl

index 619965992cdb4322d2616c548686c6571d06b7aa..77149d78a2a0fe25a825a9e1babec13757ef6475 100644 (file)
--- a/crypto/stack/Makefile.ssl
+++ b/crypto/stack/Makefile.ssl
@@ -81,6 +81,6 @@ clean:
  stack.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
  stack.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
  stack.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-stack.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-stack.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-stack.o: ../cryptlib.h
+stack.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+stack.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+stack.o: ../../include/openssl/stack.h ../cryptlib.h
diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c

index d2c640075b33f844482d87518f3435db5e98f234..b3e32a759747dc921cb6e684ef0c541adbb81761 100644 (file)
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -310,18 +310,18 @@ char *sk_set(STACK *st, int i, char *value)
  }
  
  void sk_sort(STACK *st)
-    {
-    if (!st->sorted)
         {
-       int (*comp_func)(const void *,const void *);
-
-       /* same comment as in sk_find ... previously st->comp was declared
-        * as a (void*,void*) callback type, but this made the population
-        * of the callback pointer illogical - our callbacks compare
-        * type** with type**, so we leave the casting until absolutely
-        * necessary (ie. "now"). */
-       comp_func=(int (*)(const void *,const void *))(st->comp);
-       qsort(st->data,st->num,sizeof(char *), comp_func);
-       st->sorted=1;
+       if (!st->sorted)
+               {
+               int (*comp_func)(const void *,const void *);
+
+               /* same comment as in sk_find ... previously st->comp was declared
+                * as a (void*,void*) callback type, but this made the population
+                * of the callback pointer illogical - our callbacks compare
+                * type** with type**, so we leave the casting until absolutely
+                * necessary (ie. "now"). */
+               comp_func=(int (*)(const void *,const void *))(st->comp);
+               qsort(st->data,st->num,sizeof(char *), comp_func);
+               st->sorted=1;
+               }
         }
-    }
diff --git a/crypto/txt_db/txt_db.h b/crypto/txt_db/txt_db.h

index 22a54f06ee896568f998880cd395f2d2f475d8ab..342533d40dbbfb0f0d9c1343caca84d013026d24 100644 (file)
--- a/crypto/txt_db/txt_db.h
+++ b/crypto/txt_db/txt_db.h
@@ -59,6 +59,9 @@
  #ifndef HEADER_TXT_DB_H
  #define HEADER_TXT_DB_H
  
+#ifndef NO_BIO
+#include <openssl/bio.h>
+#endif
  #include <openssl/stack.h>
  #include <openssl/lhash.h>
  
@@ -85,7 +88,7 @@ typedef struct txt_db_st
         char **arg_row;
         } TXT_DB;
  
-#ifdef HEADER_BIO_H
+#ifndef NO_BIO
  TXT_DB *TXT_DB_read(BIO *in, int num);
  long TXT_DB_write(BIO *out, TXT_DB *db);
  #else
diff --git a/crypto/x509/Makefile.ssl b/crypto/x509/Makefile.ssl

index c5bd326fa823e4fcc087597412e2bc28a93d62f1..ac4e743e0c707cc1d0da995ed8777c56686b1289 100644 (file)
--- a/crypto/x509/Makefile.ssl
+++ b/crypto/x509/Makefile.ssl
@@ -168,16 +168,16 @@ x509_d2.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  x509_d2.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  x509_d2.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  x509_d2.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-x509_d2.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-x509_d2.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-x509_d2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x509_d2.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x509_d2.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x509_d2.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-x509_d2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x509_d2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x509_d2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-x509_d2.o: ../cryptlib.h
+x509_d2.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+x509_d2.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+x509_d2.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+x509_d2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+x509_d2.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+x509_d2.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+x509_d2.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+x509_d2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x509_d2.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+x509_d2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
  x509_def.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  x509_def.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
  x509_def.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
@@ -185,9 +185,10 @@ x509_def.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  x509_def.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  x509_def.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  x509_def.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-x509_def.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-x509_def.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-x509_def.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x509_def.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+x509_def.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+x509_def.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+x509_def.o: ../../include/openssl/opensslconf.h
  x509_def.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  x509_def.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
  x509_def.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
@@ -197,11 +198,12 @@ x509_def.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
  x509_def.o: ../cryptlib.h
  x509_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  x509_err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-x509_err.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-x509_err.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-x509_err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-x509_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-x509_err.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
+x509_err.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
+x509_err.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+x509_err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+x509_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+x509_err.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+x509_err.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
  x509_err.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
  x509_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  x509_err.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
@@ -271,9 +273,10 @@ x509_r2x.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  x509_r2x.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  x509_r2x.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  x509_r2x.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-x509_r2x.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-x509_r2x.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-x509_r2x.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x509_r2x.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+x509_r2x.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+x509_r2x.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+x509_r2x.o: ../../include/openssl/opensslconf.h
  x509_r2x.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  x509_r2x.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
  x509_r2x.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
@@ -288,9 +291,10 @@ x509_req.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  x509_req.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  x509_req.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  x509_req.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-x509_req.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-x509_req.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-x509_req.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x509_req.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+x509_req.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+x509_req.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+x509_req.o: ../../include/openssl/opensslconf.h
  x509_req.o: ../../include/openssl/opensslv.h ../../include/openssl/pem.h
  x509_req.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
  x509_req.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
@@ -306,9 +310,10 @@ x509_set.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  x509_set.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  x509_set.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  x509_set.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-x509_set.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-x509_set.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-x509_set.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x509_set.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+x509_set.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+x509_set.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+x509_set.o: ../../include/openssl/opensslconf.h
  x509_set.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  x509_set.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
  x509_set.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
@@ -398,9 +403,10 @@ x509name.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  x509name.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  x509name.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  x509name.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-x509name.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-x509name.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-x509name.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x509name.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+x509name.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+x509name.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+x509name.o: ../../include/openssl/opensslconf.h
  x509name.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  x509name.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
  x509name.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
@@ -415,9 +421,10 @@ x509rset.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  x509rset.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  x509rset.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  x509rset.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-x509rset.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-x509rset.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-x509rset.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x509rset.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+x509rset.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+x509rset.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+x509rset.o: ../../include/openssl/opensslconf.h
  x509rset.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  x509rset.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
  x509rset.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
@@ -433,9 +440,9 @@ x509spki.o: ../../include/openssl/des.h ../../include/openssl/dh.h
  x509spki.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
  x509spki.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
  x509spki.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
-x509spki.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-x509spki.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-x509spki.o: ../../include/openssl/opensslconf.h
+x509spki.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+x509spki.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+x509spki.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
  x509spki.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  x509spki.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
  x509spki.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
@@ -450,9 +457,10 @@ x509type.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  x509type.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  x509type.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  x509type.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-x509type.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-x509type.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-x509type.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+x509type.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+x509type.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+x509type.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+x509type.o: ../../include/openssl/opensslconf.h
  x509type.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
  x509type.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
  x509type.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
@@ -467,13 +475,13 @@ x_all.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
  x_all.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
  x_all.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
  x_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-x_all.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-x_all.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-x_all.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
-x_all.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
-x_all.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-x_all.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-x_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-x_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-x_all.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-x_all.o: ../cryptlib.h
+x_all.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+x_all.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
+x_all.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
+x_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+x_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
+x_all.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
+x_all.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
+x_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+x_all.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
+x_all.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h

index 1dae31a233c186c3cfcbdddcd959119061db9357..87f192fa80bb1421f242c04ee4e03c538c9c3a7f 100644 (file)
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -64,6 +64,15 @@
  #define X509_REVOKED_get_ext_by_critical X509_REVOKED_get_ext_by_critic
  #endif
  
+#ifndef NO_BUFFER
+#include <openssl/buffer.h>
+#endif
+#ifndef NO_EVP
+#include <openssl/evp.h>
+#endif
+#ifndef NO_BIO
+#include <openssl/bio.h>
+#endif
  #include <openssl/stack.h>
  #include <openssl/asn1.h>
  #include <openssl/safestack.h>
@@ -242,7 +251,7 @@ typedef struct X509_name_st
         {
         STACK_OF(X509_NAME_ENTRY) *entries;
         int modified;   /* true if 'bytes' needs to be built */
-#ifdef HEADER_BUFFER_H
+#ifndef NO_BUFFER
         BUF_MEM *bytes;
  #else
         char *bytes;
@@ -663,7 +672,7 @@ typedef struct private_key_st
         int references;
         } X509_PKEY;
  
-#ifdef HEADER_ENVELOPE_H
+#ifndef NO_EVP
  typedef struct X509_info_st
         {
         X509 *x509;
@@ -950,7 +959,7 @@ extern "C" {
  const char *X509_verify_cert_error_string(long n);
  
  #ifndef SSLEAY_MACROS
-#ifdef HEADER_ENVELOPE_H
+#ifndef NO_EVP
  int X509_verify(X509 *a, EVP_PKEY *r);
  
  int X509_REQ_verify(X509_REQ *a, EVP_PKEY *r);
@@ -1010,7 +1019,7 @@ int i2d_PrivateKey_fp(FILE *fp, EVP_PKEY *pkey);
  EVP_PKEY *d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a);
  #endif
  
-#ifdef HEADER_BIO_H
+#ifndef NO_BIO
  X509 *d2i_X509_bio(BIO *bp,X509 **x509);
  int i2d_X509_bio(BIO *bp,X509 *x509);
  X509_CRL *d2i_X509_CRL_bio(BIO *bp,X509_CRL **crl);
@@ -1216,7 +1225,7 @@ NETSCAPE_CERT_SEQUENCE *NETSCAPE_CERT_SEQUENCE_new(void);
  NETSCAPE_CERT_SEQUENCE *d2i_NETSCAPE_CERT_SEQUENCE(NETSCAPE_CERT_SEQUENCE **a, unsigned char **pp, long length);
  void NETSCAPE_CERT_SEQUENCE_free(NETSCAPE_CERT_SEQUENCE *a);
  
-#ifdef HEADER_ENVELOPE_H
+#ifndef NO_EVP
  X509_INFO *    X509_INFO_new(void);
  void           X509_INFO_free(X509_INFO *a);
  char *         X509_NAME_oneline(X509_NAME *a,char *buf,int size);
@@ -1296,7 +1305,7 @@ int               X509_CRL_print_fp(FILE *bp,X509_CRL *x);
  int            X509_REQ_print_fp(FILE *bp,X509_REQ *req);
  #endif
  
-#ifdef HEADER_BIO_H
+#ifndef NO_BIO
  int            X509_NAME_print(BIO *bp, X509_NAME *name, int obase);
  int            X509_print(BIO *bp,X509 *x);
  int            X509_CERT_AUX_print(BIO *bp,X509_CERT_AUX *x, int indent);
diff --git a/crypto/x509/x509_vfy.h b/crypto/x509/x509_vfy.h

index 313b8678027f4a6e96bfae28151fa6b97d801b39..f842e4ac720bf42a935de39f7938c725d6b3dec2 100644 (file)
--- a/crypto/x509/x509_vfy.h
+++ b/crypto/x509/x509_vfy.h
@@ -65,6 +65,9 @@
  #ifndef HEADER_X509_VFY_H
  #define HEADER_X509_VFY_H
  
+#ifndef NO_LHASH
+#include <openssl/lhash.h>
+#endif
  #include <openssl/bio.h>
  #include <openssl/crypto.h>
  
@@ -190,7 +193,7 @@ typedef struct x509_store_st
         {
         /* The following is a cache of trusted certs */
         int cache;      /* if true, stash any hits */
-#ifdef HEADER_LHASH_H
+#ifndef NO_LHASH
         LHASH *certs;   /* cached certs; */ 
  #else
         char *certs;
@@ -315,7 +318,7 @@ struct x509_store_state_st      /* X509_STORE_CTX */
  #define X509v3_add_standard_extensions oX509v3_add_standard_extensions
  #endif
  
-#ifdef HEADER_LHASH_H
+#ifndef NO_LHASH
  X509_OBJECT *X509_OBJECT_retrieve_by_subject(LHASH *h,int type,X509_NAME *name);
  #endif
  void X509_OBJECT_up_ref_count(X509_OBJECT *a);
diff --git a/crypto/x509v3/Makefile.ssl b/crypto/x509v3/Makefile.ssl

index b047d533cb347e05b1812636679e78fa6b235e8b..bcc54a5a3b53cde81b99293ddc2a8646ac864217 100644 (file)
--- a/crypto/x509v3/Makefile.ssl
+++ b/crypto/x509v3/Makefile.ssl
@@ -464,18 +464,19 @@ v3_utl.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
  v3_utl.o: ../cryptlib.h
  v3err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
  v3err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-v3err.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
-v3err.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-v3err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-v3err.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-v3err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-v3err.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
-v3err.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
-v3err.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
-v3err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-v3err.o: ../../include/openssl/pkcs7.h ../../include/openssl/rc2.h
-v3err.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-v3err.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-v3err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-v3err.o: ../../include/openssl/stack.h ../../include/openssl/x509.h
-v3err.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+v3err.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
+v3err.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+v3err.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+v3err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
+v3err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+v3err.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+v3err.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
+v3err.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+v3err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+v3err.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
+v3err.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+v3err.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+v3err.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+v3err.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+v3err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+v3err.o: ../../include/openssl/x509v3.h
diff --git a/crypto/x509v3/v3_lib.c b/crypto/x509v3/v3_lib.c

index 8f90970297e4b8d05a3e956f46845d2acacaec0d..ea86b9ebb9581b3acd517b1c4a49b8f7707fa020 100644 (file)
--- a/crypto/x509v3/v3_lib.c
+++ b/crypto/x509v3/v3_lib.c
@@ -215,7 +215,7 @@ void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit, int *idx)
                 if(crit) *crit = found_ex->critical;
                 return X509V3_EXT_d2i(found_ex);
         }
-       
+
         /* Extension not found */
         if(idx) *idx = -1;
         if(crit) *crit = -1;
diff --git a/crypto/x509v3/v3_utl.c b/crypto/x509v3/v3_utl.c

index 3f567180c597e2ca1f072267c309e773492f8ed1..0976bcc7116195ad3739f114905751e49d9992f3 100644 (file)
--- a/crypto/x509v3/v3_utl.c
+++ b/crypto/x509v3/v3_utl.c
@@ -65,6 +65,10 @@
  #include <openssl/x509v3.h>
  
  static char *strip_spaces(char *name);
+static int sk_strcmp(const char * const *a, const char * const *b);
+static STACK *get_email(X509_NAME *name, STACK_OF(GENERAL_NAME) *gens);
+static void str_free(void *str);
+static int append_ia5(STACK **sk, ASN1_IA5STRING *email);
  
  /* Add a CONF_VALUE name value pair to stack */
  
@@ -416,3 +420,86 @@ int name_cmp(const char *name, const char *cmp)
         if(!c || (c=='.')) return 0;
         return 1;
  }
+
+static int sk_strcmp(const char * const *a, const char * const *b)
+{
+       return strcmp(*a, *b);
+}
+
+STACK *X509_get1_email(X509 *x)
+{
+       STACK_OF(GENERAL_NAME) *gens;
+       STACK *ret;
+       gens = X509_get_ext_d2i(x, NID_subject_alt_name, NULL, NULL);
+       ret = get_email(X509_get_subject_name(x), gens);
+       sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
+       return ret;
+}
+
+STACK *X509_REQ_get1_email(X509_REQ *x)
+{
+       STACK_OF(GENERAL_NAME) *gens;
+       STACK_OF(X509_EXTENSION) *exts;
+       STACK *ret;
+       exts = X509_REQ_get_extensions(x);
+       gens = X509V3_get_d2i(exts, NID_subject_alt_name, NULL, NULL);
+       ret = get_email(X509_REQ_get_subject_name(x), gens);
+       sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
+       sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
+       return ret;
+}
+
+
+static STACK *get_email(X509_NAME *name, STACK_OF(GENERAL_NAME) *gens)
+{
+       STACK *ret = NULL;
+       X509_NAME_ENTRY *ne;
+       ASN1_IA5STRING *email;
+       GENERAL_NAME *gen;
+       int i;
+       /* Now add any email address(es) to STACK */
+       i = -1;
+       /* First supplied X509_NAME */
+       while((i = X509_NAME_get_index_by_NID(name,
+                                        NID_pkcs9_emailAddress, i)) > 0) {
+               ne = X509_NAME_get_entry(name, i);
+               email = X509_NAME_ENTRY_get_data(ne);
+               if(!append_ia5(&ret, email)) return NULL;
+       }
+       for(i = 0; i < sk_GENERAL_NAME_num(gens); i++)
+       {
+               gen = sk_GENERAL_NAME_value(gens, i);
+               if(gen->type != GEN_EMAIL) continue;
+               if(!append_ia5(&ret, gen->d.ia5)) return NULL;
+       }
+       return ret;
+}
+
+static void str_free(void *str)
+{
+       OPENSSL_free(str);
+}
+
+static int append_ia5(STACK **sk, ASN1_IA5STRING *email)
+{
+       char *emtmp;
+       /* First some sanity checks */
+       if(email->type != V_ASN1_IA5STRING) return 1;
+       if(!email->data || !email->length) return 1;
+       if(!*sk) *sk = sk_new(sk_strcmp);
+       if(!*sk) return 0;
+       /* Don't add duplicates */
+       if(sk_find(*sk, (char *)email->data) != -1) return 1;
+       emtmp = BUF_strdup((char *)email->data);
+       if(!emtmp || !sk_push(*sk, emtmp)) {
+               X509_email_free(*sk);
+               *sk = NULL;
+               return 0;
+       }
+       return 1;
+}
+
+void X509_email_free(STACK *sk)
+{
+       sk_pop_free(sk, str_free);
+}
diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h

index d3952c897799f2412d39b6297dc4b971e497a571..c66b5c3ebc16578ebc63cfd834106042d9d695df 100644 (file)
--- a/crypto/x509v3/x509v3.h
+++ b/crypto/x509v3/x509v3.h
@@ -793,6 +793,11 @@ int X509_PURPOSE_get_trust(X509_PURPOSE *xp);
  void X509_PURPOSE_cleanup(void);
  int X509_PURPOSE_get_id(X509_PURPOSE *);
  
+STACK *X509_get1_email(X509 *x);
+STACK *X509_REQ_get1_email(X509_REQ *x);
+void X509_email_free(STACK *sk);
+
+
  /* BEGIN ERROR CODES */
  /* 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.
diff --git a/doc/apps/x509.pod b/doc/apps/x509.pod

index e4ae5468da35a8979203cc392d7357c60573114f..133c4200ce385d6679b099b4729a775aaf8df244 100644 (file)
--- a/doc/apps/x509.pod
+++ b/doc/apps/x509.pod
@@ -19,6 +19,7 @@ B<openssl> B<x509>
  [B<-hash>]
  [B<-subject>]
  [B<-issuer>]
+[B<-email>]
  [B<-startdate>]
  [B<-enddate>]
  [B<-purpose>]
@@ -137,6 +138,10 @@ outputs the subject name.
  
  outputs the issuer name.
  
+=item B<-email>
+
+outputs the email address(es) if any.
+
  =item B<-startdate>
  
  prints out the start date of the certificate, that is the notBefore date.
@@ -402,6 +407,10 @@ two certificates with the same fingerprint can be considered to be the same.
  
  The Netscape fingerprint uses MD5 whereas MSIE uses SHA1.
  
+The B<-email> option searches the subject name and the subject alternative
+name extension. Only unique email addresses will be printed out: it will
+not print the same address more than once.
+
  =head1 CERTIFICATE EXTENSIONS
  
  The B<-purpose> option checks the certificate extensions and determines
diff --git a/doc/crypto/BN_mod_mul_montgomery.pod b/doc/crypto/BN_mod_mul_montgomery.pod

index b190b4013db1da6918540227912ec1d87b91ee15..0b8ab512df87097de499a862c0f47abd3f824cf9 100644 (file)
--- a/doc/crypto/BN_mod_mul_montgomery.pod
+++ b/doc/crypto/BN_mod_mul_montgomery.pod
@@ -39,7 +39,7 @@ BN_MONT_CTX_init() initializes an existing uninitialized B<BN_MONT_CTX>.
  BN_MONT_CTX_set() sets up the B<mont> structure from the modulus B<m>
  by precomputing its inverse and a value R.
  
-BN_MONT_CTX_copy() copies the B<N_MONT_CTX> B<from> to B<to>.
+BN_MONT_CTX_copy() copies the B<BN_MONT_CTX> B<from> to B<to>.
  
  BN_MONT_CTX_free() frees the components of the B<BN_MONT_CTX>, and, if
  it was created by BN_MONT_CTX_new(), also the structure itself.
diff --git a/doc/crypto/EVP_EncryptInit.pod b/doc/crypto/EVP_EncryptInit.pod

index 77ed4ccdba239fddbb0063fbf4352b25ce02bb30..a5cda778ca0930122ef23d54698780114cc03fdd 100644 (file)
--- a/doc/crypto/EVP_EncryptInit.pod
+++ b/doc/crypto/EVP_EncryptInit.pod
@@ -8,28 +8,30 @@ EVP_EncryptInit, EVP_EncryptUpdate, EVP_EncryptFinal - EVP cipher routines
  
   #include <openssl/evp.h>
  
- void EVP_EncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
+ int EVP_EncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
           unsigned char *key, unsigned char *iv);
- void EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
+ int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
           int *outl, unsigned char *in, int inl);
- void EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out,
+ int EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out,
           int *outl);
  
- void EVP_DecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
+ int EVP_DecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
           unsigned char *key, unsigned char *iv);
- void EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
+ int EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
           int *outl, unsigned char *in, int inl);
   int EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm,
           int *outl);
  
- void EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
+ int EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
           unsigned char *key, unsigned char *iv, int enc);
- void EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
+ int EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
           int *outl, unsigned char *in, int inl);
   int EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm,
           int *outl);
  
- void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a);
+ int EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
+ int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr);
+ int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a);
  
   const EVP_CIPHER *EVP_get_cipherbyname(const char *name);
   #define EVP_get_cipherbynid(a) EVP_get_cipherbyname(OBJ_nid2sn(a))
@@ -38,15 +40,21 @@ EVP_EncryptInit, EVP_EncryptUpdate, EVP_EncryptFinal - EVP cipher routines
   #define EVP_CIPHER_nid(e)             ((e)->nid)
   #define EVP_CIPHER_block_size(e)      ((e)->block_size)
   #define EVP_CIPHER_key_length(e)      ((e)->key_len)
- #define EVP_CIPHER_iv_length(e)       ((e)->iv_len)
-
+ #define EVP_CIPHER_iv_length(e)               ((e)->iv_len)
+ #define EVP_CIPHER_flags(e)           ((e)->flags)
+ #define EVP_CIPHER_mode(e)            ((e)->flags) & EVP_CIPH_MODE)
   int EVP_CIPHER_type(const EVP_CIPHER *ctx);
+
   #define EVP_CIPHER_CTX_cipher(e)      ((e)->cipher)
   #define EVP_CIPHER_CTX_nid(e)         ((e)->cipher->nid)
   #define EVP_CIPHER_CTX_block_size(e)  ((e)->cipher->block_size)
- #define EVP_CIPHER_CTX_key_length(e)  ((e)->cipher->key_len)
+ #define EVP_CIPHER_CTX_key_length(e)  ((e)->key_len)
   #define EVP_CIPHER_CTX_iv_length(e)   ((e)->cipher->iv_len)
+ #define EVP_CIPHER_CTX_get_app_data(e)        ((e)->app_data)
+ #define EVP_CIPHER_CTX_set_app_data(e,d) ((e)->app_data=(char *)(d))
   #define EVP_CIPHER_CTX_type(c)         EVP_CIPHER_type(EVP_CIPHER_CTX_cipher(c))
+ #define EVP_CIPHER_CTX_flags(e)               ((e)->cipher->flags)
+ #define EVP_CIPHER_CTX_mode(e)                ((e)->cipher->flags & EVP_CIPH_MODE)
  
   int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
   int EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
@@ -62,10 +70,8 @@ as EVP_des_cbc() . B<key> is the symmetric key to use and B<iv> is the
  IV to use (if necessary), the actual number of bytes used for the
  key and IV depends on the cipher. It is possible to set all parameters
  to NULL except B<type> in an initial call and supply the remaining
-parameters in subsequent calls. This is normally done when the 
-EVP_CIPHER_asn1_to_param() function is called to set the cipher
-parameters from an ASN1 AlgorithmIdentifier and the key from a
-different source.
+parameters in subsequent calls, all of which have B<type> set to NULL.
+This is done when the default cipher parameters are not appropriate.
  
  EVP_EncryptUpdate() encrypts B<inl> bytes from the buffer B<in> and
  writes the encrypted version to B<out>. This function can be called
@@ -93,7 +99,8 @@ cipher block size is 1 in which case B<inl> bytes is sufficient.
  EVP_CipherInit(), EVP_CipherUpdate() and EVP_CipherFinal() are functions
  that can be used for decryption or encryption. The operation performed
  depends on the value of the B<enc> parameter. It should be set to 1 for
-encryption and 0 for decryption.
+encryption, 0 for decryption and -1 to leave the value unchanged (the
+actual value of 'enc' being supplied in a previous call).
  
  EVP_CIPHER_CTX_cleanup() clears all information from a cipher context.
  It should be called after all operations using a cipher are complete
@@ -111,7 +118,13 @@ IDENTIFIER.
  EVP_CIPHER_key_length() and EVP_CIPHER_CTX_key_length() return the key
  length of a cipher when passed an B<EVP_CIPHER> or B<EVP_CIPHER_CTX>
  structure. The constant B<EVP_MAX_KEY_LENGTH> is the maximum key length
-for all ciphers.
+for all ciphers. Note: although EVP_CIPHER_key_length() is fixed for a
+given cipher, the value of EVP_CIPHER_CTX_key_length() may be different
+for variable key length ciphers.
+
+EVP_CIPHER_CTX_set_key_length() sets the key length of the cipher ctx.
+If the cipher is a fixed length cipher then attempting to set the key
+length to any value other than the fixed value is an error.
  
  EVP_CIPHER_iv_length() and EVP_CIPHER_CTX_iv_length() return the IV
  length of a cipher when passed an B<EVP_CIPHER> or B<EVP_CIPHER_CTX>.
@@ -133,6 +146,11 @@ B<NID_undef>.
  EVP_CIPHER_CTX_cipher() returns the B<EVP_CIPHER> structure when passed
  an B<EVP_CIPHER_CTX> structure.
  
+EVP_CIPHER_mode() and EVP_CIPHER_CTX_mode() return the block cipher mode:
+EVP_CIPH_ECB_MODE, EVP_CIPH_CBC_MODE, EVP_CIPH_CFB_MODE or
+EVP_CIPH_OFB_MODE. If the cipher is a stream cipher then
+EVP_CIPH_STREAM_CIPHER is returned.
+
  EVP_CIPHER_param_to_asn1() sets the AlgorithmIdentifier "parameter" based
  on the passed cipher. This will typically include any parameters and an
  IV. The cipher IV (if any) must be set when this call is made. This call
@@ -149,21 +167,24 @@ key set to NULL, EVP_CIPHER_asn1_to_param() will be called and finally
  EVP_CipherInit() again with all parameters except the key set to NULL. It is
  possible for this function to fail if the cipher does not have any ASN1 support
  or the parameters cannot be set (for example the RC2 effective key length
-does not have an B<EVP_CIPHER> structure).
+is not supported.
+
+EVP_CIPHER_CTX_ctrl() allows various cipher specific parameters to be determined
+and set. Currently only the RC2 effective key length and the number of rounds of
+RC5 can be set.
  
  =head1 RETURN VALUES
  
-EVP_EncryptInit(), EVP_EncryptUpdate() and EVP_EncryptFinal() do not return
-values.
+EVP_EncryptInit(), EVP_EncryptUpdate() and EVP_EncryptFinal() return 1 for success
+and 0 for failure.
  
-EVP_DecryptInit() and EVP_DecryptUpdate() do not return values.
+EVP_DecryptInit() and EVP_DecryptUpdate() return 1 for success and 0 for failure.
  EVP_DecryptFinal() returns 0 if the decrypt failed or 1 for success.
  
-EVP_CipherInit() and EVP_CipherUpdate() do not return values.
-EVP_CipherFinal() returns 1 for a decryption failure or 1 for success, if
-the operation is encryption then it always returns 1.
+EVP_CipherInit() and EVP_CipherUpdate() return 1 for success and 0 for failure.
+EVP_CipherFinal() returns 1 for a decryption failure or 1 for success.
  
-EVP_CIPHER_CTX_cleanup() does not return a value.
+EVP_CIPHER_CTX_cleanup() returns 1 for success and 0 for failure.
  
  EVP_get_cipherbyname(), EVP_get_cipherbynid() and EVP_get_cipherbyobj()
  return an B<EVP_CIPHER> structure or NULL on error.
@@ -187,6 +208,75 @@ EVP_CIPHER_CTX_cipher() returns an B<EVP_CIPHER> structure.
  EVP_CIPHER_param_to_asn1() and EVP_CIPHER_asn1_to_param() return 1 for 
  success or zero for failure.
  
+=head1 CIPHER LISTING
+
+All algorithms have a fixed key length unless otherwise stated.
+
+=over 4
+
+=item EVP_enc_null()
+
+Null cipher: does nothing.
+
+=item EVP_des_cbc(void), EVP_des_ecb(void), EVP_des_cfb(void), EVP_des_ofb(void)
+
+DES in CBC, ECB, CFB and OFB modes respectively. 
+
+=item EVP_des_ede_cbc(void), EVP_des_ede(), EVP_des_ede_ofb(void),  EVP_des_ede_cfb(void)
+
+Two key triple DES in CBC, ECB, CFB and OFB modes respectively.
+
+=item EVP_des_ede3_cbc(void), EVP_des_ede3(), EVP_des_ede3_ofb(void),  EVP_des_ede3_cfb(void)
+
+Three key triple DES in CBC, ECB, CFB and OFB modes respectively.
+
+=item EVP_desx_cbc(void)
+
+DESX algorithm in CBC mode.
+
+=item EVP_rc4(void)
+
+RC4 stream cipher. This is a variable key length cipher with default key length 128 bits.
+
+=item EVP_rc4_40(void)
+
+RC4 stream cipher with 40 bit key length. This is obsolete and new code should use EVP_rc4()
+and the EVP_CIPHER_CTX_set_key_length() function.
+
+=item EVP_idea_cbc() EVP_idea_ecb(void), EVP_idea_cfb(void), EVP_idea_ofb(void), EVP_idea_cbc(void)
+
+IDES encryption algorothm in CBC, ECB, CFB and OFB modes respectively.
+
+=item EVP_rc2_cbc(void), EVP_rc2_ecb(void), EVP_rc2_cfb(void), EVP_rc2_ofb(void)
+
+RC2 encryption algorithm in CBC, ECB, CFB and OFB modes respectively. This is a variable key
+length cipher with an additional parameter called "effective key bits" or "effective key length".
+By default both are set to 128 bits.
+
+=item EVP_rc2_40_cbc(void), EVP_rc2_64_cbc(void)
+
+RC2 algorithm in CBC mode with a default key length and effective key length of 40 and 64 bits.
+These are obsolete and new code should use EVP_rc2_cbc(), EVP_CIPHER_CTX_set_key_length() and
+EVP_CIPHER_CTX_ctrl() to set the key length and effective key length.
+
+=item EVP_bf_cbc(void), EVP_bf_ecb(void), EVP_bf_cfb(void), EVP_bf_ofb(void);
+
+Blowfish encryption algorithm in CBC, ECB, CFB and OFB modes respectively. This is a variable key
+length cipher.
+
+=item EVP_cast5_cbc(void), EVP_cast5_ecb(void), EVP_cast5_cfb(void), EVP_cast5_ofb(void)
+
+CAST encryption algorithm in CBC, ECB, CFB and OFB modes respectively. This is a variable key
+length cipher.
+
+=item EVP_rc5_32_12_16_cbc(void), EVP_rc5_32_12_16_ecb(void), EVP_rc5_32_12_16_cfb(void), EVP_rc5_32_12_16_ofb(void)
+
+RC5 encryption algorithm in CBC, ECB, CFB and OFB modes respectively. This is a variable key length
+cipher with an additional "number of rounds" parameter. By default the key length is set to 128
+bits and 12 rounds.
+
+=back
+
  =head1 NOTES
  
  Where possible the B<EVP> interface to symmetric ciphers should be used in
@@ -206,14 +296,49 @@ test that the input data or key is correct. A random block has better than
  1 in 256 chance of being of the correct format and problems with the
  input data earlier on will not produce a final decrypt error.
  
+The functions EVP_EncryptInit(), EVP_EncryptUpdate(), EVP_EncryptFinal(),
+EVP_DecryptInit(), EVP_DecryptUpdate(), EVP_CipherInit() and EVP_CipherUpdate()
+and EVP_CIPHER_CTX_cleanup() did not return errors in OpenSSL version 0.9.5a or
+earlier. Software only versions of encryption algorithms will never return
+error codes for these functions, unless there is a programming error (for example
+and attempt to set the key before the cipher is set in EVP_EncryptInit() ).
+
  =head1 BUGS
  
-The current B<EVP> cipher interface is not as flexible as it should be. Only
-certain "spot" encryption algorithms can be used for ciphers which have various
-parameters associated with them (RC2, RC5 for example) this is inadequate.
+For RC5 the number of rounds can currently only be set to 8, 12 or 16. This is
+a limitation of the current RC5 code rather than the EVP interface.
+
+It should be possible to disable PKCS padding: currently it isn't.
+
+EVP_MAX_KEY_LENGTH and EVP_MAX_IV_LENGTH only refer to the internal ciphers with
+default key lengths. If custom ciphers exceed these values the results are
+unpredictable. This is because it has become standard practice to define a 
+generic key as a fixed unsigned char array containing EVP_MAX_KEY_LENGTH bytes.
+
+The ASN1 code is incomplete (and sometimes innacurate) it has only been tested
+for certain common S/MIME ciphers (RC2, DES, triple DES) in CBC mode.
+
+=head1 EXAMPLES
+
+Get the number of rounds used in RC5:
+
+ int nrounds;
+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GET_RC5_ROUNDS, 0, &i);
+
+Get the RC2 effective key length:
+
+ int key_bits;
+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GET_RC2_KEY_BITS, 0, &i);
+
+Set the number of rounds used in RC5:
+
+ int nrounds;
+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_SET_RC5_ROUNDS, i, NULL);
+
+Set the number of rounds used in RC2:
  
-Several of the functions do not return error codes because the software versions
-can never fail. This is not true of hardware versions.
+ int nrounds;
+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_SET_RC2_KEY_BITS, i, NULL);
  
  =head1 SEE ALSO
  
diff --git a/doc/crypto/EVP_OpenInit.pod b/doc/crypto/EVP_OpenInit.pod

index 9707a4b3997d722bf8dbcc694803baa1cc5783dc..c0e5163e8ccc4c06adde081564eb41e375935a16 100644 (file)
--- a/doc/crypto/EVP_OpenInit.pod
+++ b/doc/crypto/EVP_OpenInit.pod
@@ -10,9 +10,9 @@ EVP_OpenInit, EVP_OpenUpdate, EVP_OpenFinal - EVP envelope decryption
  
   int EVP_OpenInit(EVP_CIPHER_CTX *ctx,EVP_CIPHER *type,unsigned char *ek,
                 int ekl,unsigned char *iv,EVP_PKEY *priv);
- void EVP_OpenUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
+ int EVP_OpenUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
           int *outl, unsigned char *in, int inl);
- void EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out,
+ int EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out,
           int *outl);
  
  =head1 DESCRIPTION
@@ -29,16 +29,28 @@ The IV is supplied in the B<iv> parameter.
  EVP_OpenUpdate() and EVP_OpenFinal() have exactly the same properties
  as the EVP_DecryptUpdate() and EVP_DecryptFinal() routines, as 
  documented on the L<EVP_EncryptInit(3)|EVP_EncryptInit(3)> manual
-page. 
+page.
+
+=head1 NOTES
+
+It is possible to call EVP_OpenInit() twice in the same way as
+EVP_DecryptInit(). The first call should have B<priv> set to NULL
+and (after setting any cipher paramaters) it should be called again
+with B<type> set to NULL.
+
+If the cipher passed in the B<type> parameter is a variable length
+cipher then the key length will be set to the value of the recovered
+key length. If the cipher is a fixed length cipher then the recovered
+key length must match the fixed cipher length.
  
  =head1 RETURN VALUES
  
-EVP_OpenInit() returns -1 on error or an non zero integer (actually the
+EVP_OpenInit() returns 0 on error or a non zero integer (actually the
  recovered secret key size) if successful.
  
-EVP_SealUpdate() does not return a value.
+EVP_OpenUpdate() returns 1 for success or 0 for failure.
  
-EVP_SealFinal() returns 0 if the decrypt failed or 1 for success.
+EVP_OpenFinal() returns 0 if the decrypt failed or 1 for success.
  
  =head1 SEE ALSO
  
diff --git a/doc/crypto/EVP_SealInit.pod b/doc/crypto/EVP_SealInit.pod

index 1579d110fa282035237df1a65a89855e6c143133..9579e91d2eb598a2eaa81447c09c0a8bc935cb76 100644 (file)
--- a/doc/crypto/EVP_SealInit.pod
+++ b/doc/crypto/EVP_SealInit.pod
@@ -10,9 +10,9 @@ EVP_SealInit, EVP_SealUpdate, EVP_SealFinal - EVP envelope encryption
  
   int EVP_SealInit(EVP_CIPHER_CTX *ctx, EVP_CIPHER *type, unsigned char **ek,
                 int *ekl, unsigned char *iv,EVP_PKEY **pubk, int npubk);
- void EVP_SealUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
+ int EVP_SealUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
           int *outl, unsigned char *in, int inl);
- void EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out,
+ int EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out,
           int *outl);
  
  =head1 DESCRIPTION
@@ -41,9 +41,10 @@ page.
  
  =head1 RETURN VALUES
  
-EVP_SealInit() returns -1 on error or B<npubk> if successful.
+EVP_SealInit() returns 0 on error or B<npubk> if successful.
  
-EVP_SealUpdate() and EVP_SealFinal() do not return values.
+EVP_SealUpdate() and EVP_SealFinal() return 1 for success and 0 for
+failure.
  
  =head1 NOTES
  
@@ -59,6 +60,11 @@ but symmetric encryption is fast. So symmetric encryption is used for
  bulk encryption and the small random symmetric key used is transferred
  using public key encryption.
  
+It is possible to call EVP_SealInit() twice in the same way as
+EVP_EncryptInit(). The first call should have B<npubk> set to 0
+and (after setting any cipher paramaters) it should be called again
+with B<type> set to NULL.
+
  =head1 SEE ALSO
  
  L<evp(3)|evp(3)>,L<rand(3)|rand(3)>
diff --git a/e_os.h b/e_os.h

index 948a8bfd7e1b664c5af9fe95b44ee5f7090d9927..487f0b2fb39c480c6c0f23631aca7bd48bff635b 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -404,7 +404,12 @@ extern HINSTANCE _hInstance;
  #endif
  
  #if defined(sun) && !defined(__svr4__) && !defined(__SVR4)
-#define memmove(s1,s2,n) bcopy((s2),(s1),(n))
+  /* bcopy can handle overlapping moves according to SunOS 4.1.4 manpage */
+# define memmove(s1,s2,n) bcopy((s2),(s1),(n))
+# define strtoul(s,e,b) ((unsigned long int)strtol((s),(e),(b)))
+extern char *sys_errlist[]; extern int sys_nerr;
+# define strerror(errnum) \
+       (((errnum)<0 || (errnum)>=sys_nerr) ? NULL : sys_errlist[errnum])
  #endif
  
  /***********************************************/
diff --git a/rsaref/Makefile.ssl b/rsaref/Makefile.ssl

index f338427a02b55a8e84e3dcd3dff328a8e6e4f813..293091417809fec133578121d146c261a914fd3d 100644 (file)
--- a/rsaref/Makefile.ssl
+++ b/rsaref/Makefile.ssl
@@ -85,15 +85,17 @@ clean:
  
  # DO NOT DELETE THIS LINE -- make depend depends on it.
  
-rsar_err.o: ../include/openssl/bn.h ../include/openssl/crypto.h
-rsar_err.o: ../include/openssl/err.h ../include/openssl/opensslconf.h
+rsar_err.o: ../include/openssl/bio.h ../include/openssl/bn.h
+rsar_err.o: ../include/openssl/crypto.h ../include/openssl/err.h
+rsar_err.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
  rsar_err.o: ../include/openssl/opensslv.h ../include/openssl/rsa.h
  rsar_err.o: ../include/openssl/rsaref.h ../include/openssl/safestack.h
  rsar_err.o: ../include/openssl/stack.h
  rsaref.o: ../crypto/cryptlib.h ../include/openssl/bio.h ../include/openssl/bn.h
  rsaref.o: ../include/openssl/buffer.h ../include/openssl/crypto.h
  rsaref.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-rsaref.o: ../include/openssl/err.h ../include/openssl/opensslconf.h
-rsaref.o: ../include/openssl/opensslv.h ../include/openssl/rand.h
-rsaref.o: ../include/openssl/rsa.h ../include/openssl/rsaref.h
-rsaref.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+rsaref.o: ../include/openssl/err.h ../include/openssl/lhash.h
+rsaref.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+rsaref.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+rsaref.o: ../include/openssl/rsaref.h ../include/openssl/safestack.h
+rsaref.o: ../include/openssl/stack.h
diff --git a/ssl/Makefile.ssl b/ssl/Makefile.ssl

index d7345ae723618ea8e6aebd10eb5dfc2d0f6fdc59..6ab68d4b928cef925253f3421cfbc2066b213ade 100644 (file)
--- a/ssl/Makefile.ssl
+++ b/ssl/Makefile.ssl
@@ -97,23 +97,23 @@ clean:
  bio_ssl.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  bio_ssl.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  bio_ssl.o: ../include/openssl/buffer.h ../include/openssl/cast.h
-bio_ssl.o: ../include/openssl/crypto.h ../include/openssl/des.h
-bio_ssl.o: ../include/openssl/dh.h ../include/openssl/dsa.h
-bio_ssl.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-bio_ssl.o: ../include/openssl/evp.h ../include/openssl/idea.h
-bio_ssl.o: ../include/openssl/lhash.h ../include/openssl/md2.h
-bio_ssl.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-bio_ssl.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-bio_ssl.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-bio_ssl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-bio_ssl.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-bio_ssl.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
-bio_ssl.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-bio_ssl.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-bio_ssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-bio_ssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-bio_ssl.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-bio_ssl.o: ../include/openssl/x509_vfy.h
+bio_ssl.o: ../include/openssl/comp.h ../include/openssl/crypto.h
+bio_ssl.o: ../include/openssl/des.h ../include/openssl/dh.h
+bio_ssl.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
+bio_ssl.o: ../include/openssl/err.h ../include/openssl/evp.h
+bio_ssl.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+bio_ssl.o: ../include/openssl/md2.h ../include/openssl/md5.h
+bio_ssl.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+bio_ssl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+bio_ssl.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+bio_ssl.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
+bio_ssl.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+bio_ssl.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+bio_ssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+bio_ssl.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+bio_ssl.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+bio_ssl.o: ../include/openssl/stack.h ../include/openssl/tls1.h
+bio_ssl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
  s23_clnt.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  s23_clnt.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  s23_clnt.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -581,43 +581,43 @@ ssl_ciph.o: ../include/openssl/x509_vfy.h ssl_locl.h
  ssl_err.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  ssl_err.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  ssl_err.o: ../include/openssl/buffer.h ../include/openssl/cast.h
-ssl_err.o: ../include/openssl/crypto.h ../include/openssl/des.h
-ssl_err.o: ../include/openssl/dh.h ../include/openssl/dsa.h
-ssl_err.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-ssl_err.o: ../include/openssl/evp.h ../include/openssl/idea.h
-ssl_err.o: ../include/openssl/lhash.h ../include/openssl/md2.h
-ssl_err.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-ssl_err.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-ssl_err.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-ssl_err.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-ssl_err.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-ssl_err.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
-ssl_err.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-ssl_err.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-ssl_err.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-ssl_err.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-ssl_err.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-ssl_err.o: ../include/openssl/x509_vfy.h
+ssl_err.o: ../include/openssl/comp.h ../include/openssl/crypto.h
+ssl_err.o: ../include/openssl/des.h ../include/openssl/dh.h
+ssl_err.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
+ssl_err.o: ../include/openssl/err.h ../include/openssl/evp.h
+ssl_err.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+ssl_err.o: ../include/openssl/md2.h ../include/openssl/md5.h
+ssl_err.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+ssl_err.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+ssl_err.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+ssl_err.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
+ssl_err.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+ssl_err.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+ssl_err.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+ssl_err.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+ssl_err.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+ssl_err.o: ../include/openssl/stack.h ../include/openssl/tls1.h
+ssl_err.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
  ssl_err2.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  ssl_err2.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  ssl_err2.o: ../include/openssl/buffer.h ../include/openssl/cast.h
-ssl_err2.o: ../include/openssl/crypto.h ../include/openssl/des.h
-ssl_err2.o: ../include/openssl/dh.h ../include/openssl/dsa.h
-ssl_err2.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-ssl_err2.o: ../include/openssl/evp.h ../include/openssl/idea.h
-ssl_err2.o: ../include/openssl/lhash.h ../include/openssl/md2.h
-ssl_err2.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-ssl_err2.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-ssl_err2.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-ssl_err2.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-ssl_err2.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-ssl_err2.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
-ssl_err2.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-ssl_err2.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-ssl_err2.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-ssl_err2.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-ssl_err2.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-ssl_err2.o: ../include/openssl/x509_vfy.h
+ssl_err2.o: ../include/openssl/comp.h ../include/openssl/crypto.h
+ssl_err2.o: ../include/openssl/des.h ../include/openssl/dh.h
+ssl_err2.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
+ssl_err2.o: ../include/openssl/err.h ../include/openssl/evp.h
+ssl_err2.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+ssl_err2.o: ../include/openssl/md2.h ../include/openssl/md5.h
+ssl_err2.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
+ssl_err2.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+ssl_err2.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+ssl_err2.o: ../include/openssl/pkcs7.h ../include/openssl/rc2.h
+ssl_err2.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+ssl_err2.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+ssl_err2.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+ssl_err2.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+ssl_err2.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+ssl_err2.o: ../include/openssl/stack.h ../include/openssl/tls1.h
+ssl_err2.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
  ssl_lib.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  ssl_lib.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  ssl_lib.o: ../include/openssl/buffer.h ../include/openssl/cast.h
diff --git a/ssl/ssl.h b/ssl/ssl.h

index 16fe6940b8248eb9b76618eb421ac1380700afe9..7c60bb74015d3e038d1bf717a23277a45cb1c735 100644 (file)
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -59,6 +59,15 @@
  #ifndef HEADER_SSL_H 
  #define HEADER_SSL_H 
  
+#ifndef NO_COMP
+#include <openssl/comp.h>
+#endif
+#ifndef NO_BIO
+#include <openssl/bio.h>
+#endif
+#ifndef NO_X509
+#include <openssl/x509.h>
+#endif
  #include <openssl/safestack.h>
  
  #ifdef  __cplusplus
@@ -385,7 +394,7 @@ typedef struct ssl_comp_st
  {
      int id;
      char *name;
-#ifdef HEADER_COMP_H
+#ifndef NO_COMP
      COMP_METHOD *method;
  #else
      char *method;
@@ -603,7 +612,7 @@ struct ssl_st
          * same.  This is so data can be read and written to different
          * handlers */
  
-#ifdef HEADER_BIO_H
+#ifndef NO_BIO
         BIO *rbio; /* used by SSL_read */
         BIO *wbio; /* used by SSL_write */
         BIO *bbio; /* used during session-id reuse to concatinate
@@ -667,7 +676,7 @@ struct ssl_st
  
         EVP_CIPHER_CTX *enc_read_ctx;           /* cryptographic state */
         const EVP_MD *read_hash;                /* used for mac generation */
-#ifdef HEADER_COMP_H
+#ifndef NO_COMP
         COMP_CTX *expand;                       /* uncompress */
  #else
         char *expand;
@@ -675,7 +684,7 @@ struct ssl_st
  
         EVP_CIPHER_CTX *enc_write_ctx;          /* cryptographic state */
         const EVP_MD *write_hash;               /* used for mac generation */
-#ifdef HEADER_COMP_H
+#ifndef NO_COMP
         COMP_CTX *compress;                     /* compression */
  #else
         char *compress; 
@@ -961,7 +970,7 @@ size_t SSL_get_peer_finished(SSL *s, void *buf, size_t count);
  #define SSL_add_dir_cert_subjects_to_stack SSL_add_dir_cert_sub_to_stack
  #endif
  
-#ifdef HEADER_BIO_H
+#ifndef NO_BIO
  BIO_METHOD *BIO_f_ssl(void);
  BIO *BIO_new_ssl(SSL_CTX *ctx,int client);
  BIO *BIO_new_ssl_connect(SSL_CTX *ctx);
@@ -998,7 +1007,7 @@ int        SSL_set_fd(SSL *s, int fd);
  int    SSL_set_rfd(SSL *s, int fd);
  int    SSL_set_wfd(SSL *s, int fd);
  #endif
-#ifdef HEADER_BIO_H
+#ifndef NO_BIO
  void   SSL_set_bio(SSL *s, BIO *rbio,BIO *wbio);
  BIO *  SSL_get_rbio(SSL *s);
  BIO *  SSL_get_wbio(SSL *s);
@@ -1053,7 +1062,7 @@ int       SSL_SESSION_cmp(SSL_SESSION *a,SSL_SESSION *b);
  #ifndef NO_FP_API
  int    SSL_SESSION_print_fp(FILE *fp,SSL_SESSION *ses);
  #endif
-#ifdef HEADER_BIO_H
+#ifndef NO_BIO
  int    SSL_SESSION_print(BIO *fp,SSL_SESSION *ses);
  #endif
  void   SSL_SESSION_free(SSL_SESSION *ses);
@@ -1249,7 +1258,7 @@ void SSL_set_tmp_dh_callback(SSL *ssl,
                                            int keylength));
  #endif
  
-#ifdef HEADER_COMP_H
+#ifndef NO_COMP
  int SSL_COMP_add_compression_method(int id,COMP_METHOD *cm);
  #else
  int SSL_COMP_add_compression_method(int id,char *cm);
diff --git a/ssl/ssl3.h b/ssl/ssl3.h

index f616763830e3362da08ab44b0a90c247b5d2bd7e..7ee1feaa677cb3785a2dfebbb83bd6948fe7c0b3 100644 (file)
--- a/ssl/ssl3.h
+++ b/ssl/ssl3.h
@@ -59,6 +59,9 @@
  #ifndef HEADER_SSL3_H 
  #define HEADER_SSL3_H 
  
+#ifndef NO_COMP
+#include <openssl/comp.h>
+#endif
  #include <openssl/buffer.h>
  #include <openssl/evp.h>
  #include <openssl/ssl.h>
@@ -310,7 +313,7 @@ typedef struct ssl3_state_st
  
                 const EVP_CIPHER *new_sym_enc;
                 const EVP_MD *new_hash;
-#ifdef HEADER_COMP_H
+#ifndef NO_COMP
                 const SSL_COMP *new_compression;
  #else
                 char *new_compression;
diff --git a/test/Makefile.ssl b/test/Makefile.ssl

index 76bd1d0832be5ef79123136bf19dd1fd17655ff2..c4e1e1b10768f1dfe9556b9712d8c9b699b1ce53 100644 (file)
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -320,11 +320,12 @@ $(ENGINETEST): $(ENGINETEST).o $(DLIBCRYPTO)
  bftest.o: ../include/openssl/blowfish.h
  bntest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  bntest.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
-bntest.o: ../include/openssl/cast.h ../include/openssl/crypto.h
-bntest.o: ../include/openssl/des.h ../include/openssl/dh.h
-bntest.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
-bntest.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-bntest.o: ../include/openssl/evp.h ../include/openssl/idea.h
+bntest.o: ../include/openssl/buffer.h ../include/openssl/cast.h
+bntest.o: ../include/openssl/crypto.h ../include/openssl/des.h
+bntest.o: ../include/openssl/dh.h ../include/openssl/dsa.h
+bntest.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
+bntest.o: ../include/openssl/err.h ../include/openssl/evp.h
+bntest.o: ../include/openssl/idea.h ../include/openssl/lhash.h
  bntest.o: ../include/openssl/md2.h ../include/openssl/md5.h
  bntest.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
  bntest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
@@ -345,20 +346,21 @@ dhtest.o: ../include/openssl/stack.h
  dsatest.o: ../include/openssl/bio.h ../include/openssl/bn.h
  dsatest.o: ../include/openssl/crypto.h ../include/openssl/dh.h
  dsatest.o: ../include/openssl/dsa.h ../include/openssl/err.h
-dsatest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-dsatest.o: ../include/openssl/rand.h ../include/openssl/safestack.h
-dsatest.o: ../include/openssl/stack.h
-enginetest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
-enginetest.o: ../include/openssl/dh.h ../include/openssl/dsa.h
-enginetest.o: ../include/openssl/engine.h ../include/openssl/err.h
+dsatest.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
+dsatest.o: ../include/openssl/opensslv.h ../include/openssl/rand.h
+dsatest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+enginetest.o: ../include/openssl/bio.h ../include/openssl/bn.h
+enginetest.o: ../include/openssl/crypto.h ../include/openssl/dh.h
+enginetest.o: ../include/openssl/dsa.h ../include/openssl/engine.h
+enginetest.o: ../include/openssl/err.h ../include/openssl/lhash.h
  enginetest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
  enginetest.o: ../include/openssl/rand.h ../include/openssl/rsa.h
  enginetest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
  exptest.o: ../include/openssl/bio.h ../include/openssl/bn.h
  exptest.o: ../include/openssl/crypto.h ../include/openssl/err.h
-exptest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-exptest.o: ../include/openssl/rand.h ../include/openssl/safestack.h
-exptest.o: ../include/openssl/stack.h
+exptest.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
+exptest.o: ../include/openssl/opensslv.h ../include/openssl/rand.h
+exptest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
  hmactest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  hmactest.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  hmactest.o: ../include/openssl/cast.h ../include/openssl/crypto.h
@@ -383,9 +385,10 @@ rc2test.o: ../include/openssl/opensslconf.h ../include/openssl/rc2.h
  rc4test.o: ../include/openssl/opensslconf.h ../include/openssl/rc4.h
  rc5test.o: ../include/openssl/rc5.h
  rmdtest.o: ../include/openssl/ripemd.h
-rsa_test.o: ../include/openssl/bn.h ../include/openssl/crypto.h
-rsa_test.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-rsa_test.o: ../include/openssl/err.h ../include/openssl/opensslconf.h
+rsa_test.o: ../include/openssl/bio.h ../include/openssl/bn.h
+rsa_test.o: ../include/openssl/crypto.h ../include/openssl/e_os.h
+rsa_test.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+rsa_test.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
  rsa_test.o: ../include/openssl/opensslv.h ../include/openssl/rand.h
  rsa_test.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
  rsa_test.o: ../include/openssl/stack.h
@@ -394,21 +397,21 @@ shatest.o: ../include/openssl/sha.h
  ssltest.o: ../include/openssl/asn1.h ../include/openssl/bio.h
  ssltest.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
  ssltest.o: ../include/openssl/buffer.h ../include/openssl/cast.h
-ssltest.o: ../include/openssl/crypto.h ../include/openssl/des.h
-ssltest.o: ../include/openssl/dh.h ../include/openssl/dsa.h
-ssltest.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-ssltest.o: ../include/openssl/err.h ../include/openssl/evp.h
-ssltest.o: ../include/openssl/idea.h ../include/openssl/lhash.h
-ssltest.o: ../include/openssl/md2.h ../include/openssl/md5.h
-ssltest.o: ../include/openssl/mdc2.h ../include/openssl/objects.h
-ssltest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-ssltest.o: ../include/openssl/pem.h ../include/openssl/pem2.h
-ssltest.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
-ssltest.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-ssltest.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
-ssltest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-ssltest.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-ssltest.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-ssltest.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-ssltest.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-ssltest.o: ../include/openssl/x509_vfy.h
+ssltest.o: ../include/openssl/comp.h ../include/openssl/crypto.h
+ssltest.o: ../include/openssl/des.h ../include/openssl/dh.h
+ssltest.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
+ssltest.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+ssltest.o: ../include/openssl/evp.h ../include/openssl/idea.h
+ssltest.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+ssltest.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
+ssltest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+ssltest.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
+ssltest.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+ssltest.o: ../include/openssl/rand.h ../include/openssl/rc2.h
+ssltest.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
+ssltest.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
+ssltest.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+ssltest.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+ssltest.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+ssltest.o: ../include/openssl/stack.h ../include/openssl/tls1.h
+ssltest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
diff --git a/util/libeay.num b/util/libeay.num

index 91b3b566d39d1e29cc9a86dd830facc866227f62..85b99f00102d9d03baa2fef0d564dd39e223cc36 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -1822,3 +1822,55 @@ X509_CRL_digest                         2391
  d2i_ASN1_SET_OF_PKCS7                   2397
  EVP_CIPHER_CTX_set_key_length           2399
  EVP_CIPHER_CTX_ctrl                     2400
+BN_mod_exp_mont_word                    2401
+RAND_egd_bytes                          2402
+X509_REQ_get1_email                     2403
+X509_get1_email                         2404
+X509_email_free                         2405
+ERR_load_ENGINE_strings                 2406
+ENGINE_set_DSA                          2407
+ENGINE_get_default_RSA                  2408
+ENGINE_get_BN_mod_exp                   2409
+DSA_get_default_openssl_method          2410
+ENGINE_set_DH                           2411
+ENGINE_set_default_BN_mod_exp_crt       2412
+ENGINE_init                             2413
+DH_get_default_openssl_method           2414
+RSA_set_default_openssl_method          2415
+ENGINE_finish                           2416
+ENGINE_get_DH                           2417
+ENGINE_set_default_DSA                  2418
+ENGINE_get_name                         2419
+ENGINE_get_last                         2420
+ENGINE_get_prev                         2421
+ENGINE_get_default_DH                   2422
+ENGINE_get_RSA                          2423
+ENGINE_set_default                      2424
+ENGINE_get_RAND                         2425
+ENGINE_get_first                        2426
+ENGINE_by_id                            2427
+ENGINE_get_default_BN_mod_exp_crt       2428
+RSA_get_default_openssl_method          2429
+ENGINE_set_RSA                          2430
+ENGINE_set_default_RAND                 2431
+ENGINE_set_BN_mod_exp                   2432
+ENGINE_remove                           2433
+ENGINE_free                             2434
+ENGINE_get_BN_mod_exp_crt               2435
+ENGINE_get_next                         2436
+ENGINE_set_name                         2437
+ENGINE_get_default_DSA                  2438
+ENGINE_set_default_BN_mod_exp           2439
+ENGINE_set_default_RSA                  2440
+ENGINE_get_default_RAND                 2441
+ENGINE_get_default_BN_mod_exp           2442
+ENGINE_set_RAND                         2443
+ENGINE_set_id                           2444
+ENGINE_set_BN_mod_exp_crt               2445
+ENGINE_set_default_DH                   2446
+ENGINE_new                              2447
+ENGINE_get_id                           2448
+DSA_set_default_openssl_method          2449
+ENGINE_add                              2450
+DH_set_default_openssl_method           2451
+ENGINE_get_DSA                          2452
author	Richard Levitte <levitte@openssl.org>
	Tue, 13 Jun 2000 16:21:06 +0000 (16:21 +0000)
committer	Richard Levitte <levitte@openssl.org>
	Tue, 13 Jun 2000 16:21:06 +0000 (16:21 +0000)
CHANGES		patch \| blob \| history
Configure		patch \| blob \| history
TABLE		patch \| blob \| history
apps/Makefile.ssl		patch \| blob \| history
apps/genrsa.c		patch \| blob \| history
apps/x509.c		patch \| blob \| history
crypto/Makefile.ssl		patch \| blob \| history
crypto/asn1/Makefile.ssl		patch \| blob \| history
crypto/asn1/asn1.h		patch \| blob \| history
crypto/bio/Makefile.ssl		patch \| blob \| history
crypto/bn/Makefile.ssl		patch \| blob \| history
crypto/bn/bn.h		patch \| blob \| history
crypto/bn/bn_err.c		patch \| blob \| history
crypto/bn/bn_exp.c		patch \| blob \| history
crypto/bn/bn_exp2.c		patch \| blob \| history
crypto/bn/bn_lcl.h		patch \| blob \| history
crypto/buffer/Makefile.ssl		patch \| blob \| history
crypto/des/Makefile.ssl		patch \| blob \| history
crypto/dh/Makefile.ssl		patch \| blob \| history
crypto/dh/dh.h		patch \| blob \| history
crypto/dsa/Makefile.ssl		patch \| blob \| history
crypto/dsa/dsa.h		patch \| blob \| history
crypto/dso/Makefile.ssl		patch \| blob \| history
crypto/engine/Makefile.ssl		patch \| blob \| history
crypto/engine/engine.h		patch \| blob \| history
crypto/engine/engine_err.c		patch \| blob \| history
crypto/engine/hw_ncipher.c	[new file with mode: 0644]	patch \| blob
crypto/engine/vendor_defns/hwcryptohook.h	[new file with mode: 0644]	patch \| blob
crypto/err/err.h		patch \| blob \| history
crypto/evp/Makefile.ssl		patch \| blob \| history
crypto/evp/evp.h		patch \| blob \| history
crypto/evp/evp_locl.h		patch \| blob \| history
crypto/evp/p_open.c		patch \| blob \| history
crypto/evp/p_seal.c		patch \| blob \| history
crypto/lhash/Makefile.ssl		patch \| blob \| history
crypto/lhash/lh_stats.c		patch \| blob \| history
crypto/lhash/lhash.h		patch \| blob \| history
crypto/md2/Makefile.ssl		patch \| blob \| history
crypto/mdc2/Makefile.ssl		patch \| blob \| history
crypto/objects/Makefile.ssl		patch \| blob \| history
crypto/objects/objects.h		patch \| blob \| history
crypto/pem/Makefile.ssl		patch \| blob \| history
crypto/pem/pem.h		patch \| blob \| history
crypto/pkcs12/Makefile.ssl		patch \| blob \| history
crypto/pkcs7/Makefile.ssl		patch \| blob \| history
crypto/rand/Makefile.ssl		patch \| blob \| history
crypto/rsa/Makefile.ssl		patch \| blob \| history
crypto/rsa/rsa.h		patch \| blob \| history
crypto/stack/Makefile.ssl		patch \| blob \| history
crypto/stack/stack.c		patch \| blob \| history
crypto/txt_db/txt_db.h		patch \| blob \| history
crypto/x509/Makefile.ssl		patch \| blob \| history
crypto/x509/x509.h		patch \| blob \| history
crypto/x509/x509_vfy.h		patch \| blob \| history
crypto/x509v3/Makefile.ssl		patch \| blob \| history
crypto/x509v3/v3_lib.c		patch \| blob \| history
crypto/x509v3/v3_utl.c		patch \| blob \| history
crypto/x509v3/x509v3.h		patch \| blob \| history
doc/apps/x509.pod		patch \| blob \| history
doc/crypto/BN_mod_mul_montgomery.pod		patch \| blob \| history
doc/crypto/EVP_EncryptInit.pod		patch \| blob \| history
doc/crypto/EVP_OpenInit.pod		patch \| blob \| history
doc/crypto/EVP_SealInit.pod		patch \| blob \| history
e_os.h		patch \| blob \| history
rsaref/Makefile.ssl		patch \| blob \| history
ssl/Makefile.ssl		patch \| blob \| history
ssl/ssl.h		patch \| blob \| history
ssl/ssl3.h		patch \| blob \| history
test/Makefile.ssl		patch \| blob \| history
util/libeay.num		patch \| blob \| history