Commit 4cae3ac3 authored by Richard Levitte's avatar Richard Levitte
Browse files

Merge of main trunk, all conflicts resolved.

parent 63ccddf7

CHANGES

+11 −0
Original line number Diff line number Diff line
@@ -4,6 +4,17 @@ 


 Changes between 0.9.5a and 0.9.6  [xx XXX 2000]



  *) Remove 'optimized' squaring variant in BN_mod_mul_montgomery,

     it can return incorrect results.

     (Note: The buggy variant was not enabled in OpenSSL 0.9.5a,

     but it was in 0.9.6-beta[12].)

     [Bodo Moeller]



  *) Disable the check for content being present when verifying detached

     signatures in pk7_smime.c. Some versions of Netscape (wrongly)

     include zero length content when signing messages.

     [Steve Henson]



  *) New BIO_shutdown_wr macro, which invokes the BIO_C_SHUTDOWN_WR

     BIO_ctrl (for BIO pairs).

Configure

+5 −5
Original line number Diff line number Diff line
@@ -225,16 +225,16 @@ my %table=( 
# Since there is mention of this in shlib/hpux10-cc.sh

"hpux-parisc-cc-o4","cc:-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl",

"hpux-parisc-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl",

"hpux64-parisc-cc","cc:-Ae +DD64 +O3 +ESlit -z -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldld:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dl",

"hpux64-parisc-cc","cc:-Ae +DD64 +O3 +ESlit -z -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dlfcn",



# More attempts at unified 10.X and 11.X targets for HP C compiler.

#

# Chris Ruemmler <ruemmler@cup.hp.com>

# Kevin Steves <ks@hp.se>

"hpux-parisc-cc","cc:+O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT:-ldl:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dl",

"hpux-parisc2-cc","cc:+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/pa-risc2.o:::::::::dl",

"hpux64-parisc2-cc","cc:+DD64 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/pa-risc2W.o:::::::::dl",

"hpux-parisc1_1-cc","cc:+DA1.1 +DS1.1 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dl",

"hpux-parisc-cc","cc:+O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT:-ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dl",

"hpux-parisc2-cc","cc:+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldld:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/pa-risc2.o:::::::::dl",

"hpux64-parisc2-cc","cc:+DD64 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/pa-risc2W.o:::::::::dlfcn",

"hpux-parisc1_1-cc","cc:+DA1.1 +DS1.1 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dl",



# HPUX 9.X config.

# Don't use the bundled cc.  It is broken.  Use HP ANSI C if possible, or

FAQ

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ installing the SUNski package from Sun patch 105710-01 (Sparc) which 
adds a /dev/random device and make sure it gets used, usually through

$RANDFILE.  There are probably similar patches for the other Solaris

versions.  However, be warned that /dev/random is usually a blocking

device, which may have som effects on OpenSSL.

device, which may have some effects on OpenSSL.





* Why does the linker complain about undefined symbols?
@@ -194,7 +194,7 @@ unsigned char *buf, *p; 
int len;



len = i2d_PKCS7(p7, NULL);

buf = OPENSSL_Malloc(len); /* or Malloc, error checking omitted */

buf = OPENSSL_malloc(len); /* or Malloc, error checking omitted */

p = buf;

i2d_PKCS7(p7, &p);

NEWS

+9 −0
Original line number Diff line number Diff line
@@ -5,6 +5,15 @@ 
  This file gives a brief overview of the major changes between each OpenSSL

  release. For more details please read the CHANGES file.



  Major changes between OpenSSL 0.9.5a and OpenSSL 0.9.6:



      o Some documentation for BIO and SSL libraries.

      o Enhanced chain verification using key identifiers.

      o New sign and verify options to 'dgst' application.

      o Support for DER and PEM encoded messages in 'smime' application.

      o New 'rsautl' application, low level RSA utility.





  Major changes between OpenSSL 0.9.5 and OpenSSL 0.9.5a:



      o Bug fixes for Win32, SuSE Linux, NeXTSTEP and FreeBSD 2.2.8

README

+3 −0
Original line number Diff line number Diff line
@@ -163,6 +163,9 @@ 
 the string "[PATCH]" in the subject. Please be sure to include a

 textual explanation of what your patch does.



 Note: For legal reasons, contributions from the US can be accepted only

 if a copy of the patch is sent to crypt@bxa.doc.gov



 The preferred format for changes is "diff -u" output. You might

 generate it like this: