Send the function codes from the error functions to the bit bucket,

as was done earlier in libssl. Thanks inoguchi@ for noticing
libssl had more reacharounds into this.
ok jsing@ inoguchi@

1 files changed, 12 insertions, 17 deletions

diff --git a/src/lib/libcrypto/asn1/a_object.c b/src/lib/libcrypto/asn1/a_object.c
index 44694d2ba7..711b01f149 100644
--- a/src/lib/libcrypto/asn1/a_object.c
+++ b/src/lib/libcrypto/asn1/a_object.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_object.c,v 1.28 2016/11/06 17:04:48 bcook Exp $ */
+/* $OpenBSD: a_object.c,v 1.29 2017/01/29 17:49:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -109,12 +109,12 @@ a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num)
         if ((c >= '0') && (c <= '2')) {
                 first= c-'0';
         } else {
-                ASN1err(ASN1_F_A2D_ASN1_OBJECT, ASN1_R_FIRST_NUM_TOO_LARGE);
+                ASN1error(ASN1_R_FIRST_NUM_TOO_LARGE);
                 goto err;
         }
 
         if (num <= 0) {
-                ASN1err(ASN1_F_A2D_ASN1_OBJECT, ASN1_R_MISSING_SECOND_NUMBER);
+                ASN1error(ASN1_R_MISSING_SECOND_NUMBER);
                 goto err;
         }
         c = *(p++);
@@ -123,8 +123,7 @@ a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num)
                 if (num <= 0)
                         break;
                 if ((c != '.') && (c != ' ')) {
-                        ASN1err(ASN1_F_A2D_ASN1_OBJECT,
-                            ASN1_R_INVALID_SEPARATOR);
+                        ASN1error(ASN1_R_INVALID_SEPARATOR);
                         goto err;
                 }
                 l = 0;
@@ -137,8 +136,7 @@ a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num)
                         if ((c == ' ') || (c == '.'))
                                 break;
                         if ((c < '0') || (c > '9')) {
-                                ASN1err(ASN1_F_A2D_ASN1_OBJECT,
-                                    ASN1_R_INVALID_DIGIT);
+                                ASN1error(ASN1_R_INVALID_DIGIT);
                                 goto err;
                         }
                         if (!use_bn && l >= ((ULONG_MAX - 80) / 10L)) {
@@ -157,8 +155,7 @@ a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num)
                 }
                 if (len == 0) {
                         if ((first < 2) && (l >= 40)) {
-                                ASN1err(ASN1_F_A2D_ASN1_OBJECT,
-                                    ASN1_R_SECOND_NUMBER_TOO_LARGE);
+                                ASN1error(ASN1_R_SECOND_NUMBER_TOO_LARGE);
                                 goto err;
                         }
                         if (use_bn) {
@@ -194,8 +191,7 @@ a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num)
                 }
                 if (out != NULL) {
                         if (len + i > olen) {
-                                ASN1err(ASN1_F_A2D_ASN1_OBJECT,
-                                    ASN1_R_BUFFER_TOO_SMALL);
+                                ASN1error(ASN1_R_BUFFER_TOO_SMALL);
                                 goto err;
                         }
                         while (--i > 0)
@@ -277,7 +273,7 @@ d2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp, long length)
         return ret;
 
 err:
-        ASN1err(ASN1_F_D2I_ASN1_OBJECT, i);
+        ASN1error(i);
         return (NULL);
 }
 
@@ -297,7 +293,7 @@ c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp, long len)
          */
         if (len <= 0 || len > INT_MAX || pp == NULL || (p = *pp) == NULL ||
             p[len - 1] & 0x80) {
-                ASN1err(ASN1_F_C2I_ASN1_OBJECT, ASN1_R_INVALID_OBJECT_ENCODING);
+                ASN1error(ASN1_R_INVALID_OBJECT_ENCODING);
                 return (NULL);
         }
 
@@ -305,8 +301,7 @@ c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp, long len)
         length = (int)len;
         for (i = 0; i < length; i++, p++) {
                 if (*p == 0x80 && (!i || !(p[-1] & 0x80))) {
-                        ASN1err(ASN1_F_C2I_ASN1_OBJECT,
-                            ASN1_R_INVALID_OBJECT_ENCODING);
+                        ASN1error(ASN1_R_INVALID_OBJECT_ENCODING);
                         return (NULL);
                 }
         }
@@ -330,7 +325,7 @@ c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp, long len)
 
         data = malloc(length);
         if (data == NULL) {
-                ASN1err(ASN1_F_C2I_ASN1_OBJECT, ERR_R_MALLOC_FAILURE);
+                ASN1error(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
 
@@ -362,7 +357,7 @@ ASN1_OBJECT_new(void)
 
         ret = malloc(sizeof(ASN1_OBJECT));
         if (ret == NULL) {
-                ASN1err(ASN1_F_ASN1_OBJECT_NEW, ERR_R_MALLOC_FAILURE);
+                ASN1error(ERR_R_MALLOC_FAILURE);
                 return (NULL);
         }
         ret->length = 0;