1 files changed, 13 insertions, 20 deletions

diff --git a/src/lib/libcrypto/asn1/a_d2i_fp.c b/src/lib/libcrypto/asn1/a_d2i_fp.c
index c00b304c61..390a1072d5 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.15 2016/05/20 15:46:21 bcook Exp $ */
+/* $OpenBSD: a_d2i_fp.c,v 1.16 2017/01/29 17:49:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -74,7 +74,7 @@ ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x)
         void *ret;
 
         if ((b = BIO_new(BIO_s_file())) == NULL) {
-                ASN1err(ASN1_F_ASN1_D2I_FP, ERR_R_BUF_LIB);
+                ASN1error(ERR_R_BUF_LIB);
                 return (NULL);
         }
         BIO_set_fp(b, in, BIO_NOCLOSE);
@@ -134,7 +134,7 @@ ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x)
         char *ret;
 
         if ((b = BIO_new(BIO_s_file())) == NULL) {
-                ASN1err(ASN1_F_ASN1_ITEM_D2I_FP, ERR_R_BUF_LIB);
+                ASN1error(ERR_R_BUF_LIB);
                 return (NULL);
         }
         BIO_set_fp(b, in, BIO_NOCLOSE);
@@ -159,7 +159,7 @@ asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
 
         b = BUF_MEM_new();
         if (b == NULL) {
-                ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ERR_R_MALLOC_FAILURE);
+                ASN1error(ERR_R_MALLOC_FAILURE);
                 return -1;
         }
 
@@ -170,20 +170,17 @@ asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
 
                         if (len + want < len ||
                             !BUF_MEM_grow_clean(b, len + want)) {
-                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,
-                                    ERR_R_MALLOC_FAILURE);
+                                ASN1error(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);
+                                ASN1error(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);
+                                        ASN1error(ASN1_R_TOO_LONG);
                                         goto err;
                                 }
                                 len += i;
@@ -211,8 +208,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);
+                                ASN1error(ASN1_R_HEADER_TOO_LONG);
                                 goto err;
                         }
                         want = HEADER_SIZE;
@@ -232,8 +228,7 @@ asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
                                 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);
+                                        ASN1error(ASN1_R_TOO_LONG);
                                         goto err;
                                 }
                                 while (want > 0) {
@@ -246,16 +241,14 @@ asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
                                         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);
+                                                ASN1error(ERR_R_MALLOC_FAILURE);
                                                 goto err;
                                         }
                                         want -= chunk;
                                         while (chunk > 0) {
                                                 i = BIO_read(in, &(b->data[len]), chunk);
                                                 if (i <= 0) {
-                                                        ASN1err(ASN1_F_ASN1_D2I_READ_BIO,
-                                                            ASN1_R_NOT_ENOUGH_DATA);
+                                                        ASN1error(ASN1_R_NOT_ENOUGH_DATA);
                                                         goto err;
                                                 }
                                                 /*
@@ -270,7 +263,7 @@ asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
                                 }
                         }
                         if (off + c.slen < off) {
-                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_TOO_LONG);
+                                ASN1error(ASN1_R_TOO_LONG);
                                 goto err;
                         }
                         off += c.slen;
@@ -282,7 +275,7 @@ asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
         }
 
         if (off > INT_MAX) {
-                ASN1err(ASN1_F_ASN1_D2I_READ_BIO, ASN1_R_TOO_LONG);
+                ASN1error(ASN1_R_TOO_LONG);
                 goto err;
         }