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, 7 insertions, 12 deletions

diff --git a/src/lib/libcrypto/x509/x509_req.c b/src/lib/libcrypto/x509/x509_req.c
index e6fc3c5df8..f87b35c706 100644
--- a/src/lib/libcrypto/x509/x509_req.c
+++ b/src/lib/libcrypto/x509/x509_req.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_req.c,v 1.19 2016/12/30 15:24:51 jsing Exp $ */
+/* $OpenBSD: x509_req.c,v 1.20 2017/01/29 17:49:23 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -80,7 +80,7 @@ X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
 
         ret = X509_REQ_new();
         if (ret == NULL) {
-                X509err(X509_F_X509_TO_X509_REQ, ERR_R_MALLOC_FAILURE);
+                X509error(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
 
@@ -133,31 +133,26 @@ X509_REQ_check_private_key(X509_REQ *x, EVP_PKEY *k)
                 ok = 1;
                 break;
         case 0:
-                X509err(X509_F_X509_REQ_CHECK_PRIVATE_KEY,
-                    X509_R_KEY_VALUES_MISMATCH);
+                X509error(X509_R_KEY_VALUES_MISMATCH);
                 break;
         case -1:
-                X509err(X509_F_X509_REQ_CHECK_PRIVATE_KEY,
-                    X509_R_KEY_TYPE_MISMATCH);
+                X509error(X509_R_KEY_TYPE_MISMATCH);
                 break;
         case -2:
 #ifndef OPENSSL_NO_EC
                 if (k->type == EVP_PKEY_EC) {
-                        X509err(X509_F_X509_REQ_CHECK_PRIVATE_KEY,
-                            ERR_R_EC_LIB);
+                        X509error(ERR_R_EC_LIB);
                         break;
                 }
 #endif
 #ifndef OPENSSL_NO_DH
                 if (k->type == EVP_PKEY_DH) {
                         /* No idea */
-                        X509err(X509_F_X509_REQ_CHECK_PRIVATE_KEY,
-                            X509_R_CANT_CHECK_DH_KEY);
+                        X509error(X509_R_CANT_CHECK_DH_KEY);
                         break;
                 }
 #endif
-                X509err(X509_F_X509_REQ_CHECK_PRIVATE_KEY,
-                    X509_R_UNKNOWN_KEY_TYPE);
+                X509error(X509_R_UNKNOWN_KEY_TYPE);
         }
 
         EVP_PKEY_free(xk);