mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

Call OSSL_STORE_INFO_free on error path

Browse Source
This commit is contained in:
Mark Andrews
2023-01-31 00:57:57 +11:00
parent 80b88df4d3
commit 7f12c0884f
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/dns/openssl_link.c
View File

@@ -301,19 +301,23 @@ dst__openssl_fromlabel_provider(int key_base_id, const char *engine,
switch (OSSL_STORE_INFO_get_type(info)) { switch (OSSL_STORE_INFO_get_type(info)) {
case OSSL_STORE_INFO_PKEY: case OSSL_STORE_INFO_PKEY:
if (*ppriv != NULL) { if (*ppriv != NULL) {
OSSL_STORE_INFO_free(info);
DST_RET(DST_R_INVALIDPRIVATEKEY); DST_RET(DST_R_INVALIDPRIVATEKEY);
} }
*ppriv = OSSL_STORE_INFO_get1_PKEY(info); *ppriv = OSSL_STORE_INFO_get1_PKEY(info);
if (EVP_PKEY_get_base_id(*ppriv) != key_base_id) { if (EVP_PKEY_get_base_id(*ppriv) != key_base_id) {
OSSL_STORE_INFO_free(info);
DST_RET(DST_R_BADKEYTYPE); DST_RET(DST_R_BADKEYTYPE);
} }
break; break;
case OSSL_STORE_INFO_PUBKEY: case OSSL_STORE_INFO_PUBKEY:
if (*ppub != NULL) { if (*ppub != NULL) {
OSSL_STORE_INFO_free(info);
DST_RET(DST_R_INVALIDPUBLICKEY); DST_RET(DST_R_INVALIDPUBLICKEY);
} }
*ppub = OSSL_STORE_INFO_get1_PUBKEY(info); *ppub = OSSL_STORE_INFO_get1_PUBKEY(info);
if (EVP_PKEY_get_base_id(*ppub) != key_base_id) { if (EVP_PKEY_get_base_id(*ppub) != key_base_id) {
OSSL_STORE_INFO_free(info);
DST_RET(DST_R_BADKEYTYPE); DST_RET(DST_R_BADKEYTYPE);
} }
break; break;