denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipseckey: Properly free enumerated certificates

Browse Source
This commit is contained in:
Tobias Brunner
2016-09-20 15:36:15 +02:00
parent c0c14af8c2
commit 0b4ba9c53d
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/ipseckey/ipseckey_cred.c
+14 -12
View File
@@ -57,6 +57,8 @@ typedef struct {
time_t notAfter; time_t notAfter;
/* identity to which the IPSECKEY belongs */ /* identity to which the IPSECKEY belongs */
identification_t *identity; identification_t *identity;
/** most recently enumerated certificate */
certificate_t *cert;
} cert_enumerator_t; } cert_enumerator_t;
METHOD(enumerator_t, cert_enumerator_enumerate, bool, METHOD(enumerator_t, cert_enumerator_enumerate, bool,
@@ -91,28 +93,27 @@ METHOD(enumerator_t, cert_enumerator_enumerate, bool,
public = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_RSA, public = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_RSA,
BUILD_BLOB_DNSKEY, key, BUILD_BLOB_DNSKEY, key,
BUILD_END); BUILD_END);
cur_ipseckey->destroy(cur_ipseckey);
if (!public) if (!public)
{ {
DBG1(DBG_CFG, " failed to create public key from IPSECKEY"); DBG1(DBG_CFG, " failed to create public key from IPSECKEY");
cur_ipseckey->destroy(cur_ipseckey);
continue; continue;
} }
DESTROY_IF(this->cert);
*cert = lib->creds->create(lib->creds, CRED_CERTIFICATE, this->cert = lib->creds->create(lib->creds, CRED_CERTIFICATE,
CERT_TRUSTED_PUBKEY, CERT_TRUSTED_PUBKEY,
BUILD_PUBLIC_KEY, public, BUILD_PUBLIC_KEY, public,
BUILD_SUBJECT, this->identity, BUILD_SUBJECT, this->identity,
BUILD_NOT_BEFORE_TIME, this->notBefore, BUILD_NOT_BEFORE_TIME, this->notBefore,
BUILD_NOT_AFTER_TIME, this->notAfter, BUILD_NOT_AFTER_TIME, this->notAfter,
BUILD_END); BUILD_END);
public->destroy(public); public->destroy(public);
if (*cert == NULL) if (!this->cert)
{ {
DBG1(DBG_CFG, " failed to create certificate from IPSECKEY"); DBG1(DBG_CFG, " failed to create certificate from IPSECKEY");
cur_ipseckey->destroy(cur_ipseckey);
continue; continue;
} }
cur_ipseckey->destroy(cur_ipseckey); *cert = this->cert;
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
@@ -121,6 +122,7 @@ METHOD(enumerator_t, cert_enumerator_enumerate, bool,
METHOD(enumerator_t, cert_enumerator_destroy, void, METHOD(enumerator_t, cert_enumerator_destroy, void,
cert_enumerator_t *this) cert_enumerator_t *this)
{ {
DESTROY_IF(this->cert);
this->inner->destroy(this->inner); this->inner->destroy(this->inner);
this->response->destroy(this->response); this->response->destroy(this->response);
free(this); free(this);