kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

ALPN also uses the same logic [Bug #11369]

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2015-10-22 16:54:05 +00:00
parent d7d779b594
commit b5f2b5e1a2
1 changed files with 32 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

62
ext/openssl/ossl_ssl.c
View file

@ -581,56 +581,58 @@ ssl_npn_advertise_cb(SSL *ssl, const unsigned char **out, unsigned int *outlen,
} }
static int static int
ssl_npn_select_cb(SSL *s, unsigned char **out, unsigned char *outlen, const unsigned char *in, unsigned int inlen, void *arg) ssl_npn_select_cb_common(VALUE cb, const unsigned char **out, unsigned char *outlen, const unsigned char *in, unsigned int inlen)
{ {
int i = 0; VALUE selected;
VALUE sslctx_obj, cb, protocols, selected; long len;
unsigned char l;
sslctx_obj = (VALUE) arg; VALUE protocols = rb_ary_new();
cb = rb_iv_get(sslctx_obj, "@npn_select_cb");
protocols = rb_ary_new();
/* The format is len_1|proto_1|...|len_n|proto_n\0 */ /* The format is len_1|proto_1|...|len_n|proto_n\0 */
while (in[i]) { while (l = *in++) {
VALUE protocol = rb_str_new((const char *) &in[i + 1], in[i]); VALUE protocol;
if (l > inlen) {
ossl_raise(eSSLError, "Invalid protocol name list");
}
protocol = rb_str_new((const char *)in, l);
rb_ary_push(protocols, protocol); rb_ary_push(protocols, protocol);
i += in[i] + 1; in += l;
inlen -= l;
} }
selected = rb_funcall(cb, rb_intern("call"), 1, protocols); selected = rb_funcall(cb, rb_intern("call"), 1, protocols);
StringValue(selected); StringValue(selected);
i = RSTRING_LENINT(selected); len = RSTRING_LEN(selected);
if (i < 1 || i >= 256) { if (len < 1 || len >= 256) {
ossl_raise(eSSLError, "Selected protocol must have length 1..255"); ossl_raise(eSSLError, "Selected protocol name must have length 1..255");
} }
*out = (unsigned char *) StringValuePtr(selected); *out = (unsigned char *)RSTRING_PTR(selected);
*outlen = i; *outlen = (unsigned char)len;
return SSL_TLSEXT_ERR_OK; return SSL_TLSEXT_ERR_OK;
} }
static int
ssl_npn_select_cb(SSL *s, unsigned char **out, unsigned char *outlen, const unsigned char *in, unsigned int inlen, void *arg)
{
VALUE sslctx_obj, cb;
sslctx_obj = (VALUE) arg;
cb = rb_iv_get(sslctx_obj, "@npn_select_cb");
return ssl_npn_select_cb_common(cb, (const unsigned char **)out, outlen, in, inlen);
}
#ifdef HAVE_SSL_CTX_SET_ALPN_SELECT_CB #ifdef HAVE_SSL_CTX_SET_ALPN_SELECT_CB
static int static int
ssl_alpn_select_cb(SSL *ssl, const unsigned char **out, unsigned char *outlen, const unsigned char *in, unsigned int inlen, void *arg) ssl_alpn_select_cb(SSL *ssl, const unsigned char **out, unsigned char *outlen, const unsigned char *in, unsigned int inlen, void *arg)
{ {
int i = 0; VALUE sslctx_obj, cb;
VALUE sslctx_obj, cb, protocols, selected;
sslctx_obj = (VALUE) arg; sslctx_obj = (VALUE) arg;
cb = rb_iv_get(sslctx_obj, "@alpn_select_cb"); cb = rb_iv_get(sslctx_obj, "@alpn_select_cb");
protocols = rb_ary_new();
/* The format is len_1|proto_1|...|len_n|proto_n\0 */ return ssl_npn_select_cb_common(cb, out, outlen, in, inlen);
while (in[i]) {
VALUE protocol = rb_str_new((const char *) &in[i + 1], in[i]);
rb_ary_push(protocols, protocol);
i += in[i] + 1;
}
selected = rb_funcall(cb, rb_intern("call"), 1, protocols);
*out = (unsigned char *) StringValuePtr(selected);
*outlen = RSTRING_LENINT(selected);
return SSL_TLSEXT_ERR_OK;
} }
#endif #endif