[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  6f4ae777f5100715a96b45355a1195c2efa96b4e (commit)
       via  fb5b14b420a0bff6e3f756ec4879644b6d5622c5 (commit)
      from  8a3c000c8f621cd01929313fcb7d0cc23fb516a6 (commit)


- Log -----------------------------------------------------------------
commit 6f4ae777f5100715a96b45355a1195c2efa96b4e
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Jun 27 14:35:35 2016 +0100

    Cleanup documentation for removed functionality
    
    Remove some lingering references to removed functionality from docs.
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

commit fb5b14b420a0bff6e3f756ec4879644b6d5622c5
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Jun 27 12:28:32 2016 +0100

    Add some compat macros for removed tmp RSA functions/macros
    
    Commit 361a119 removed all ciphersuites that could support temporary
    RSA keys, therefore the associated functions were removed. We should have
    "no-op" compatibility macros for these.
    
    Reviewed-by: Stephen Henson <steve at openssl.org>

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

Summary of changes:
 doc/ssl/SSL_CTX_set_tmp_dh_callback.pod |  1 -
 doc/ssl/ssl.pod                         |  2 --
 include/openssl/ssl.h                   | 13 +++++++++++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod b/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod
index 7ed93ab..fbfb8cb 100644
--- a/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod
+++ b/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod
@@ -122,7 +122,6 @@ on failure. Check the error queue to find out the reason of failure.
 =head1 SEE ALSO
 
 L<ssl(3)>, L<SSL_CTX_set_cipher_list(3)>,
-L<SSL_CTX_set_tmp_rsa_callback(3)>,
 L<SSL_CTX_set_options(3)>,
 L<ciphers(1)>, L<dhparam(1)>
 
diff --git a/doc/ssl/ssl.pod b/doc/ssl/ssl.pod
index 589fc2d..dfd83ea 100644
--- a/doc/ssl/ssl.pod
+++ b/doc/ssl/ssl.pod
@@ -270,8 +270,6 @@ protocol context defined in the B<SSL_CTX> structure.
 
 =item int B<SSL_CTX_load_verify_locations>(SSL_CTX *ctx, const char *CAfile, const char *CApath);
 
-=item long B<SSL_CTX_need_tmp_RSA>(SSL_CTX *ctx);
-
 =item SSL_CTX *B<SSL_CTX_new>(const SSL_METHOD *meth);
 
 =item int SSL_CTX_up_ref(SSL_CTX *ctx);
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index abfbed4..cc66dd8 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -1270,6 +1270,19 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
 #define SSL_set_max_proto_version(s, version) \
         SSL_ctrl(s, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL)
 
+#if OPENSSL_API_COMPAT < 0x10100000L
+/* Provide some compatibility macros for removed functionality. */
+# define SSL_CTX_need_tmp_RSA(ctx)                0
+# define SSL_CTX_set_tmp_rsa(ctx,rsa)             1
+# define SSL_need_tmp_RSA(ssl)                    0
+# define SSL_set_tmp_rsa(ssl,rsa)                 1
+/*
+ * We "preted" to call the callback to avoid warnings about unused static
+ * functions.
+ */
+# define SSL_CTX_set_tmp_rsa_callback(ctx, cb)    while(0) (cb)(NULL, 0, 0)
+# define SSL_set_tmp_rsa_callback(ssl, cb)        while(0) (cb)(NULL, 0, 0)
+#endif
 
 __owur const BIO_METHOD *BIO_f_ssl(void);
 __owur BIO *BIO_new_ssl(SSL_CTX *ctx, int client);