diff options
| author | Adam Langley <agl@chromium.org> | 2014-08-13 23:28:02 +0400 |
|---|---|---|
| committer | Adam Langley <agl@chromium.org> | 2014-08-14 20:42:46 +0400 |
| commit | 82b7da271ff13a2878e921f0d262812d111a7b84 (patch) | |
| tree | b760ec1f32a74399581cd079a7900382678e3b2f /ssl/ssl_sess.c | |
| parent | 0f4746e207c075291081da66310f0ba1a709c120 (diff) | |
Set SSL_SESSION.cipher when parsing.
This was done for the server when parsing a session ticket, but it
wasn't done in the parsing function itself. That caused problems when
high level code used the parsing function directly to set a session for
the client code.
See comments in internal bug 7091840.
Change-Id: Iaa048c3df62cd9fe7a003af33805819e2556960a
Diffstat (limited to 'ssl/ssl_sess.c')
| -rw-r--r-- | ssl/ssl_sess.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 75e21101..312a9a20 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -560,15 +560,6 @@ int ssl_get_prev_session(SSL *s, const struct ssl_early_callback_ctx *ctx) goto err; } - if (ret->cipher == NULL) - { - /* The cipher id has a leading 0x03 to be removed (and then put - * back for the binary search) as a remnant of SSLv2 support. */ - ret->cipher = ssl3_get_cipher_by_value(ret->cipher_id & 0xffff); - if (ret->cipher == NULL) - goto err; - } - if (ret->timeout < (long)(time(NULL) - ret->time)) /* timeout */ { s->session_ctx->stats.sess_timeout++; |