From 050b59d92a59bb683d62535f09fae1847e30805b Mon Sep 17 00:00:00 2001 From: jsing Date: Sun, 13 Jul 2014 21:38:23 +0000 Subject: [PATCH] Explicitly initialise slen - this was not previously done due to a missing M_ASN1_D2I_begin macro. --- lib/libssl/src/ssl/ssl_asn1.c | 3 ++- lib/libssl/ssl_asn1.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libssl/src/ssl/ssl_asn1.c b/lib/libssl/src/ssl/ssl_asn1.c index 9e1e2e37a17..3d4fe8cb6f4 100644 --- a/lib/libssl/src/ssl/ssl_asn1.c +++ b/lib/libssl/src/ssl/ssl_asn1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_asn1.c,v 1.35 2014/07/13 21:35:27 jsing Exp $ */ +/* $OpenBSD: ssl_asn1.c,v 1.36 2014/07/13 21:38:23 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -274,6 +274,7 @@ d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length) c.p = *pp; c.q = *pp; c.max = (length == 0) ? 0 : (c.p + length); + c.slen = length; if (a == NULL || *a == NULL) { if ((ret = SSL_SESSION_new()) == NULL) { diff --git a/lib/libssl/ssl_asn1.c b/lib/libssl/ssl_asn1.c index 9e1e2e37a17..3d4fe8cb6f4 100644 --- a/lib/libssl/ssl_asn1.c +++ b/lib/libssl/ssl_asn1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_asn1.c,v 1.35 2014/07/13 21:35:27 jsing Exp $ */ +/* $OpenBSD: ssl_asn1.c,v 1.36 2014/07/13 21:38:23 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -274,6 +274,7 @@ d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length) c.p = *pp; c.q = *pp; c.max = (length == 0) ? 0 : (c.p + length); + c.slen = length; if (a == NULL || *a == NULL) { if ((ret = SSL_SESSION_new()) == NULL) { -- 2.20.1