[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  24f84b4e4dbde9d8ef7a5ebb4b3c2ca22fd4cd22 (commit)
      from  3bec48515354bc4138ce14c5aafc2c9e3bcc473f (commit)


- Log -----------------------------------------------------------------
commit 24f84b4e4dbde9d8ef7a5ebb4b3c2ca22fd4cd22
Author: Tomas Mraz <tomas at openssl.org>
Date:   Thu Jul 15 13:37:26 2021 +0200

    doc: It is not possible to use SSL_OP_* value in preprocessor conditions
    
    Fixes #16082
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16084)

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

Summary of changes:
 doc/man3/SSL_CTX_set_options.pod | 6 ++++++
 doc/man7/migration_guide.pod     | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/doc/man3/SSL_CTX_set_options.pod b/doc/man3/SSL_CTX_set_options.pod
index 7b179099e1..df47e4dd03 100644
--- a/doc/man3/SSL_CTX_set_options.pod
+++ b/doc/man3/SSL_CTX_set_options.pod
@@ -427,6 +427,12 @@ were added in OpenSSL 1.1.1.
 The B<SSL_OP_NO_EXTENDED_MASTER_SECRET> and B<SSL_OP_IGNORE_UNEXPECTED_EOF>
 options were added in OpenSSL 3.0.
 
+The B<SSL_OP_> constants and the corresponding parameter and return values
+of the affected functions were changed to C<uint64_t> type in OpenSSL 3.0.
+For that reason it is no longer possible use the B<SSL_OP_> macro values
+in preprocessor C<#if> conditions. However it is still possible to test
+whether these macros are defined or not.
+
 =head1 COPYRIGHT
 
 Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
diff --git a/doc/man7/migration_guide.pod b/doc/man7/migration_guide.pod
index aac158795c..8cc9bd5fc8 100644
--- a/doc/man7/migration_guide.pod
+++ b/doc/man7/migration_guide.pod
@@ -2235,7 +2235,9 @@ SSL and SSL_CTX options are now 64 bit instead of 32 bit.
 The signatures of the functions to get and set options on SSL and
 SSL_CTX objects changed from "unsigned long" to "uint64_t" type.
 
-This may require source code changes.
+This may require source code changes. For example it is no longer possible
+to use the B<SSL_OP_> macro values in preprocessor C<#if> conditions.
+However it is still possible to test whether these macros are defined or not.
 
 See L<SSL_CTX_get_options(3)>, L<SSL_CTX_set_options(3)>,
 L<SSL_get_options(3)> and L<SSL_set_options(3)>.