commit a0179d0afb621a0875ddcfd939719a9628ac4444
author Bernd Edlinger <bernd.edlinger@hotmail.de> Mon Feb 13 13:03:52 2017 +0100
committer Richard Levitte <levitte@openssl.org> Wed Feb 22 00:47:15 2017 +0100
tree 8411c66d4d4b642ad8dd728f04db7c332c7a8af2
parent fe9aa7642c85190c1ec21b2965ce7308a667f19e

Fix i2d_SSL_SESSION pp output parameter should point to end of asn1 data.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2607)

ssl/ssl_asn1.c

diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
index 73ba78d..8141471 100644
--- a/ssl/ssl_asn1.c
+++ b/ssl/ssl_asn1.c
@@ -281,8 +281,8 @@
         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);