From 957b11334a7afb14537322f0e4795b2e368b3f59 Mon Sep 17 00:00:00 2001
From: beck <>
Date: Sun, 29 Jan 2017 17:49:23 +0000
Subject: 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@

---
 src/lib/libcrypto/objects/obj_dat.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/lib/libcrypto/objects/obj_dat.c')

diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c
index e1dacc0d39..5b7fac0588 100644
--- a/src/lib/libcrypto/objects/obj_dat.c
+++ b/src/lib/libcrypto/objects/obj_dat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: obj_dat.c,v 1.38 2017/01/21 04:44:43 jsing Exp $ */
+/* $OpenBSD: obj_dat.c,v 1.39 2017/01/29 17:49:23 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -329,7 +329,7 @@ OBJ_add_object(const ASN1_OBJECT *obj)
 	return (o->nid);
 
 err2:
-	OBJerr(OBJ_F_OBJ_ADD_OBJECT, ERR_R_MALLOC_FAILURE);
+	OBJerror(ERR_R_MALLOC_FAILURE);
 err:
 	for (i = ADDED_DATA; i <= ADDED_NID; i++)
 		free(ao[i]);
@@ -345,7 +345,7 @@ OBJ_nid2obj(int n)
 
 	if ((n >= 0) && (n < NUM_NID)) {
 		if ((n != NID_undef) && (nid_objs[n].nid == NID_undef)) {
-			OBJerr(OBJ_F_OBJ_NID2OBJ, OBJ_R_UNKNOWN_NID);
+			OBJerror(OBJ_R_UNKNOWN_NID);
 			return (NULL);
 		}
 		return ((ASN1_OBJECT *)&(nid_objs[n]));
@@ -359,7 +359,7 @@ OBJ_nid2obj(int n)
 		if (adp != NULL)
 			return (adp->obj);
 		else {
-			OBJerr(OBJ_F_OBJ_NID2OBJ, OBJ_R_UNKNOWN_NID);
+			OBJerror(OBJ_R_UNKNOWN_NID);
 			return (NULL);
 		}
 	}
@@ -373,7 +373,7 @@ OBJ_nid2sn(int n)
 
 	if ((n >= 0) && (n < NUM_NID)) {
 		if ((n != NID_undef) && (nid_objs[n].nid == NID_undef)) {
-			OBJerr(OBJ_F_OBJ_NID2SN, OBJ_R_UNKNOWN_NID);
+			OBJerror(OBJ_R_UNKNOWN_NID);
 			return (NULL);
 		}
 		return (nid_objs[n].sn);
@@ -387,7 +387,7 @@ OBJ_nid2sn(int n)
 		if (adp != NULL)
 			return (adp->obj->sn);
 		else {
-			OBJerr(OBJ_F_OBJ_NID2SN, OBJ_R_UNKNOWN_NID);
+			OBJerror(OBJ_R_UNKNOWN_NID);
 			return (NULL);
 		}
 	}
@@ -401,7 +401,7 @@ OBJ_nid2ln(int n)
 
 	if ((n >= 0) && (n < NUM_NID)) {
 		if ((n != NID_undef) && (nid_objs[n].nid == NID_undef)) {
-			OBJerr(OBJ_F_OBJ_NID2LN, OBJ_R_UNKNOWN_NID);
+			OBJerror(OBJ_R_UNKNOWN_NID);
 			return (NULL);
 		}
 		return (nid_objs[n].ln);
@@ -415,7 +415,7 @@ OBJ_nid2ln(int n)
 		if (adp != NULL)
 			return (adp->obj->ln);
 		else {
-			OBJerr(OBJ_F_OBJ_NID2LN, OBJ_R_UNKNOWN_NID);
+			OBJerror(OBJ_R_UNKNOWN_NID);
 			return (NULL);
 		}
 	}
@@ -799,7 +799,7 @@ OBJ_create(const char *oid, const char *sn, const char *ln)
 		return (0);
 
 	if ((buf = malloc(i)) == NULL) {
-		OBJerr(OBJ_F_OBJ_CREATE, ERR_R_MALLOC_FAILURE);
+		OBJerror(ERR_R_MALLOC_FAILURE);
 		return (0);
 	}
 	i = a2d_ASN1_OBJECT(buf, i, oid, -1);
-- 
cgit v1.2.3-55-g6feb