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/o_names.c |  6 +++---
 src/lib/libcrypto/objects/obj_dat.c | 18 +++++++++---------
 src/lib/libcrypto/objects/obj_err.c | 10 ++--------
 src/lib/libcrypto/objects/obj_lib.c |  6 +++---
 4 files changed, 17 insertions(+), 23 deletions(-)

(limited to 'src/lib/libcrypto/objects')

diff --git a/src/lib/libcrypto/objects/o_names.c b/src/lib/libcrypto/objects/o_names.c
index 81240db204..a9e5f859d5 100644
--- a/src/lib/libcrypto/objects/o_names.c
+++ b/src/lib/libcrypto/objects/o_names.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: o_names.c,v 1.21 2015/07/18 21:21:28 beck Exp $ */
+/* $OpenBSD: o_names.c,v 1.22 2017/01/29 17:49:23 beck Exp $ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -67,7 +67,7 @@ OBJ_NAME_new_index(unsigned long (*hash_func)(const char *),
 	for (i = sk_NAME_FUNCS_num(name_funcs_stack); i < names_type_num; i++) {
 		name_funcs = malloc(sizeof(NAME_FUNCS));
 		if (!name_funcs) {
-			OBJerr(OBJ_F_OBJ_NAME_NEW_INDEX, ERR_R_MALLOC_FAILURE);
+			OBJerror(ERR_R_MALLOC_FAILURE);
 			return (0);
 		}
 		name_funcs->hash_func = lh_strhash;
@@ -75,7 +75,7 @@ OBJ_NAME_new_index(unsigned long (*hash_func)(const char *),
 		name_funcs->free_func = NULL;
 		if (sk_NAME_FUNCS_push(name_funcs_stack, name_funcs) == 0) {
 			free(name_funcs);
-			OBJerr(OBJ_F_OBJ_NAME_NEW_INDEX, ERR_R_MALLOC_FAILURE);
+			OBJerror(ERR_R_MALLOC_FAILURE);
 			return (0);
 		}
 	}
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);
diff --git a/src/lib/libcrypto/objects/obj_err.c b/src/lib/libcrypto/objects/obj_err.c
index 9cea59b785..e1413190eb 100644
--- a/src/lib/libcrypto/objects/obj_err.c
+++ b/src/lib/libcrypto/objects/obj_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: obj_err.c,v 1.11 2014/07/10 22:45:57 jsing Exp $ */
+/* $OpenBSD: obj_err.c,v 1.12 2017/01/29 17:49:23 beck Exp $ */
 /* ====================================================================
  * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -72,13 +72,7 @@
 #define ERR_REASON(reason) ERR_PACK(ERR_LIB_OBJ,0,reason)
 
 static ERR_STRING_DATA OBJ_str_functs[] = {
-	{ERR_FUNC(OBJ_F_OBJ_ADD_OBJECT),	"OBJ_add_object"},
-	{ERR_FUNC(OBJ_F_OBJ_CREATE),	"OBJ_create"},
-	{ERR_FUNC(OBJ_F_OBJ_DUP),	"OBJ_dup"},
-	{ERR_FUNC(OBJ_F_OBJ_NAME_NEW_INDEX),	"OBJ_NAME_new_index"},
-	{ERR_FUNC(OBJ_F_OBJ_NID2LN),	"OBJ_nid2ln"},
-	{ERR_FUNC(OBJ_F_OBJ_NID2OBJ),	"OBJ_nid2obj"},
-	{ERR_FUNC(OBJ_F_OBJ_NID2SN),	"OBJ_nid2sn"},
+	{ERR_FUNC(0xfff), "CRYPTO_internal"},
 	{0, NULL}
 };
 
diff --git a/src/lib/libcrypto/objects/obj_lib.c b/src/lib/libcrypto/objects/obj_lib.c
index 247bafbe01..53f3bb9ebe 100644
--- a/src/lib/libcrypto/objects/obj_lib.c
+++ b/src/lib/libcrypto/objects/obj_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: obj_lib.c,v 1.13 2014/10/07 04:59:25 miod Exp $ */
+/* $OpenBSD: obj_lib.c,v 1.14 2017/01/29 17:49:23 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -79,7 +79,7 @@ OBJ_dup(const ASN1_OBJECT *o)
 
 	r = ASN1_OBJECT_new();
 	if (r == NULL) {
-		OBJerr(OBJ_F_OBJ_DUP, ERR_R_ASN1_LIB);
+		OBJerror(ERR_R_ASN1_LIB);
 		return (NULL);
 	}
 	data = malloc(o->length);
@@ -110,7 +110,7 @@ OBJ_dup(const ASN1_OBJECT *o)
 	return (r);
 
 err:
-	OBJerr(OBJ_F_OBJ_DUP, ERR_R_MALLOC_FAILURE);
+	OBJerror(ERR_R_MALLOC_FAILURE);
 	free(ln);
 	free(sn);
 	free(data);
-- 
cgit v1.2.3-55-g6feb