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/evp/p_lib.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'src/lib/libcrypto/evp/p_lib.c')

diff --git a/src/lib/libcrypto/evp/p_lib.c b/src/lib/libcrypto/evp/p_lib.c
index e172c34894..0d4cd26d45 100644
--- a/src/lib/libcrypto/evp/p_lib.c
+++ b/src/lib/libcrypto/evp/p_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p_lib.c,v 1.16 2014/07/12 22:26:01 miod Exp $ */
+/* $OpenBSD: p_lib.c,v 1.17 2017/01/29 17:49:23 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -128,14 +128,12 @@ int
 EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
 {
 	if (to->type != from->type) {
-		EVPerr(EVP_F_EVP_PKEY_COPY_PARAMETERS,
-		    EVP_R_DIFFERENT_KEY_TYPES);
+		EVPerror(EVP_R_DIFFERENT_KEY_TYPES);
 		goto err;
 	}
 
 	if (EVP_PKEY_missing_parameters(from)) {
-		EVPerr(EVP_F_EVP_PKEY_COPY_PARAMETERS,
-		    EVP_R_MISSING_PARAMETERS);
+		EVPerror(EVP_R_MISSING_PARAMETERS);
 		goto err;
 	}
 	if (from->ameth && from->ameth->param_copy)
@@ -192,7 +190,7 @@ EVP_PKEY_new(void)
 
 	ret = malloc(sizeof(EVP_PKEY));
 	if (ret == NULL) {
-		EVPerr(EVP_F_EVP_PKEY_NEW, ERR_R_MALLOC_FAILURE);
+		EVPerror(ERR_R_MALLOC_FAILURE);
 		return (NULL);
 	}
 	ret->type = EVP_PKEY_NONE;
@@ -240,7 +238,7 @@ pkey_set_type(EVP_PKEY *pkey, int type, const char *str, int len)
 		ENGINE_finish(e);
 #endif
 	if (!ameth) {
-		EVPerr(EVP_F_PKEY_SET_TYPE, EVP_R_UNSUPPORTED_ALGORITHM);
+		EVPerror(EVP_R_UNSUPPORTED_ALGORITHM);
 		return 0;
 	}
 	if (pkey) {
@@ -294,7 +292,7 @@ RSA *
 EVP_PKEY_get1_RSA(EVP_PKEY *pkey)
 {
 	if (pkey->type != EVP_PKEY_RSA) {
-		EVPerr(EVP_F_EVP_PKEY_GET1_RSA, EVP_R_EXPECTING_AN_RSA_KEY);
+		EVPerror(EVP_R_EXPECTING_AN_RSA_KEY);
 		return NULL;
 	}
 	RSA_up_ref(pkey->pkey.rsa);
@@ -316,7 +314,7 @@ DSA *
 EVP_PKEY_get1_DSA(EVP_PKEY *pkey)
 {
 	if (pkey->type != EVP_PKEY_DSA) {
-		EVPerr(EVP_F_EVP_PKEY_GET1_DSA, EVP_R_EXPECTING_A_DSA_KEY);
+		EVPerror(EVP_R_EXPECTING_A_DSA_KEY);
 		return NULL;
 	}
 	DSA_up_ref(pkey->pkey.dsa);
@@ -339,7 +337,7 @@ EC_KEY *
 EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey)
 {
 	if (pkey->type != EVP_PKEY_EC) {
-		EVPerr(EVP_F_EVP_PKEY_GET1_EC_KEY, EVP_R_EXPECTING_A_EC_KEY);
+		EVPerror(EVP_R_EXPECTING_A_EC_KEY);
 		return NULL;
 	}
 	EC_KEY_up_ref(pkey->pkey.ec);
@@ -363,7 +361,7 @@ DH *
 EVP_PKEY_get1_DH(EVP_PKEY *pkey)
 {
 	if (pkey->type != EVP_PKEY_DH) {
-		EVPerr(EVP_F_EVP_PKEY_GET1_DH, EVP_R_EXPECTING_A_DH_KEY);
+		EVPerror(EVP_R_EXPECTING_A_DH_KEY);
 		return NULL;
 	}
 	DH_up_ref(pkey->pkey.dh);
-- 
cgit v1.2.3-55-g6feb