mirror of
https://github.com/ruby/ruby.git
synced 2025-08-23 13:04:13 +02:00
f26f358930
* ext/openssl/ossl_ssl.c (ossl_sslctx_s_alloc): Enable the automatic curve selection for ECDH by calling SSL_CTX_set_ecdh_auto(). With this a TLS server automatically selects a curve which both the client and the server support to use in ECDH. This changes the default behavior but users can still disable ECDH by excluding 'ECDH' cipher suites from the cipher list (with SSLContext#ciphers=). This commit also deprecate #tmp_ecdh_callback=. It was added in Ruby 2.3.0. It wraps SSL_CTX_set_tmp_ecdh_callback() which will be removed in OpenSSL 1.1.0. Its callback receives two values 'is_export' and 'keylength' but both are completely useless for determining a curve to use in ECDH. The automatic curve selection was introduced to replace this. (ossl_sslctx_setup): Deprecate SSLContext#tmp_ecdh_callback=. Emit a warning if this is in use. (ossl_sslctx_set_ecdh_curves): Add SSLContext#ecdh_curves=. Wrap SSL_CTX_set1_curves_list(). If it is not available, this falls back to SSL_CTX_set_tmp_ecdh(). (Init_ossl_ssl): Define SSLContext#ecdh_curves=. * ext/openssl/extconf.rb: Check the existence of EC_curve_nist2nid(), SSL_CTX_set1_curves_list(), SSL_CTX_set_ecdh_auto() and SSL_CTX_set_tmp_ecdh_callback(). * ext/openssl/openssl_missing.[ch]: Implement EC_curve_nist2nid() if missing. * test/openssl/test_pair.rb (test_ecdh_callback): Use EnvUtil.suppress_warning to suppress deprecated warning. (test_ecdh_curves): Test that SSLContext#ecdh_curves= works. * test/openssl/utils.rb (start_server): Use SSLContext#ecdh_curves=. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55214 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
48 lines
1.3 KiB
C
48 lines
1.3 KiB
C
/*
|
|
* 'OpenSSL for Ruby' project
|
|
* Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
|
|
* All rights reserved.
|
|
*/
|
|
/*
|
|
* This program is licensed under the same licence as Ruby.
|
|
* (See the file 'LICENCE'.)
|
|
*/
|
|
#if !defined(_OSSL_OPENSSL_MISSING_H_)
|
|
#define _OSSL_OPENSSL_MISSING_H_
|
|
|
|
/* added in 1.0.0 */
|
|
#if !defined(HAVE_EVP_CIPHER_CTX_COPY)
|
|
int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in);
|
|
#endif
|
|
|
|
#if !defined(HAVE_HMAC_CTX_COPY)
|
|
void HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
|
|
#endif
|
|
|
|
/* added in 1.0.2 */
|
|
#if !defined(OPENSSL_NO_EC)
|
|
#if !defined(HAVE_EC_CURVE_NIST2NID)
|
|
int EC_curve_nist2nid(const char *);
|
|
#endif
|
|
#endif
|
|
|
|
#if !defined(HAVE_X509_REVOKED_DUP)
|
|
# define X509_REVOKED_dup(rev) (X509_REVOKED *)ASN1_dup((i2d_of_void *)i2d_X509_REVOKED, \
|
|
(d2i_of_void *)d2i_X509_REVOKED, (char *)(rev))
|
|
#endif
|
|
|
|
/* added in 1.1.0 */
|
|
#if !defined(HAVE_X509_STORE_GET_EX_DATA)
|
|
# define X509_STORE_get_ex_data(x, idx) \
|
|
CRYPTO_get_ex_data(&(x)->ex_data, (idx))
|
|
#endif
|
|
|
|
#if !defined(HAVE_X509_STORE_SET_EX_DATA)
|
|
# define X509_STORE_set_ex_data(x, idx, data) \
|
|
CRYPTO_set_ex_data(&(x)->ex_data, (idx), (data))
|
|
# define X509_STORE_get_ex_new_index(l, p, newf, dupf, freef) \
|
|
CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509_STORE, (l), (p), \
|
|
(newf), (dupf), (freef))
|
|
#endif
|
|
|
|
#endif /* _OSSL_OPENSSL_MISSING_H_ */
|