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

Migrate all enumerators to venumerate() interface change

Browse Source
This commit is contained in:
Tobias Brunner
2017-05-26 13:56:44 +02:00
parent 16bffa8b55
commit 95a63bf281
68 changed files with 851 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/credentials/credential_manager.c
+21 -7
View File
@@ -155,8 +155,12 @@ METHOD(credential_manager_t, call_hook, void,
}
METHOD(enumerator_t, sets_enumerate, bool,
sets_enumerator_t *this, credential_set_t **set)
sets_enumerator_t *this, va_list args)
{
credential_set_t **set;
VA_ARGS_VGET(args, set);
if (this->exclusive)
{
if (this->exclusive->enumerate(this->exclusive, set))
@@ -202,7 +206,8 @@ static enumerator_t *create_sets_enumerator(private_credential_manager_t *this)
INIT(enumerator,
.public = {
.enumerate = (void*)_sets_enumerate,
.enumerate = enumerator_enumerate_default,
.venumerate = _sets_enumerate,
.destroy = _sets_destroy,
},
);
@@ -840,9 +845,12 @@ typedef struct {
} trusted_enumerator_t;
METHOD(enumerator_t, trusted_enumerate, bool,
trusted_enumerator_t *this, certificate_t **cert, auth_cfg_t **auth)
trusted_enumerator_t *this, va_list args)
{
certificate_t *current;
certificate_t *current, **cert;
auth_cfg_t **auth;
VA_ARGS_VGET(args, cert, auth);
DESTROY_IF(this->auth);
this->auth = auth_cfg_create();
@@ -931,7 +939,8 @@ METHOD(credential_manager_t, create_trusted_enumerator, enumerator_t*,
INIT(enumerator,
.public = {
.enumerate = (void*)_trusted_enumerate,
.enumerate = enumerator_enumerate_default,
.venumerate = _trusted_enumerate,
.destroy = _trusted_destroy,
},
.this = this,
@@ -960,9 +969,13 @@ typedef struct {
} public_enumerator_t;
METHOD(enumerator_t, public_enumerate, bool,
public_enumerator_t *this, public_key_t **key, auth_cfg_t **auth)
public_enumerator_t *this, va_list args)
{
certificate_t *cert;
public_key_t **key;
auth_cfg_t **auth;
VA_ARGS_VGET(args, key, auth);
while (this->inner->enumerate(this->inner, &cert, auth))
{
@@ -1001,7 +1014,8 @@ METHOD(credential_manager_t, create_public_enumerator, enumerator_t*,
INIT(enumerator,
.public = {
.enumerate = (void*)_public_enumerate,
.enumerate = enumerator_enumerate_default,
.venumerate = _public_enumerate,
.destroy = _public_destroy,
},
.inner = create_trusted_enumerator(this, type, id, online),