From b53afc2ffda8c1c2f0cd88eebadb43457e4e2ad0 Mon Sep 17 00:00:00 2001 From: miod <> Date: Fri, 11 Jul 2014 12:04:46 +0000 Subject: Missing initialization; OpenSSL PR#3289 and #3345 via OpenSSL trunk. --- src/lib/libcrypto/evp/bio_b64.c | 5 +++-- src/lib/libssl/src/crypto/evp/bio_b64.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/lib') diff --git a/src/lib/libcrypto/evp/bio_b64.c b/src/lib/libcrypto/evp/bio_b64.c index 632d056168..53b8bcf615 100644 --- a/src/lib/libcrypto/evp/bio_b64.c +++ b/src/lib/libcrypto/evp/bio_b64.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_b64.c,v 1.18 2014/07/11 08:44:48 jsing Exp $ */ +/* $OpenBSD: bio_b64.c,v 1.19 2014/07/11 12:04:46 miod Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -224,7 +224,8 @@ b64_read(BIO *b, char *out, int outl) /* ctx->start=1; */ ctx->tmp_len = 0; } else if (ctx->start) { - q = p=(unsigned char *)ctx->tmp; + q = p =(unsigned char *)ctx->tmp; + num = 0; for (j = 0; j < i; j++) { if (*(q++) != '\n') continue; diff --git a/src/lib/libssl/src/crypto/evp/bio_b64.c b/src/lib/libssl/src/crypto/evp/bio_b64.c index 632d056168..53b8bcf615 100644 --- a/src/lib/libssl/src/crypto/evp/bio_b64.c +++ b/src/lib/libssl/src/crypto/evp/bio_b64.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_b64.c,v 1.18 2014/07/11 08:44:48 jsing Exp $ */ +/* $OpenBSD: bio_b64.c,v 1.19 2014/07/11 12:04:46 miod Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -224,7 +224,8 @@ b64_read(BIO *b, char *out, int outl) /* ctx->start=1; */ ctx->tmp_len = 0; } else if (ctx->start) { - q = p=(unsigned char *)ctx->tmp; + q = p =(unsigned char *)ctx->tmp; + num = 0; for (j = 0; j < i; j++) { if (*(q++) != '\n') continue; -- cgit v1.2.3-55-g6feb