[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a0179d0afb621a0875ddcfd939719a9628ac4444 (commit)
      from  fe9aa7642c85190c1ec21b2965ce7308a667f19e (commit)


- Log -----------------------------------------------------------------
commit a0179d0afb621a0875ddcfd939719a9628ac4444
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Mon Feb 13 13:03:52 2017 +0100

    Fix i2d_SSL_SESSION pp output parameter should point to end of asn1 data.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2607)

-----------------------------------------------------------------------

Summary of changes:
 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 73ba78d..8141471 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);