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

diff --git a/src/lib/libcrypto/evp/pmeth_lib.c b/src/lib/libcrypto/evp/pmeth_lib.c
index 1d64edcbeb..fc5f4ef91e 100644
--- a/src/lib/libcrypto/evp/pmeth_lib.c
+++ b/src/lib/libcrypto/evp/pmeth_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmeth_lib.c,v 1.12 2017/01/21 04:38:23 jsing Exp $ */
+/* $OpenBSD: pmeth_lib.c,v 1.13 2017/01/29 17:49:23 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -166,7 +166,7 @@ int_ctx_new(EVP_PKEY *pkey, ENGINE *e, int id)
         /* Try to find an ENGINE which implements this method */
         if (e) {
                 if (!ENGINE_init(e)) {
-                        EVPerr(EVP_F_INT_CTX_NEW, ERR_R_ENGINE_LIB);
+                        EVPerror(ERR_R_ENGINE_LIB);
                         return NULL;
                 }
         } else
@@ -183,7 +183,7 @@ int_ctx_new(EVP_PKEY *pkey, ENGINE *e, int id)
                 pmeth = EVP_PKEY_meth_find(id);
 
         if (pmeth == NULL) {
-                EVPerr(EVP_F_INT_CTX_NEW, EVP_R_UNSUPPORTED_ALGORITHM);
+                EVPerror(EVP_R_UNSUPPORTED_ALGORITHM);
                 return NULL;
         }
 
@@ -193,7 +193,7 @@ int_ctx_new(EVP_PKEY *pkey, ENGINE *e, int id)
                 if (e)
                         ENGINE_finish(e);
 #endif
-                EVPerr(EVP_F_INT_CTX_NEW, ERR_R_MALLOC_FAILURE);
+                EVPerror(ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
         ret->engine = e;
@@ -336,7 +336,7 @@ EVP_PKEY_CTX_dup(EVP_PKEY_CTX *pctx)
 #ifndef OPENSSL_NO_ENGINE
         /* Make sure it's safe to copy a pkey context using an ENGINE */
         if (pctx->engine && !ENGINE_init(pctx->engine)) {
-                EVPerr(EVP_F_EVP_PKEY_CTX_DUP, ERR_R_ENGINE_LIB);
+                EVPerror(ERR_R_ENGINE_LIB);
                 return 0;
         }
 #endif
@@ -409,26 +409,26 @@ EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype, int cmd,
         int ret;
 
         if (!ctx || !ctx->pmeth || !ctx->pmeth->ctrl) {
-                EVPerr(EVP_F_EVP_PKEY_CTX_CTRL, EVP_R_COMMAND_NOT_SUPPORTED);
+                EVPerror(EVP_R_COMMAND_NOT_SUPPORTED);
                 return -2;
         }
         if ((keytype != -1) && (ctx->pmeth->pkey_id != keytype))
                 return -1;
 
         if (ctx->operation == EVP_PKEY_OP_UNDEFINED) {
-                EVPerr(EVP_F_EVP_PKEY_CTX_CTRL, EVP_R_NO_OPERATION_SET);
+                EVPerror(EVP_R_NO_OPERATION_SET);
                 return -1;
         }
 
         if ((optype != -1) && !(ctx->operation & optype)) {
-                EVPerr(EVP_F_EVP_PKEY_CTX_CTRL, EVP_R_INVALID_OPERATION);
+                EVPerror(EVP_R_INVALID_OPERATION);
                 return -1;
         }
 
         ret = ctx->pmeth->ctrl(ctx, cmd, p1, p2);
 
         if (ret == -2)
-                EVPerr(EVP_F_EVP_PKEY_CTX_CTRL, EVP_R_COMMAND_NOT_SUPPORTED);
+                EVPerror(EVP_R_COMMAND_NOT_SUPPORTED);
 
         return ret;
 
@@ -438,15 +438,13 @@ int
 EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx, const char *name, const char *value)
 {
         if (!ctx || !ctx->pmeth || !ctx->pmeth->ctrl_str) {
-                EVPerr(EVP_F_EVP_PKEY_CTX_CTRL_STR,
-                    EVP_R_COMMAND_NOT_SUPPORTED);
+                EVPerror(EVP_R_COMMAND_NOT_SUPPORTED);
                 return -2;
         }
         if (!strcmp(name, "digest")) {
                 const EVP_MD *md;
                 if (!value || !(md = EVP_get_digestbyname(value))) {
-                        EVPerr(EVP_F_EVP_PKEY_CTX_CTRL_STR,
-                            EVP_R_INVALID_DIGEST);
+                        EVPerror(EVP_R_INVALID_DIGEST);
                         return 0;
                 }
                 return EVP_PKEY_CTX_set_signature_md(ctx, md);