summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorjsing <>2014-07-13 21:38:23 +0000
committerjsing <>2014-07-13 21:38:23 +0000
commit9e28eca16f16dae38f8957111772bbdec58376c9 (patch)
treeb20794ce8109418c06c6aa73476fccef904ef186 /src/lib
parent24e41266dcff4261425b554ed5b08cb4be1afe9e (diff)
downloadopenbsd-9e28eca16f16dae38f8957111772bbdec58376c9.tar.gz
openbsd-9e28eca16f16dae38f8957111772bbdec58376c9.tar.bz2
openbsd-9e28eca16f16dae38f8957111772bbdec58376c9.zip
Explicitly initialise slen - this was not previously done due to a missing
M_ASN1_D2I_begin macro.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libssl/src/ssl/ssl_asn1.c3
-rw-r--r--src/lib/libssl/ssl_asn1.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_asn1.c b/src/lib/libssl/src/ssl/ssl_asn1.c
index 9e1e2e37a1..3d4fe8cb6f 100644
--- a/src/lib/libssl/src/ssl/ssl_asn1.c
+++ b/src/lib/libssl/src/ssl/ssl_asn1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_asn1.c,v 1.35 2014/07/13 21:35:27 jsing Exp $ */ 1/* $OpenBSD: ssl_asn1.c,v 1.36 2014/07/13 21:38:23 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -274,6 +274,7 @@ d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length)
274 c.p = *pp; 274 c.p = *pp;
275 c.q = *pp; 275 c.q = *pp;
276 c.max = (length == 0) ? 0 : (c.p + length); 276 c.max = (length == 0) ? 0 : (c.p + length);
277 c.slen = length;
277 278
278 if (a == NULL || *a == NULL) { 279 if (a == NULL || *a == NULL) {
279 if ((ret = SSL_SESSION_new()) == NULL) { 280 if ((ret = SSL_SESSION_new()) == NULL) {
diff --git a/src/lib/libssl/ssl_asn1.c b/src/lib/libssl/ssl_asn1.c
index 9e1e2e37a1..3d4fe8cb6f 100644
--- a/src/lib/libssl/ssl_asn1.c
+++ b/src/lib/libssl/ssl_asn1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_asn1.c,v 1.35 2014/07/13 21:35:27 jsing Exp $ */ 1/* $OpenBSD: ssl_asn1.c,v 1.36 2014/07/13 21:38:23 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -274,6 +274,7 @@ d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length)
274 c.p = *pp; 274 c.p = *pp;
275 c.q = *pp; 275 c.q = *pp;
276 c.max = (length == 0) ? 0 : (c.p + length); 276 c.max = (length == 0) ? 0 : (c.p + length);
277 c.slen = length;
277 278
278 if (a == NULL || *a == NULL) { 279 if (a == NULL || *a == NULL) {
279 if ((ret = SSL_SESSION_new()) == NULL) { 280 if ((ret = SSL_SESSION_new()) == NULL) {