2003-07-23 12:12:24 -04:00
|
|
|
/*
|
|
|
|
|
* 'OpenSSL for Ruby' project
|
|
|
|
|
* Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
|
|
|
|
|
* All rights reserved.
|
|
|
|
|
*/
|
|
|
|
|
/*
|
2015-04-19 23:55:09 -04:00
|
|
|
* This program is licensed under the same licence as Ruby.
|
2003-07-23 12:12:24 -04:00
|
|
|
* (See the file 'LICENCE'.)
|
|
|
|
|
*/
|
|
|
|
|
#if !defined(_OSSL_OPENSSL_MISSING_H_)
|
|
|
|
|
#define _OSSL_OPENSSL_MISSING_H_
|
|
|
|
|
|
2016-06-05 21:40:27 -04:00
|
|
|
#include "ruby/config.h"
|
|
|
|
|
|
2016-06-05 11:35:12 -04:00
|
|
|
/* added in 0.9.8X */
|
|
|
|
|
#if !defined(HAVE_EVP_CIPHER_CTX_NEW)
|
|
|
|
|
EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_EVP_CIPHER_CTX_FREE)
|
|
|
|
|
void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx);
|
|
|
|
|
#endif
|
|
|
|
|
|
2016-05-25 04:50:03 -04:00
|
|
|
/* added in 1.0.0 */
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 11:00:47 -04:00
|
|
|
#if !defined(HAVE_EVP_PKEY_BASE_ID)
|
|
|
|
|
# define EVP_PKEY_base_id(pkey) EVP_PKEY_type((pkey)->type)
|
|
|
|
|
#endif
|
|
|
|
|
|
2016-05-25 04:50:03 -04:00
|
|
|
#if !defined(HAVE_EVP_CIPHER_CTX_COPY)
|
|
|
|
|
int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in);
|
2008-05-15 05:44:38 -04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_HMAC_CTX_COPY)
|
2016-06-05 11:35:12 -04:00
|
|
|
int HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_X509_STORE_CTX_GET0_CURRENT_CRL)
|
|
|
|
|
# define X509_STORE_CTX_get0_current_crl(x) ((x)->current_crl)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_X509_STORE_SET_VERIFY_CB)
|
|
|
|
|
# define X509_STORE_set_verify_cb X509_STORE_set_verify_cb_func
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_I2D_ASN1_SET_ANY)
|
|
|
|
|
# define i2d_ASN1_SET_ANY(sk, x) i2d_ASN1_SET_OF_ASN1_TYPE((sk), (x), \
|
|
|
|
|
i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0)
|
2008-05-15 05:44:38 -04:00
|
|
|
#endif
|
|
|
|
|
|
2016-05-25 04:50:03 -04:00
|
|
|
/* added in 1.0.2 */
|
2016-05-30 05:30:38 -04:00
|
|
|
#if !defined(OPENSSL_NO_EC)
|
|
|
|
|
#if !defined(HAVE_EC_CURVE_NIST2NID)
|
|
|
|
|
int EC_curve_nist2nid(const char *);
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
|
2016-05-25 04:50:03 -04:00
|
|
|
#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))
|
2005-04-15 15:16:18 -04:00
|
|
|
#endif
|
|
|
|
|
|
2016-06-05 11:35:12 -04:00
|
|
|
#if !defined(HAVE_X509_STORE_CTX_GET0_STORE)
|
|
|
|
|
# define X509_STORE_CTX_get0_store(x) ((x)->ctx)
|
|
|
|
|
#endif
|
|
|
|
|
|
2016-06-05 12:36:39 -04:00
|
|
|
#if !defined(HAVE_SSL_IS_SERVER)
|
|
|
|
|
# define SSL_is_server(s) ((s)->server)
|
|
|
|
|
#endif
|
|
|
|
|
|
2016-05-25 04:50:03 -04:00
|
|
|
/* added in 1.1.0 */
|
2016-06-05 11:35:12 -04:00
|
|
|
#if !defined(HAVE_BN_GENCB_NEW)
|
|
|
|
|
# define BN_GENCB_new() ((BN_GENCB *)OPENSSL_malloc(sizeof(BN_GENCB)))
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_BN_GENCB_FREE)
|
|
|
|
|
# define BN_GENCB_free(cb) OPENSSL_free(cb)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_BN_GENCB_GET_ARG)
|
|
|
|
|
# define BN_GENCB_get_arg(cb) (cb)->arg
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_EVP_MD_CTX_NEW)
|
|
|
|
|
# define EVP_MD_CTX_new EVP_MD_CTX_create
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_EVP_MD_CTX_FREE)
|
|
|
|
|
# define EVP_MD_CTX_free EVP_MD_CTX_destroy
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_HMAC_CTX_NEW)
|
|
|
|
|
HMAC_CTX *HMAC_CTX_new(void);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_HMAC_CTX_FREE)
|
|
|
|
|
void HMAC_CTX_free(HMAC_CTX *ctx);
|
|
|
|
|
#endif
|
|
|
|
|
|
2010-09-05 22:08:30 -04:00
|
|
|
#if !defined(HAVE_X509_STORE_GET_EX_DATA)
|
2016-05-19 00:53:05 -04:00
|
|
|
# define X509_STORE_get_ex_data(x, idx) \
|
|
|
|
|
CRYPTO_get_ex_data(&(x)->ex_data, (idx))
|
2010-09-05 22:08:30 -04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_X509_STORE_SET_EX_DATA)
|
2016-05-19 00:53:05 -04:00
|
|
|
# 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))
|
2008-05-15 05:44:38 -04:00
|
|
|
#endif
|
|
|
|
|
|
2016-06-05 11:35:12 -04:00
|
|
|
#if !defined(HAVE_X509_CRL_GET0_SIGNATURE)
|
|
|
|
|
void X509_CRL_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg, X509_CRL *crl);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_X509_REQ_GET0_SIGNATURE)
|
|
|
|
|
void X509_REQ_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg, X509_REQ *req);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_X509_REVOKED_GET0_SERIALNUMBER)
|
|
|
|
|
# define X509_REVOKED_get0_serialNumber(x) ((x)->serialNumber)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_X509_REVOKED_GET0_REVOCATIONDATE)
|
|
|
|
|
# define X509_REVOKED_get0_revocationDate(x) ((x)->revocationDate)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_X509_GET0_TBS_SIGALG)
|
|
|
|
|
# define X509_get0_tbs_sigalg(x) ((x)->cert_info->signature)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_X509_STORE_CTX_GET0_UNTRUSTED)
|
|
|
|
|
# define X509_STORE_CTX_get0_untrusted(x) ((x)->untrusted)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_X509_STORE_CTX_GET0_CERT)
|
|
|
|
|
# define X509_STORE_CTX_get0_cert(x) ((x)->cert)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_X509_STORE_CTX_GET0_CHAIN)
|
|
|
|
|
# define X509_STORE_CTX_get0_chain(ctx) X509_STORE_CTX_get_chain(ctx)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_OCSP_SINGLERESP_GET0_ID)
|
|
|
|
|
# define OCSP_SINGLERESP_get0_id(s) ((s)->certId)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_SSL_CTX_GET_CIPHERS)
|
|
|
|
|
# define SSL_CTX_get_ciphers(ctx) ((ctx)->cipher_list)
|
|
|
|
|
#endif
|
|
|
|
|
|
2016-06-05 08:46:05 -04:00
|
|
|
#if !defined(HAVE_X509_UP_REF)
|
|
|
|
|
# define X509_up_ref(x) \
|
|
|
|
|
CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_X509)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_X509_CRL_UP_REF)
|
|
|
|
|
# define X509_CRL_up_ref(x) \
|
|
|
|
|
CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_X509_CRL);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_X509_STORE_UP_REF)
|
|
|
|
|
# define X509_STORE_up_ref(x) \
|
|
|
|
|
CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_X509_STORE);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_SSL_SESSION_UP_REF)
|
|
|
|
|
# define SSL_SESSION_up_ref(x) \
|
|
|
|
|
CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_SSL_SESSION);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(HAVE_EVP_PKEY_UP_REF)
|
|
|
|
|
# define EVP_PKEY_up_ref(x) \
|
|
|
|
|
CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_EVP_PKEY);
|
|
|
|
|
#endif
|
|
|
|
|
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 11:00:47 -04:00
|
|
|
#if !defined(HAVE_OPAQUE_OPENSSL)
|
|
|
|
|
#define IMPL_PKEY_GETTER(_type, _name) \
|
|
|
|
|
static inline _type *EVP_PKEY_get0_##_type(EVP_PKEY *pkey) { \
|
|
|
|
|
return pkey->pkey._name; }
|
|
|
|
|
#define IMPL_KEY_ACCESSOR2(_type, _group, a1, a2, _fail_cond) \
|
2016-06-19 01:31:28 -04:00
|
|
|
static inline void _type##_get0_##_group(_type *obj, const BIGNUM **a1, const BIGNUM **a2) { \
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 11:00:47 -04:00
|
|
|
if (a1) *a1 = obj->a1; \
|
|
|
|
|
if (a2) *a2 = obj->a2; } \
|
|
|
|
|
static inline int _type##_set0_##_group(_type *obj, BIGNUM *a1, BIGNUM *a2) { \
|
|
|
|
|
if (_fail_cond) return 0; \
|
|
|
|
|
BN_clear_free(obj->a1); obj->a1 = a1; \
|
|
|
|
|
BN_clear_free(obj->a2); obj->a2 = a2; \
|
|
|
|
|
return 1; }
|
|
|
|
|
#define IMPL_KEY_ACCESSOR3(_type, _group, a1, a2, a3, _fail_cond) \
|
2016-06-19 01:31:28 -04:00
|
|
|
static inline void _type##_get0_##_group(_type *obj, const BIGNUM **a1, const BIGNUM **a2, const BIGNUM **a3) { \
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 11:00:47 -04:00
|
|
|
if (a1) *a1 = obj->a1; \
|
|
|
|
|
if (a2) *a2 = obj->a2; \
|
|
|
|
|
if (a3) *a3 = obj->a3; } \
|
|
|
|
|
static inline int _type##_set0_##_group(_type *obj, BIGNUM *a1, BIGNUM *a2, BIGNUM *a3) { \
|
|
|
|
|
if (_fail_cond) return 0; \
|
|
|
|
|
BN_clear_free(obj->a1); obj->a1 = a1; \
|
|
|
|
|
BN_clear_free(obj->a2); obj->a2 = a2; \
|
|
|
|
|
BN_clear_free(obj->a3); obj->a3 = a3; \
|
|
|
|
|
return 1; }
|
|
|
|
|
|
|
|
|
|
#if !defined(OPENSSL_NO_RSA)
|
|
|
|
|
IMPL_PKEY_GETTER(RSA, rsa)
|
2016-06-14 08:35:28 -04:00
|
|
|
IMPL_KEY_ACCESSOR3(RSA, key, n, e, d, (n == obj->n || e == obj->e || (obj->d && d == obj->d)))
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 11:00:47 -04:00
|
|
|
IMPL_KEY_ACCESSOR2(RSA, factors, p, q, (p == obj->p || q == obj->q))
|
|
|
|
|
IMPL_KEY_ACCESSOR3(RSA, crt_params, dmp1, dmq1, iqmp, (dmp1 == obj->dmp1 || dmq1 == obj->dmq1 || iqmp == obj->iqmp))
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(OPENSSL_NO_DSA)
|
|
|
|
|
IMPL_PKEY_GETTER(DSA, dsa)
|
|
|
|
|
IMPL_KEY_ACCESSOR2(DSA, key, pub_key, priv_key, (pub_key == obj->pub_key || (obj->priv_key && priv_key == obj->priv_key)))
|
|
|
|
|
IMPL_KEY_ACCESSOR3(DSA, pqg, p, q, g, (p == obj->p || q == obj->q || g == obj->g))
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(OPENSSL_NO_DH)
|
|
|
|
|
IMPL_PKEY_GETTER(DH, dh)
|
|
|
|
|
IMPL_KEY_ACCESSOR2(DH, key, pub_key, priv_key, (pub_key == obj->pub_key || (obj->priv_key && priv_key == obj->priv_key)))
|
2016-06-14 08:35:28 -04:00
|
|
|
IMPL_KEY_ACCESSOR3(DH, pqg, p, q, g, (p == obj->p || obj->q && q == obj->q || g == obj->g))
|
openssl: adapt OpenSSL::PKey to OpenSSL 1.1.0 opaque structs
* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
{RSA,DSA,EC_KEY,DH}_get0_*() functions.
OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
setter methods for each parameter of each PKey type, for example
PKey::RSA#e=, but this is no longer possible because the new API
RSA_set0_key() requires the 'n' at the same time. This commit adds
deprecation warning to them and adds PKey::*#set_* methods as direct
wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
[ruby-core:75225] [Feature #12324]
* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
Emit a warning with rb_warning() when old setter methods are used.
* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
object that are used in tmp_dh_callback. Generating a new key pair
every time should be fine - actually the private exponent is ignored
in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
https://www.openssl.org/news/secadv/20160128.txt
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-06-05 11:00:47 -04:00
|
|
|
static inline ENGINE *DH_get0_engine(DH *dh) { return dh->engine; }
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined(OPENSSL_NO_EC)
|
|
|
|
|
IMPL_PKEY_GETTER(EC_KEY, ec)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#undef IMPL_PKEY_GETTER
|
|
|
|
|
#undef IMPL_KEY_ACCESSOR2
|
|
|
|
|
#undef IMPL_KEY_ACCESSOR3
|
|
|
|
|
#endif /* HAVE_OPAQUE_OPENSSL */
|
|
|
|
|
|
2016-06-12 01:06:18 -04:00
|
|
|
#if defined(HAVE_AUTHENTICATED_ENCRYPTION) && !defined(EVP_CTRL_AEAD_GET_TAG)
|
|
|
|
|
# define EVP_CTRL_AEAD_GET_TAG EVP_CTRL_GCM_GET_TAG
|
|
|
|
|
# define EVP_CTRL_AEAD_SET_TAG EVP_CTRL_GCM_SET_TAG
|
|
|
|
|
#endif
|
|
|
|
|
|
2003-07-23 12:12:24 -04:00
|
|
|
#endif /* _OSSL_OPENSSL_MISSING_H_ */
|