Merge in changes from 0.9.6-stable. This should definitely be done a

 Changes between 0.9.6c and 0.9.6d  [XX xxx XXXX]

  *) Fix DH_generate_parameters() so that it works for 'non-standard'

     generators, i.e. generators other than 2 and 5.  (Previously, the

     code did not properly initialise the 'add' and 'rem' values to

     BN_generate_prime().)

     In the new general case, we do not insist that 'generator' is

     actually a primitive root: This requirement is rather pointless;

     a generator of the order-q subgroup is just as good, if not

     better.

     [Bodo Moeller]

  *) Map new X509 verification errors to alerts. Discovered and submitted by

     Tom Wu <tom@arcot.com>.

     [Lutz Jaenicke]

  *) Fix ssl3_pending() (ssl/s3_lib.c) to prevent SSL_pending() from

     returning non-zero before the data has been completely received

     when using non-blocking I/O.

     [Bodo Moeller; problem pointed out by John Hughes]

  *) Some of the ciphers missed the strength entry (SSL_LOW etc).

     [Ben Laurie, Lutz Jaenicke]

  *) Fix bug in SSL_clear(): bad sessions were not removed (found by

     Yoram Zahavi <YoramZ@gilian.com>).

     [Lutz Jaenicke]

"aix43-gcc",  "gcc:-O3 -DAIX -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR::::::::::dlfcn:",

#

# Cray T90 (SDSC)

# Cray T90 and similar (SDSC)

# It's Big-endian, but the algorithms work properly when B_ENDIAN is NOT

# defined.  The T90 ints and longs are 8 bytes long, and apparently the

# B_ENDIAN code assumes 4 byte ints.  Fortunately, the non-B_ENDIAN and

#'Taking the address of a bit field is not allowed. '

#'An expression with bit field exists as the operand of "sizeof" '

# (written by Wayne Schroeder <schroede@SDSC.EDU>)

"cray-t90-cc", "cc: -DBIT_FIELD_LIMITS -DTERMIOS::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT:::",

#

# j90 is considered the base machine type for unicos machines,

# so this configuration is now called "cray-j90" ...

"cray-j90", "cc: -DBIT_FIELD_LIMITS -DTERMIOS::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT:::",

#

# Cray T3E (Research Center Juelich, beckman@acl.lanl.gov)

 Note on shared libraries

 ------------------------

 Shared library is currently an experimental feature.  The only reason to

 have them would be to conserve memory on systems where several program

 are using OpenSSL.  Binary backward compatibility can't be guaranteed

 before OpenSSL version 1.0.

 For some systems, the OpenSSL Configure script knows what is needed to

 build shared libraries for libcrypto and libssl.  On these systems,

 the shared libraries are currently not created by default, but giving

 There are various changes you can make to the Win32 compile environment. By

 default the library is not compiled with debugging symbols. If you add 'debug'

 to the mk1mk.pl lines in the do_* batch file then debugging symbols will be

 to the mk1mf.pl lines in the do_* batch file then debugging symbols will be

 compiled in.

 The default Win32 environment is to leave out any Windows NT specific

  ---------------

/* ====================================================================

 * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.

 * Copyright (c) 1998-2002 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