The branch master has been updated via 96384e613ae7092fb6f63daa69a9601d128416b2 (commit) from 8f0dd6d9eec0e52feb1b19725c7134684bff28bc (commit)
- Log ----------------------------------------------------------------- commit 96384e613ae7092fb6f63daa69a9601d128416b2 Author: Dr. Matthias St. Pierre <matthias.st.pie...@ncp-e.com> Date: Mon Apr 29 19:12:38 2019 +0200 FIPS: Fix compiler errors in rsa_chk.c when building with `-DFIPS_MODE` Reviewed-by: Richard Levitte <levi...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/8843) ----------------------------------------------------------------------- Summary of changes: crypto/rsa/rsa_chk.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/crypto/rsa/rsa_chk.c b/crypto/rsa/rsa_chk.c index 4f65dfa..96a13b3 100644 --- a/crypto/rsa/rsa_chk.c +++ b/crypto/rsa/rsa_chk.c @@ -25,11 +25,9 @@ int RSA_check_key(const RSA *key) int RSA_check_key_ex(const RSA *key, BN_GENCB *cb) { #ifdef FIPS_MODE - if (!(rsa_sp800_56b_check_public(key) - && rsa_sp800_56b_check_private(key) - && rsa_sp800_56b_check_keypair(key, NULL, -1, RSA_bits(key)) - return 0; - + return rsa_sp800_56b_check_public(key) + && rsa_sp800_56b_check_private(key) + && rsa_sp800_56b_check_keypair(key, NULL, -1, RSA_bits(key)); #else BIGNUM *i, *j, *k, *l, *m; BN_CTX *ctx;