diff options
| author | Matt Caswell <matt@openssl.org> | 2016-06-27 12:28:32 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-06-30 15:47:00 +0100 |
| commit | fb5b14b420a0bff6e3f756ec4879644b6d5622c5 (patch) | |
| tree | 17becc2d0bd038b3070183919ea8af9191f536fa /include | |
| parent | 8a3c000c8f621cd01929313fcb7d0cc23fb516a6 (diff) | |
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@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/ssl.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index abfbed46b7..cc66dd8400 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); |