Merge in the really latest changes from 0.9.6-stable.

diff --git a/Configure b/Configure
index 71709d630d3b88ce3560554ed1c4c4f552a87d4c..8b89c5f0a5afb5e38d0d243431297838a7191a0e 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -503,7 +503,7 @@ my %table=(
 
 ##### MacOS X (a.k.a. Rhapsody or Darwin) setup
 "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
-"darwin-ppc-cc","cc:-O3 -D_DARWIN -DB_ENDIAN::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC::.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"darwin-ppc-cc","cc:-O3 -D_DARWIN -DB_ENDIAN -fno-common::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC::.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
 
 ##### Sony NEWS-OS 4.x
 "newsos4-gcc","gcc:-O -DB_ENDIAN -DNEWS4::(unknown):-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",

diff --git a/FAQ b/FAQ
index 0aea6919d4165092bd0d3d6500302791dbdc86c9..d323f8c972ad54850a264e3f2f78a944f0c62727 100644 (file)
--- a/FAQ
+++ b/FAQ
@@ -39,6 +39,7 @@ OpenSSL  -  Frequently Asked Questions
 * Why does the OpenSSL compilation fail with "ar: command not found"?
 * Why does the OpenSSL compilation fail on Win32 with VC++?
 * What is special about OpenSSL on Redhat?
+* Why does the OpenSSL test suite fail on MacOS X?
 
 [PROG] Questions about programming with OpenSSL
 
@@ -457,18 +458,10 @@ and the changes are only valid for the current DOS session.
 
 * What is special about OpenSSL on Redhat?
 
-Red Hat Linux 7.0 and following versions already have a limited version of
-openssl already installed. This may well apply to other Linux distributions
-also. This version does not have support for the IDEA, RC5 and MDC-2
-algorithms as these are patented within the United States. For information
-these patent numbers and expiry dates are:
-
-MDC-2: 4,908,861 13/03/2007
-IDEA:  5,214,703 25/05/2010
-RC5:   5,724,428 03/03/2015
-
-However, Europeans and other non-Americans may wish to install all the
-features.
+Red Hat Linux (release 7.0 and later) include a preinstalled limited
+version of OpenSSL. For patent reasons, support for IDEA, RC5 and MDC2
+is disabled in this version. The same may apply to other Linux distributions.
+Users may therefore wish to install more or all of the features left out.
 
 To do this you MUST ensure that you do not overwrite the openssl that is in
 /usr/bin on your Red Hat machine. Several packages depend on this file,
@@ -490,6 +483,25 @@ relevant updates in packages up to and including 0.9.6b.
 A possible way around this is to persuade Red Hat to produce a non-US
 version of Red Hat Linux.
 
+FYI: Patent numbers and expiry dates of US patents:
+MDC-2: 4,908,861 13/03/2007
+IDEA:  5,214,703 25/05/2010
+RC5:   5,724,428 03/03/2015
+
+
+* Why does the OpenSSL test suite fail on MacOS X?
+
+If the failure happens when running 'make test' and the RC4 test fails,
+it's very probable that you have OpenSSL 0.9.6b delivered with the
+operating system (you can find out by running '/usr/bin/openssl version')
+and that you were trying to build OpenSSL 0.9.6d.  The problem is that
+the loader ('ld') in MacOS X has a misfeature that's quite difficult to
+go around and has linked the programs "openssl" and the test programs
+with /usr/lib/libcrypto.dylib and /usr/lib/libssl.dylib instead of the
+libraries you just built.
+Look in the file PROBLEMS for a more detailed explanation and for possible
+solutions.
+
 [PROG] ========================================================================
 
 * Is OpenSSL thread-safe?

diff --git a/README b/README
index beb29ce892a28e7f3edf4878973d7917adfe18fe..7039c8440f6a18289b54f5604c3d5cb8180dc17e 100644 (file)
--- a/README
+++ b/README
@@ -122,6 +122,13 @@
  lists the functions; you will probably have to look at the code to work out
  how to use them. Look at the example programs.
 
+ PROBLEMS
+ --------
+
+ For some platforms, there are some known problems that may affect the user
+ or application author.  We try to collect those in doc/PROBLEMS, with current
+ thoughts on how they should be solved in a future of OpenSSL.
+
  SUPPORT 
  -------
 

diff --git a/apps/ca.c b/apps/ca.c
index 7924f6e0cf5e2eaeef7ba584fa9ddf98b550457d..0bf9196c38560e18ff3446b382027104e4eee451 100644 (file)
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -1135,7 +1135,7 @@ bad:
                        }
                if ((crldays == 0) && (crlhours == 0))
                        {
-                       BIO_printf(bio_err,"cannot lookup how long until the next CRL is issuer\n");
+                       BIO_printf(bio_err,"cannot lookup how long until the next CRL is issued\n");
                        goto err;
                        }
 

diff --git a/apps/smime.c b/apps/smime.c
index cb19c1ea7be30bb9f54cb066faf1ec9a5233ea69..1e84253f8865c34bdb341881967ce1390b1b9aaf 100644 (file)
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -500,9 +500,9 @@ int MAIN(int argc, char **argv)
        } else if(operation == SMIME_PK7OUT) {
                PEM_write_bio_PKCS7(out, p7);
        } else {
-               if(to) BIO_printf(out, "To: %s\r\n", to);
-               if(from) BIO_printf(out, "From: %s\r\n", from);
-               if(subject) BIO_printf(out, "Subject: %s\r\n", subject);
+               if(to) BIO_printf(out, "To: %s\n", to);
+               if(from) BIO_printf(out, "From: %s\n", from);
+               if(subject) BIO_printf(out, "Subject: %s\n", subject);
                if(outformat == FORMAT_SMIME) 
                        SMIME_write_PKCS7(out, p7, in, flags);
                else if(outformat == FORMAT_PEM)