From 8353854ed7c658ae3692fb65f12adadf6f38307c Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Tue, 9 Feb 2021 10:52:46 -0800 Subject: [PATCH] crypto: use BoringSSL compatible errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/37297 Reviewed-By: Tobias Nießen Reviewed-By: Rich Trott --- src/crypto/crypto_dh.cc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/crypto/crypto_dh.cc b/src/crypto/crypto_dh.cc index b40f06f4500cd8..1c48f98656fd21 100644 --- a/src/crypto/crypto_dh.cc +++ b/src/crypto/crypto_dh.cc @@ -120,11 +120,13 @@ void DiffieHellman::MemoryInfo(MemoryTracker* tracker) const { bool DiffieHellman::Init(const char* p, int p_len, int g) { dh_.reset(DH_new()); if (p_len <= 0) { - BNerr(BN_F_BN_GENERATE_PRIME_EX, BN_R_BITS_TOO_SMALL); + ERR_put_error(ERR_LIB_BN, BN_F_BN_GENERATE_PRIME_EX, + BN_R_BITS_TOO_SMALL, __FILE__, __LINE__); return false; } if (g <= 1) { - DHerr(DH_F_DH_BUILTIN_GENPARAMS, DH_R_BAD_GENERATOR); + ERR_put_error(ERR_LIB_DH, DH_F_DH_BUILTIN_GENPARAMS, + DH_R_BAD_GENERATOR, __FILE__, __LINE__); return false; } BIGNUM* bn_p = @@ -142,18 +144,21 @@ bool DiffieHellman::Init(const char* p, int p_len, int g) { bool DiffieHellman::Init(const char* p, int p_len, const char* g, int g_len) { dh_.reset(DH_new()); if (p_len <= 0) { - BNerr(BN_F_BN_GENERATE_PRIME_EX, BN_R_BITS_TOO_SMALL); + ERR_put_error(ERR_LIB_BN, BN_F_BN_GENERATE_PRIME_EX, + BN_R_BITS_TOO_SMALL, __FILE__, __LINE__); return false; } if (g_len <= 0) { - DHerr(DH_F_DH_BUILTIN_GENPARAMS, DH_R_BAD_GENERATOR); + ERR_put_error(ERR_LIB_DH, DH_F_DH_BUILTIN_GENPARAMS, + DH_R_BAD_GENERATOR, __FILE__, __LINE__); return false; } BIGNUM* bn_g = BN_bin2bn(reinterpret_cast(g), g_len, nullptr); if (BN_is_zero(bn_g) || BN_is_one(bn_g)) { BN_free(bn_g); - DHerr(DH_F_DH_BUILTIN_GENPARAMS, DH_R_BAD_GENERATOR); + ERR_put_error(ERR_LIB_DH, DH_F_DH_BUILTIN_GENPARAMS, + DH_R_BAD_GENERATOR, __FILE__, __LINE__); return false; } BIGNUM* bn_p =