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

diff --git a/src/lib/libcrypto/rsa/rsa_chk.c b/src/lib/libcrypto/rsa/rsa_chk.c
index dd9104f304..5345d31df9 100644
--- a/src/lib/libcrypto/rsa/rsa_chk.c
+++ b/src/lib/libcrypto/rsa/rsa_chk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_chk.c,v 1.12 2017/01/25 06:15:44 beck Exp $ */
+/* $OpenBSD: rsa_chk.c,v 1.13 2017/01/29 17:49:23 beck Exp $ */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
  *
@@ -63,7 +63,7 @@ RSA_check_key(const RSA *key)
         int ret = 1;
 
         if (!key->p || !key->q || !key->n || !key->e || !key->d) {
-                RSAerr(RSA_F_RSA_CHECK_KEY, RSA_R_VALUE_MISSING);
+                RSAerror(RSA_R_VALUE_MISSING);
                 return 0;
         }
 
@@ -76,7 +76,7 @@ RSA_check_key(const RSA *key)
         if (i == NULL || j == NULL || k == NULL || l == NULL || m == NULL ||
             ctx == NULL) {
                 ret = -1;
-                RSAerr(RSA_F_RSA_CHECK_KEY, ERR_R_MALLOC_FAILURE);
+                RSAerror(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
 
@@ -86,7 +86,7 @@ RSA_check_key(const RSA *key)
                 ret = r;
                 if (r != 0)
                         goto err;
-                RSAerr(RSA_F_RSA_CHECK_KEY, RSA_R_P_NOT_PRIME);
+                RSAerror(RSA_R_P_NOT_PRIME);
         }
 
         /* q prime? */
@@ -95,7 +95,7 @@ RSA_check_key(const RSA *key)
                 ret = r;
                 if (r != 0)
                         goto err;
-                RSAerr(RSA_F_RSA_CHECK_KEY, RSA_R_Q_NOT_PRIME);
+                RSAerror(RSA_R_Q_NOT_PRIME);
         }
 
         /* n = p*q? */
@@ -107,7 +107,7 @@ RSA_check_key(const RSA *key)
 
         if (BN_cmp(i, key->n) != 0) {
                 ret = 0;
-                RSAerr(RSA_F_RSA_CHECK_KEY, RSA_R_N_DOES_NOT_EQUAL_P_Q);
+                RSAerror(RSA_R_N_DOES_NOT_EQUAL_P_Q);
         }
 
         /* d*e = 1  mod lcm(p-1,q-1)? */
@@ -148,7 +148,7 @@ RSA_check_key(const RSA *key)
 
         if (!BN_is_one(i)) {
                 ret = 0;
-                RSAerr(RSA_F_RSA_CHECK_KEY, RSA_R_D_E_NOT_CONGRUENT_TO_1);
+                RSAerror(RSA_R_D_E_NOT_CONGRUENT_TO_1);
         }
 
         if (key->dmp1 != NULL && key->dmq1 != NULL && key->iqmp != NULL) {
@@ -167,8 +167,7 @@ RSA_check_key(const RSA *key)
 
                 if (BN_cmp(j, key->dmp1) != 0) {
                         ret = 0;
-                        RSAerr(RSA_F_RSA_CHECK_KEY,
-                            RSA_R_DMP1_NOT_CONGRUENT_TO_D);
+                        RSAerror(RSA_R_DMP1_NOT_CONGRUENT_TO_D);
                 }
 
                 /* dmq1 = d mod (q-1)? */
@@ -186,8 +185,7 @@ RSA_check_key(const RSA *key)
 
                 if (BN_cmp(j, key->dmq1) != 0) {
                         ret = 0;
-                        RSAerr(RSA_F_RSA_CHECK_KEY,
-                            RSA_R_DMQ1_NOT_CONGRUENT_TO_D);
+                        RSAerror(RSA_R_DMQ1_NOT_CONGRUENT_TO_D);
                 }
 
                 /* iqmp = q^-1 mod p? */
@@ -198,8 +196,7 @@ RSA_check_key(const RSA *key)
 
                 if (BN_cmp(i, key->iqmp) != 0) {
                         ret = 0;
-                        RSAerr(RSA_F_RSA_CHECK_KEY,
-                            RSA_R_IQMP_NOT_INVERSE_OF_Q);
+                        RSAerror(RSA_R_IQMP_NOT_INVERSE_OF_Q);
                 }
         }