From f27af0dcc67c0c4e1d679b5017f1f495f4ba6704 Mon Sep 17 00:00:00 2001 From: Emeric Brun Date: Fri, 26 Apr 2013 18:56:49 +0200 Subject: [PATCH] BUG/MEDIUM: shctx: makes the code independent on SSL runtime version. struct SSL(ssl_st) defintion changed between openssl versions and must not be dereferenced. --- src/shctx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/shctx.c b/src/shctx.c index 151b68a49..f259b9c1c 100644 --- a/src/shctx.c +++ b/src/shctx.c @@ -350,7 +350,7 @@ int shctx_new_cb(SSL *ssl, SSL_SESSION *sess) unsigned char encsess[sizeof(struct shsess_packet)+SHSESS_MAX_DATA_LEN]; struct shsess_packet *packet = (struct shsess_packet *)encsess; unsigned char *p; - int data_len, sid_length; + int data_len, sid_length, sid_ctx_length; /* Session id is already stored in to key and session id is known @@ -358,6 +358,7 @@ int shctx_new_cb(SSL *ssl, SSL_SESSION *sess) */ sid_length = sess->session_id_length; sess->session_id_length = 0; + sid_ctx_length = sess->sid_ctx_length; sess->sid_ctx_length = 0; /* check if buffer is large enough for the ASN1 encoded session */ @@ -382,8 +383,8 @@ int shctx_new_cb(SSL *ssl, SSL_SESSION *sess) err: /* reset original length values */ - sess->sid_ctx_length = ssl->sid_ctx_length; sess->session_id_length = sid_length; + sess->sid_ctx_length = sid_ctx_length; return 0; /* do not increment session reference count */ } @@ -461,7 +462,7 @@ SSL_SESSION *shctx_get_cb(SSL *ssl, unsigned char *key, int key_len, int *do_cop if (sess) { memcpy(sess->session_id, key, key_len); sess->session_id_length = key_len; - memcpy(sess->sid_ctx, ssl->sid_ctx, ssl->sid_ctx_length); + memcpy(sess->sid_ctx, (const unsigned char *)SHCTX_APPNAME, strlen(SHCTX_APPNAME)); sess->sid_ctx_length = ssl->sid_ctx_length; }