Skip to content

Commit

Permalink
Fix memory leaks in ssl_old_test.c
Browse files Browse the repository at this point in the history
This fixes a few memory leaks reported in #22049.

If SSL_CTX_set0_tmp_dh_pkey rejects the temp dh key
due to security restrictions (even when @SECLEVEL=0 is used!)
then the caller has to delete the PKEY object.
That is different to how the deprecated
SSL_CTX_set_tmp_dh_pkey was designed to work.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from #22060)

(cherry picked from commit 21f0b80)
  • Loading branch information
bernd-edlinger committed Sep 13, 2023
1 parent 0d168f3 commit 1362474
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions test/ssl_old_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -1525,8 +1525,10 @@ int main(int argc, char *argv[])
ERR_print_errors(bio_err);
goto end;
}
SSL_CTX_set0_tmp_dh_pkey(s_ctx, dhpkey);
SSL_CTX_set0_tmp_dh_pkey(s_ctx2, dhpkey);
if (!SSL_CTX_set0_tmp_dh_pkey(s_ctx, dhpkey))
EVP_PKEY_free(dhpkey);
if (!SSL_CTX_set0_tmp_dh_pkey(s_ctx2, dhpkey))
EVP_PKEY_free(dhpkey);
}
#endif

Expand Down

0 comments on commit 1362474

Please sign in to comment.