diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-22 19:04:58 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-22 19:04:58 +0000 |
| commit | 28e866d7bb732c3dd0e5273a6b143ac73dff1373 (patch) | |
| tree | eeb26fd6605b476dc622d1b28380c8f357437014 | |
| parent | 5326593a8b185c41b7947548bdc62abe08f0eb68 (diff) | |
fix tests bu not setting the string instance on the frozen object
OpenSSL [copies the string returned by the pointe](https://github.com/openssl/openssl/blob/9f040d6decca7930e978784c917f731e5c45e8f0/ssl/t1_lib.c#L1800-1809), so it should be safe to just return a pointer to the string object and not set an instance variable on the already frozen object.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51349 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/openssl/ossl_ssl.c | 1 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Thu Jul 23 04:03:03 2015 Aaron Patterson <tenderlove@ruby-lang.org> + + * ext/openssl/ossl_ssl.c: fix tests by not setting the instance + variable on the frozen ssl instance. + Thu Jul 23 03:32:26 2015 Aaron Patterson <tenderlove@ruby-lang.org> * ext/openssl/ossl_ssl.c: add ECDH callback support. [Feature #11356] diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index ccff027a6c..47bbac92c5 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -707,7 +707,6 @@ ssl_alpn_select_cb(SSL *ssl, const unsigned char **out, unsigned char *outlen, c selected = rb_funcall(cb, rb_intern("call"), 1, protocols); *out = (unsigned char *) StringValuePtr(selected); *outlen = RSTRING_LENINT(selected); - rb_iv_set(sslctx_obj, "@_alpn_selected", selected); return SSL_TLSEXT_ERR_OK; } |