mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 16:15:27 +00:00
Code Issues Releases Wiki Activity

Clear OpenSSL errors on EVP_PKEY_new failures

Browse Source
This commit is contained in:
Mark Andrews
2023-07-11 13:25:47 +10:00
parent 86b04368b0
commit 6df53cdb87
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/tests/system/rsabigexponent/bigkey.c
View File

@@ -83,6 +83,7 @@ main(int argc, char **argv) {
!EVP_PKEY_set1_RSA(pkey, rsa)) !EVP_PKEY_set1_RSA(pkey, rsa))
{ {
fprintf(stderr, "fatal error: basic OpenSSL failure\n"); fprintf(stderr, "fatal error: basic OpenSSL failure\n");
ERR_clear_error();
exit(1); exit(1);
} }
@@ -98,6 +99,7 @@ main(int argc, char **argv) {
"fatal error: RSA_generate_key_ex() fails " "fatal error: RSA_generate_key_ex() fails "
"at file %s line %d\n", "at file %s line %d\n",
__FILE__, __LINE__); __FILE__, __LINE__);
ERR_clear_error();
exit(1); exit(1);
} }

4
lib/dns/opensslecdsa_link.c
View File

@@ -323,7 +323,7 @@ opensslecdsa_create_pkey_legacy(unsigned int key_alg, bool private,
pkey = EVP_PKEY_new(); pkey = EVP_PKEY_new();
if (pkey == NULL) { if (pkey == NULL) {
DST_RET(ISC_R_NOMEMORY); DST_RET(dst__openssl_toresult(ISC_R_NOMEMORY));
} }
if (!EVP_PKEY_set1_EC_KEY(pkey, eckey)) { if (!EVP_PKEY_set1_EC_KEY(pkey, eckey)) {
DST_RET(dst__openssl_toresult(ISC_R_FAILURE)); DST_RET(dst__openssl_toresult(ISC_R_FAILURE));
@@ -515,7 +515,7 @@ opensslecdsa_generate_pkey(unsigned int key_alg, EVP_PKEY **retkey) {
pkey = EVP_PKEY_new(); pkey = EVP_PKEY_new();
if (pkey == NULL) { if (pkey == NULL) {
DST_RET(ISC_R_NOMEMORY); DST_RET(dst__openssl_toresult(ISC_R_NOMEMORY));
} }
if (EVP_PKEY_set1_EC_KEY(pkey, eckey) != 1) { if (EVP_PKEY_set1_EC_KEY(pkey, eckey) != 1) {
DST_RET(dst__openssl_toresult2("EVP_PKEY_set1_EC_KEY", DST_RET(dst__openssl_toresult2("EVP_PKEY_set1_EC_KEY",

1
lib/isc/hmac.c
View File

@@ -55,6 +55,7 @@ isc_hmac_init(isc_hmac_t *hmac, const void *key, const size_t keylen,
pkey = EVP_PKEY_new_raw_private_key(EVP_PKEY_HMAC, NULL, key, keylen); pkey = EVP_PKEY_new_raw_private_key(EVP_PKEY_HMAC, NULL, key, keylen);
if (pkey == NULL) { if (pkey == NULL) {
ERR_clear_error();
return (ISC_R_CRYPTOFAILURE); return (ISC_R_CRYPTOFAILURE);
} }