mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
merge revision(s) 55074: [Backport #12868]
* ext/openssl/ossl.c (Init_openssl): register an ex_data index for
X509_STORE and X509_STORE_CTX respectively. Since they don't share
the ex_data index registry, we can't use the same index.
(ossl_verify_cb): use the the correct index.
* ext/openssl/ossl_ssl.c (ossl_ssl_verify_callback): ditto.
* ext/openssl/ossl_x509store.c (ossl_x509store_set_vfy_cb): ditto.
(ossl_x509stctx_verify): ditto.
* ext/openssl/ossl.h (void ossl_clear_error): add extern declarations
of ossl_store_{ctx_,}ex_verify_cb_idx.
* ext/openssl/openssl_missing.c: remove X509_STORE_set_ex_data and
X509_STORE_get_ex_data.
* ext/openssl/openssl_missing.h: implement X509_STORE_get_ex_data,
X509_STORE_set_ex_data and X509_STORE_get_ex_new_index as macros.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@56565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika
parent
564082796a
commit
93bceb14a4
8 changed files with 43 additions and 27 deletions
21
ChangeLog
21
ChangeLog
|
|
@ -1,3 +1,24 @@
|
|||
Sat Nov 5 11:45:32 2016 Kazuki Yamaguchi <k@rhe.jp>
|
||||
|
||||
* ext/openssl/ossl.c (Init_openssl): register an ex_data index for
|
||||
X509_STORE and X509_STORE_CTX respectively. Since they don't share
|
||||
the ex_data index registry, we can't use the same index.
|
||||
(ossl_verify_cb): use the the correct index.
|
||||
|
||||
* ext/openssl/ossl_ssl.c (ossl_ssl_verify_callback): ditto.
|
||||
|
||||
* ext/openssl/ossl_x509store.c (ossl_x509store_set_vfy_cb): ditto.
|
||||
(ossl_x509stctx_verify): ditto.
|
||||
|
||||
* ext/openssl/ossl.h (void ossl_clear_error): add extern declarations
|
||||
of ossl_store_{ctx_,}ex_verify_cb_idx.
|
||||
|
||||
* ext/openssl/openssl_missing.c: remove X509_STORE_set_ex_data and
|
||||
X509_STORE_get_ex_data.
|
||||
|
||||
* ext/openssl/openssl_missing.h: implement X509_STORE_get_ex_data,
|
||||
X509_STORE_set_ex_data and X509_STORE_get_ex_new_index as macros.
|
||||
|
||||
Sat Nov 5 11:35:58 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* thread.c (rb_thread_pending_interrupt_p): no pending interrupt
|
||||
|
|
|
|||
|
|
@ -34,20 +34,6 @@ HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in)
|
|||
#endif /* HAVE_HMAC_CTX_COPY */
|
||||
#endif /* NO_HMAC */
|
||||
|
||||
#if !defined(HAVE_X509_STORE_SET_EX_DATA)
|
||||
int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data)
|
||||
{
|
||||
return CRYPTO_set_ex_data(&str->ex_data, idx, data);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_X509_STORE_GET_EX_DATA)
|
||||
void *X509_STORE_get_ex_data(X509_STORE *str, int idx)
|
||||
{
|
||||
return CRYPTO_get_ex_data(&str->ex_data, idx);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_EVP_MD_CTX_CREATE)
|
||||
EVP_MD_CTX *
|
||||
EVP_MD_CTX_create(void)
|
||||
|
|
|
|||
|
|
@ -133,11 +133,16 @@ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in);
|
|||
#endif
|
||||
|
||||
#if !defined(HAVE_X509_STORE_GET_EX_DATA)
|
||||
void *X509_STORE_get_ex_data(X509_STORE *str, int idx);
|
||||
# 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)
|
||||
int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *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
|
||||
|
||||
#if !defined(HAVE_X509_CRL_SET_VERSION)
|
||||
|
|
|
|||
|
|
@ -198,7 +198,8 @@ ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd)
|
|||
/*
|
||||
* Verify callback
|
||||
*/
|
||||
int ossl_verify_cb_idx;
|
||||
int ossl_store_ctx_ex_verify_cb_idx;
|
||||
int ossl_store_ex_verify_cb_idx;
|
||||
|
||||
VALUE
|
||||
ossl_call_verify_cb_proc(struct ossl_verify_cb_args *args)
|
||||
|
|
@ -214,10 +215,10 @@ ossl_verify_cb(int ok, X509_STORE_CTX *ctx)
|
|||
struct ossl_verify_cb_args args;
|
||||
int state = 0;
|
||||
|
||||
proc = (VALUE)X509_STORE_CTX_get_ex_data(ctx, ossl_verify_cb_idx);
|
||||
if ((void*)proc == 0)
|
||||
proc = (VALUE)X509_STORE_get_ex_data(ctx->ctx, ossl_verify_cb_idx);
|
||||
if ((void*)proc == 0)
|
||||
proc = (VALUE)X509_STORE_CTX_get_ex_data(ctx, ossl_store_ctx_ex_verify_cb_idx);
|
||||
if (!proc)
|
||||
proc = (VALUE)X509_STORE_get_ex_data(ctx->ctx, ossl_store_ex_verify_cb_idx);
|
||||
if (!proc)
|
||||
return ok;
|
||||
if (!NIL_P(proc)) {
|
||||
ret = Qfalse;
|
||||
|
|
@ -1127,8 +1128,10 @@ Init_openssl(void)
|
|||
/*
|
||||
* Verify callback Proc index for ext-data
|
||||
*/
|
||||
if ((ossl_verify_cb_idx = X509_STORE_CTX_get_ex_new_index(0, (void *)"ossl_verify_cb_idx", 0, 0, 0)) < 0)
|
||||
if ((ossl_store_ctx_ex_verify_cb_idx = X509_STORE_CTX_get_ex_new_index(0, (void *)"ossl_store_ctx_ex_verify_cb_idx", 0, 0, 0)) < 0)
|
||||
ossl_raise(eOSSLError, "X509_STORE_CTX_get_ex_new_index");
|
||||
if ((ossl_store_ex_verify_cb_idx = X509_STORE_get_ex_new_index(0, (void *)"ossl_store_ex_verify_cb_idx", 0, 0, 0)) < 0)
|
||||
ossl_raise(eOSSLError, "X509_STORE_get_ex_new_index");
|
||||
|
||||
/*
|
||||
* Init debug core
|
||||
|
|
|
|||
|
|
@ -167,7 +167,8 @@ VALUE ossl_exc_new(VALUE, const char *, ...);
|
|||
/*
|
||||
* Verify callback
|
||||
*/
|
||||
extern int ossl_verify_cb_idx;
|
||||
extern int ossl_store_ctx_ex_verify_cb_idx;
|
||||
extern int ossl_store_ex_verify_cb_idx;
|
||||
|
||||
struct ossl_verify_cb_args {
|
||||
VALUE proc;
|
||||
|
|
|
|||
|
|
@ -307,7 +307,7 @@ ossl_ssl_verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
|
|||
|
||||
ssl = X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());
|
||||
cb = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_vcb_idx);
|
||||
X509_STORE_CTX_set_ex_data(ctx, ossl_verify_cb_idx, (void*)cb);
|
||||
X509_STORE_CTX_set_ex_data(ctx, ossl_store_ctx_ex_verify_cb_idx, (void *)cb);
|
||||
return ossl_verify_cb(preverify_ok, ctx);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ ossl_x509store_set_vfy_cb(VALUE self, VALUE cb)
|
|||
X509_STORE *store;
|
||||
|
||||
GetX509Store(self, store);
|
||||
X509_STORE_set_ex_data(store, ossl_verify_cb_idx, (void*)cb);
|
||||
X509_STORE_set_ex_data(store, ossl_store_ex_verify_cb_idx, (void *)cb);
|
||||
rb_iv_set(self, "@verify_callback", cb);
|
||||
|
||||
return cb;
|
||||
|
|
@ -467,7 +467,7 @@ ossl_x509stctx_verify(VALUE self)
|
|||
int result;
|
||||
|
||||
GetX509StCtx(self, ctx);
|
||||
X509_STORE_CTX_set_ex_data(ctx, ossl_verify_cb_idx,
|
||||
X509_STORE_CTX_set_ex_data(ctx, ossl_store_ctx_ex_verify_cb_idx,
|
||||
(void*)rb_iv_get(self, "@verify_callback"));
|
||||
result = X509_verify_cert(ctx);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#define RUBY_VERSION "2.3.2"
|
||||
#define RUBY_RELEASE_DATE "2016-11-05"
|
||||
#define RUBY_PATCHLEVEL 202
|
||||
#define RUBY_PATCHLEVEL 203
|
||||
|
||||
#define RUBY_RELEASE_YEAR 2016
|
||||
#define RUBY_RELEASE_MONTH 11
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue