Skip to content

Commit 8353854

Browse files
committed
crypto: use BoringSSL compatible errors
PR-URL: #37297 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent 41516b9 commit 8353854

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

src/crypto/crypto_dh.cc

+10-5
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,13 @@ void DiffieHellman::MemoryInfo(MemoryTracker* tracker) const {
120120
bool DiffieHellman::Init(const char* p, int p_len, int g) {
121121
dh_.reset(DH_new());
122122
if (p_len <= 0) {
123-
BNerr(BN_F_BN_GENERATE_PRIME_EX, BN_R_BITS_TOO_SMALL);
123+
ERR_put_error(ERR_LIB_BN, BN_F_BN_GENERATE_PRIME_EX,
124+
BN_R_BITS_TOO_SMALL, __FILE__, __LINE__);
124125
return false;
125126
}
126127
if (g <= 1) {
127-
DHerr(DH_F_DH_BUILTIN_GENPARAMS, DH_R_BAD_GENERATOR);
128+
ERR_put_error(ERR_LIB_DH, DH_F_DH_BUILTIN_GENPARAMS,
129+
DH_R_BAD_GENERATOR, __FILE__, __LINE__);
128130
return false;
129131
}
130132
BIGNUM* bn_p =
@@ -142,18 +144,21 @@ bool DiffieHellman::Init(const char* p, int p_len, int g) {
142144
bool DiffieHellman::Init(const char* p, int p_len, const char* g, int g_len) {
143145
dh_.reset(DH_new());
144146
if (p_len <= 0) {
145-
BNerr(BN_F_BN_GENERATE_PRIME_EX, BN_R_BITS_TOO_SMALL);
147+
ERR_put_error(ERR_LIB_BN, BN_F_BN_GENERATE_PRIME_EX,
148+
BN_R_BITS_TOO_SMALL, __FILE__, __LINE__);
146149
return false;
147150
}
148151
if (g_len <= 0) {
149-
DHerr(DH_F_DH_BUILTIN_GENPARAMS, DH_R_BAD_GENERATOR);
152+
ERR_put_error(ERR_LIB_DH, DH_F_DH_BUILTIN_GENPARAMS,
153+
DH_R_BAD_GENERATOR, __FILE__, __LINE__);
150154
return false;
151155
}
152156
BIGNUM* bn_g =
153157
BN_bin2bn(reinterpret_cast<const unsigned char*>(g), g_len, nullptr);
154158
if (BN_is_zero(bn_g) || BN_is_one(bn_g)) {
155159
BN_free(bn_g);
156-
DHerr(DH_F_DH_BUILTIN_GENPARAMS, DH_R_BAD_GENERATOR);
160+
ERR_put_error(ERR_LIB_DH, DH_F_DH_BUILTIN_GENPARAMS,
161+
DH_R_BAD_GENERATOR, __FILE__, __LINE__);
157162
return false;
158163
}
159164
BIGNUM* bn_p =

0 commit comments

Comments
 (0)