Commit bc931874 authored by Bernd Edlinger's avatar Bernd Edlinger Committed by Richard Levitte
Browse files

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



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2607)
(cherry picked from commit a0179d0a)
parent cc0a813f

ssl/ssl_asn1.c

+2 −2
Original line number Diff line number Diff line
@@ -278,8 +278,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 = NULL;

    ret->cipher_id = id;