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, 9 insertions, 13 deletions

diff --git a/src/lib/libcrypto/x509/x509_att.c b/src/lib/libcrypto/x509/x509_att.c
index ab11e79b0a..7304118eb3 100644
--- a/src/lib/libcrypto/x509/x509_att.c
+++ b/src/lib/libcrypto/x509/x509_att.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_att.c,v 1.14 2016/03/21 04:05:33 mmcc Exp $ */
+/* $OpenBSD: x509_att.c,v 1.15 2017/01/29 17:49:23 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -131,7 +131,7 @@ X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x, X509_ATTRIBUTE *attr)
         STACK_OF(X509_ATTRIBUTE) *sk = NULL;
 
         if (x == NULL) {
-                X509err(X509_F_X509AT_ADD1_ATTR, ERR_R_PASSED_NULL_PARAMETER);
+                X509error(ERR_R_PASSED_NULL_PARAMETER);
                 return (NULL);
         }
 
@@ -150,7 +150,7 @@ X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x, X509_ATTRIBUTE *attr)
         return (sk);
 
 err:
-        X509err(X509_F_X509AT_ADD1_ATTR, ERR_R_MALLOC_FAILURE);
+        X509error(ERR_R_MALLOC_FAILURE);
 err2:
         if (new_attr != NULL)
                 X509_ATTRIBUTE_free(new_attr);
@@ -231,8 +231,7 @@ X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid, int atrtype,
 
         obj = OBJ_nid2obj(nid);
         if (obj == NULL) {
-                X509err(X509_F_X509_ATTRIBUTE_CREATE_BY_NID,
-                    X509_R_UNKNOWN_NID);
+                X509error(X509_R_UNKNOWN_NID);
                 return (NULL);
         }
         ret = X509_ATTRIBUTE_create_by_OBJ(attr, obj, atrtype, data, len);
@@ -249,8 +248,7 @@ X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr, const ASN1_OBJECT *obj,
 
         if ((attr == NULL) || (*attr == NULL)) {
                 if ((ret = X509_ATTRIBUTE_new()) == NULL) {
-                        X509err(X509_F_X509_ATTRIBUTE_CREATE_BY_OBJ,
-                            ERR_R_MALLOC_FAILURE);
+                        X509error(ERR_R_MALLOC_FAILURE);
                         return (NULL);
                 }
         } else
@@ -280,8 +278,7 @@ X509_ATTRIBUTE_create_by_txt(X509_ATTRIBUTE **attr, const char *atrname,
 
         obj = OBJ_txt2obj(atrname, 0);
         if (obj == NULL) {
-                X509err(X509_F_X509_ATTRIBUTE_CREATE_BY_TXT,
-                    X509_R_INVALID_FIELD_NAME);
+                X509error(X509_R_INVALID_FIELD_NAME);
                 ERR_asprintf_error_data("name=%s", atrname);
                 return (NULL);
         }
@@ -314,8 +311,7 @@ X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, const void *data,
                 stmp = ASN1_STRING_set_by_NID(NULL, data, len, attrtype,
                     OBJ_obj2nid(attr->object));
                 if (!stmp) {
-                        X509err(X509_F_X509_ATTRIBUTE_SET1_DATA,
-                            ERR_R_ASN1_LIB);
+                        X509error(ERR_R_ASN1_LIB);
                         return 0;
                 }
                 atype = stmp->type;
@@ -352,7 +348,7 @@ X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, const void *data,
 err:
         ASN1_TYPE_free(ttmp);
         ASN1_STRING_free(stmp);
-        X509err(X509_F_X509_ATTRIBUTE_SET1_DATA, ERR_R_MALLOC_FAILURE);
+        X509error(ERR_R_MALLOC_FAILURE);
         return 0;
 }
 
@@ -383,7 +379,7 @@ X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx, int atrtype, void *data)
         if (!ttmp)
                 return NULL;
         if (atrtype != ASN1_TYPE_get(ttmp)){
-                X509err(X509_F_X509_ATTRIBUTE_GET0_DATA, X509_R_WRONG_TYPE);
+                X509error(X509_R_WRONG_TYPE);
                 return NULL;
         }
         return ttmp->value.ptr;