1 files changed, 14 insertions, 37 deletions

diff --git a/src/lib/libcrypto/asn1/a_d2i_fp.c b/src/lib/libcrypto/asn1/a_d2i_fp.c
index d12890ec15..d85be56568 100644
--- a/src/lib/libcrypto/asn1/a_d2i_fp.c
+++ b/src/lib/libcrypto/asn1/a_d2i_fp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_d2i_fp.c,v 1.12 2016/05/03 12:38:53 tedu Exp $ */
+/* $OpenBSD: a_d2i_fp.c,v 1.13 2016/05/04 14:53:29 tedu Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -144,7 +144,6 @@ ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x)
 }
 
 #define HEADER_SIZE   8
-#define ASN1_CHUNK_INITIAL_SIZE (16 * 1024)
 static int
 asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
 {
@@ -168,22 +167,18 @@ asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
                 if (want >= (len - off)) {
                         want -= (len - off);
 
-                        if (len + want < len ||
-                            !BUF_MEM_grow_clean(b, len + want)) {
-                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,
-                                    ERR_R_MALLOC_FAILURE);
+                        if (len + want < len || !BUF_MEM_grow_clean(b, len + want)) {
+                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ERR_R_MALLOC_FAILURE);
                                 goto err;
                         }
                         i = BIO_read(in, &(b->data[len]), want);
                         if ((i < 0) && ((len - off) == 0)) {
-                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,
-                                    ASN1_R_NOT_ENOUGH_DATA);
+                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_NOT_ENOUGH_DATA);
                                 goto err;
                         }
                         if (i > 0) {
                                 if (len + i < len) {
-                                        ASN1err(ASN1_F_ASN1_D2I_READ_BIO,
-                                            ASN1_R_TOO_LONG);
+                                        ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_TOO_LONG);
                                         goto err;
                                 }
                                 len += i;
@@ -211,8 +206,7 @@ asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
                         /* no data body so go round again */
                         eos++;
                         if (eos < 0) {
-                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,
-                                    ASN1_R_HEADER_TOO_LONG);
+                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_HEADER_TOO_LONG);
                                 goto err;
                         }
                         want = HEADER_SIZE;
@@ -227,45 +221,28 @@ asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
                         /* suck in c.slen bytes of data */
                         want = c.slen;
                         if (want > (len - off)) {
-                                size_t chunk_max = ASN1_CHUNK_INITIAL_SIZE;
-
                                 want -= (len - off);
                                 if (want > INT_MAX /* BIO_read takes an int length */ ||
                                     len+want < len) {
-                                        ASN1err(ASN1_F_ASN1_D2I_READ_BIO,
-                                            ASN1_R_TOO_LONG);
+                                        ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_TOO_LONG);
                                         goto err;
                                 }
-                                /*
-                                 * Read content in chunks of increasing size
-                                 * so we can return an error for EOF without
-                                 * having to allocate the entire content length
-                                 * in one go.
-                                 */
-                                size_t chunk = want > chunk_max ? chunk_max : want;
-
-                                if (!BUF_MEM_grow_clean(b, len + chunk)) {
-                                        ASN1err(ASN1_F_ASN1_D2I_READ_BIO,
-                                            ERR_R_MALLOC_FAILURE);
+                                if (!BUF_MEM_grow_clean(b, len + want)) {
+                                        ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ERR_R_MALLOC_FAILURE);
                                         goto err;
                                 }
-                                want -= chunk;
-                                while (chunk > 0) {
-                                        i = BIO_read(in, &(b->data[len]), chunk);
+                                while (want > 0) {
+                                        i = BIO_read(in, &(b->data[len]), want);
                                         if (i <= 0) {
                                                 ASN1err(ASN1_F_ASN1_D2I_READ_BIO,
                                                     ASN1_R_NOT_ENOUGH_DATA);
                                                 goto err;
                                         }
-                                        /*
-                                         * This can't overflow because |len+want|
-                                         * didn't overflow.
-                                         */
+                                        /* This can't overflow because
+                                         * |len+want| didn't overflow. */
                                         len += i;
-                                        chunk -= i;
+                                        want -= i;
                                 }
-                                if (chunk_max < INT_MAX/2)
-                                        chunk_max *= 2;
                         }
                         if (off + c.slen < off) {
                                 ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_TOO_LONG);