From a0179d0afb621a0875ddcfd939719a9628ac4444 Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Mon, 13 Feb 2017 13:03:52 +0100 Subject: [PATCH] Fix i2d_SSL_SESSION pp output parameter should point to end of asn1 data. Reviewed-by: Matt Caswell Reviewed-by: Rich Salz Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/2607) --- ssl/ssl_asn1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c index 73ba78dbe5..8141471915 100644 --- a/ssl/ssl_asn1.c +++ b/ssl/ssl_asn1.c @@ -281,8 +281,8 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, goto err; } - p = as->cipher->data; - id = 0x03000000L | ((unsigned long)p[0] << 8L) | (unsigned long)p[1]; + id = 0x03000000L | ((unsigned long)as->cipher->data[0] << 8L) + | (unsigned long)as->cipher->data[1]; ret->cipher_id = id; ret->cipher = ssl3_get_cipher_by_id(id); -- 2.25.1