Mercurial > hg > nginx
changeset 5566:70f4d99ded41 stable-1.4
SSL: fixed $ssl_session_id variable.
Previously, it used to contain full session serialized instead of just
a session id, making it almost impossible to use the variable in a safe
way.
Thanks to Ivan Ristić.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Wed, 22 Jan 2014 16:05:06 +0400 |
parents | b8e6297358b5 |
children | 5a38f9609d85 |
files | src/event/ngx_event_openssl.c |
diffstat | 1 files changed, 3 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/event/ngx_event_openssl.c Wed Jan 22 04:58:19 2014 +0400 +++ b/src/event/ngx_event_openssl.c Wed Jan 22 16:05:06 2014 +0400 @@ -2229,32 +2229,22 @@ ngx_ssl_get_session_id(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s) { int len; - u_char *p, *buf; + u_char *buf; SSL_SESSION *sess; sess = SSL_get0_session(c->ssl->connection); - len = i2d_SSL_SESSION(sess, NULL); - - buf = ngx_alloc(len, c->log); - if (buf == NULL) { - return NGX_ERROR; - } + buf = sess->session_id; + len = sess->session_id_length; s->len = 2 * len; s->data = ngx_pnalloc(pool, 2 * len); if (s->data == NULL) { - ngx_free(buf); return NGX_ERROR; } - p = buf; - i2d_SSL_SESSION(sess, &p); - ngx_hex_dump(s->data, buf, len); - ngx_free(buf); - return NGX_OK; }