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

diff --git a/src/lib/libcrypto/x509v3/v3_purp.c b/src/lib/libcrypto/x509v3/v3_purp.c
index d8ab679304..bdcdf95d12 100644
--- a/src/lib/libcrypto/x509v3/v3_purp.c
+++ b/src/lib/libcrypto/x509v3/v3_purp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_purp.c,v 1.28 2017/01/21 04:42:16 jsing Exp $ */
+/* $OpenBSD: v3_purp.c,v 1.29 2017/01/29 17:49:23 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -138,7 +138,7 @@ int
 X509_PURPOSE_set(int *p, int purpose)
 {
         if (X509_PURPOSE_get_by_id(purpose) == -1) {
-                X509V3err(X509V3_F_X509_PURPOSE_SET, X509V3_R_INVALID_PURPOSE);
+                X509V3error(X509V3_R_INVALID_PURPOSE);
                 return 0;
         }
         *p = purpose;
@@ -206,8 +206,7 @@ X509_PURPOSE_add(int id, int trust, int flags,
         name_dup = sname_dup = NULL;
 
         if (name == NULL || sname == NULL) {
-                X509V3err(X509V3_F_X509_PURPOSE_ADD,
-                    X509V3_R_INVALID_NULL_ARGUMENT);
+                X509V3error(X509V3_R_INVALID_NULL_ARGUMENT);
                 return 0;
         }
 
@@ -220,8 +219,7 @@ X509_PURPOSE_add(int id, int trust, int flags,
         /* Need a new entry */
         if (idx == -1) {
                 if ((ptmp = malloc(sizeof(X509_PURPOSE))) == NULL) {
-                        X509V3err(X509V3_F_X509_PURPOSE_ADD,
-                            ERR_R_MALLOC_FAILURE);
+                        X509V3error(ERR_R_MALLOC_FAILURE);
                         return 0;
                 }
                 ptmp->flags = X509_PURPOSE_DYNAMIC;
@@ -266,7 +264,7 @@ err:
         free(sname_dup);
         if (idx == -1)
                 free(ptmp);
-        X509V3err(X509V3_F_X509_PURPOSE_ADD, ERR_R_MALLOC_FAILURE);
+        X509V3error(ERR_R_MALLOC_FAILURE);
         return 0;
 }