Merge in the latest changes from 0.9.6-stable.

diff --git a/README b/README
index 7039c8440f6a18289b54f5604c3d5cb8180dc17e..79f122a4da9c1c0f89e30f882174157f32d87f38 100644 (file)
--- a/README
+++ b/README
@@ -173,7 +173,9 @@
  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
+ if a TSA notification and a copy of the patch is sent to crypt@bis.doc.gov;
+ see http://www.bis.doc.gov/Encryption/PubAvailEncSourceCodeNofify.html [sic]
+ and http://w3.access.gpo.gov/bis/ear/pdf/740.pdf (EAR Section 740.13(e)).
 
  The preferred format for changes is "diff -u" output. You might
  generate it like this:

diff --git a/crypto/pkcs7/verify.c b/crypto/pkcs7/verify.c
index 49fc8d8bed6b76c5b9c8056b543c62dc00b19f99..bd270062b4ffbf33244f77ce30cf3c8c9f6d2f90 100644 (file)
--- a/crypto/pkcs7/verify.c
+++ b/crypto/pkcs7/verify.c
@@ -179,10 +179,11 @@ char *argv[];
                {
                ASN1_UTCTIME *tm;
                char *str1,*str2;
+               int rc;
 
                si=sk_PKCS7_SIGNER_INFO_value(sk,i);
-               i=PKCS7_dataVerify(cert_store,&cert_ctx,p7bio,p7,si);
-               if (i <= 0)
+               rc=PKCS7_dataVerify(cert_store,&cert_ctx,p7bio,p7,si);
+               if (rc <= 0)
                        goto err;
                printf("signer info\n");
                if ((tm=get_signed_time(si)) != NULL)

diff --git a/doc/ssl/SSL_get_error.pod b/doc/ssl/SSL_get_error.pod
index f700bf0ace552aefafea7da040359f8a96a45c92..fe28dd942aee80c1f8d3effb7909ae66f3076a6c 100644 (file)
--- a/doc/ssl/SSL_get_error.pod
+++ b/doc/ssl/SSL_get_error.pod
@@ -13,7 +13,7 @@ SSL_get_error - obtain result code for TLS/SSL I/O operation
 =head1 DESCRIPTION
 
 SSL_get_error() returns a result code (suitable for the C "switch"
-statement) for a preceding call to SSL_connect(), SSL_accept(),
+statement) for a preceding call to SSL_connect(), SSL_accept(), SSL_do_handshake(),
 SSL_read(), SSL_peek(), or SSL_write() on B<ssl>.  The value returned by
 that TLS/SSL I/O function must be passed to SSL_get_error() in parameter
 B<ret>.