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

Migrated stroke_cred_t to INIT/METHOD macros.

Browse Source
This commit is contained in:
Tobias Brunner
2011-10-03 19:04:19 +02:00
parent 0d430d4f54
commit 673ce4da9b
1 changed files with 30 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/stroke/stroke_cred.c
+30 -38
View File
@@ -73,10 +73,8 @@ struct private_stroke_cred_t {
bool cachecrl; bool cachecrl;
}; };
/** METHOD(stroke_cred_t, load_ca, certificate_t*,
* Implementation of stroke_cred_t.load_ca. private_stroke_cred_t *this, char *filename)
*/
static certificate_t* load_ca(private_stroke_cred_t *this, char *filename)
{ {
certificate_t *cert; certificate_t *cert;
char path[PATH_MAX]; char path[PATH_MAX];
@@ -110,10 +108,8 @@ static certificate_t* load_ca(private_stroke_cred_t *this, char *filename)
return NULL; return NULL;
} }
/** METHOD(stroke_cred_t, load_peer, certificate_t*,
* Implementation of stroke_cred_t.load_peer. private_stroke_cred_t *this, char *filename)
*/
static certificate_t* load_peer(private_stroke_cred_t *this, char *filename)
{ {
certificate_t *cert; certificate_t *cert;
char path[PATH_MAX]; char path[PATH_MAX];
@@ -262,10 +258,8 @@ static void load_certdir(private_stroke_cred_t *this, char *path,
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
} }
/** METHOD(stroke_cred_t, cache_cert, void,
* Implementation of credential_set_t.cache_cert. private_stroke_cred_t *this, certificate_t *cert)
*/
static void cache_cert(private_stroke_cred_t *this, certificate_t *cert)
{ {
if (cert->get_type(cert) == CERT_X509_CRL && this->cachecrl) if (cert->get_type(cert) == CERT_X509_CRL && this->cachecrl)
{ {
@@ -292,10 +286,8 @@ static void cache_cert(private_stroke_cred_t *this, certificate_t *cert)
} }
} }
/** METHOD(stroke_cred_t, cachecrl, void,
* Implementation of stroke_cred_t.cachecrl. private_stroke_cred_t *this, bool enabled)
*/
static void cachecrl(private_stroke_cred_t *this, bool enabled)
{ {
DBG1(DBG_CFG, "crl caching to %s %s", DBG1(DBG_CFG, "crl caching to %s %s",
CRL_DIR, enabled ? "enabled" : "disabled"); CRL_DIR, enabled ? "enabled" : "disabled");
@@ -994,10 +986,8 @@ static void load_certs(private_stroke_cred_t *this)
load_certdir(this, CRL_DIR, CERT_X509_CRL, 0); load_certdir(this, CRL_DIR, CERT_X509_CRL, 0);
} }
/** METHOD(stroke_cred_t, reread, void,
* Implementation of stroke_cred_t.reread. private_stroke_cred_t *this, stroke_msg_t *msg, FILE *prompt)
*/
static void reread(private_stroke_cred_t *this, stroke_msg_t *msg, FILE *prompt)
{ {
if (msg->reread.flags & REREAD_SECRETS) if (msg->reread.flags & REREAD_SECRETS)
{ {
@@ -1037,10 +1027,8 @@ static void reread(private_stroke_cred_t *this, stroke_msg_t *msg, FILE *prompt)
} }
} }
/** METHOD(stroke_cred_t, destroy, void,
* Implementation of stroke_cred_t.destroy private_stroke_cred_t *this)
*/
static void destroy(private_stroke_cred_t *this)
{ {
lib->credmgr->remove_set(lib->credmgr, &this->creds->set); lib->credmgr->remove_set(lib->credmgr, &this->creds->set);
this->creds->destroy(this->creds); this->creds->destroy(this->creds);
@@ -1052,27 +1040,31 @@ static void destroy(private_stroke_cred_t *this)
*/ */
stroke_cred_t *stroke_cred_create() stroke_cred_t *stroke_cred_create()
{ {
private_stroke_cred_t *this = malloc_thing(private_stroke_cred_t); private_stroke_cred_t *this;
this->public.set.create_private_enumerator = (void*)return_null; INIT(this,
this->public.set.create_cert_enumerator = (void*)return_null; .public = {
this->public.set.create_shared_enumerator = (void*)return_null; .set = {
this->public.set.create_cdp_enumerator = (void*)return_null; .create_private_enumerator = (void*)return_null,
this->public.set.cache_cert = (void*)cache_cert; .create_cert_enumerator = (void*)return_null,
this->public.reread = (void(*)(stroke_cred_t*, stroke_msg_t *msg, FILE*))reread; .create_shared_enumerator = (void*)return_null,
this->public.load_ca = (certificate_t*(*)(stroke_cred_t*, char *filename))load_ca; .create_cdp_enumerator = (void*)return_null,
this->public.load_peer = (certificate_t*(*)(stroke_cred_t*, char *filename))load_peer; .cache_cert = (void*)_cache_cert,
this->public.cachecrl = (void(*)(stroke_cred_t*, bool enabled))cachecrl; },
this->public.destroy = (void(*)(stroke_cred_t*))destroy; .reread = _reread,
.load_ca = _load_ca,
.load_peer = _load_peer,
.cachecrl = _cachecrl,
.destroy = _destroy,
},
.creds = mem_cred_create(),
);
this->creds = mem_cred_create();
lib->credmgr->add_set(lib->credmgr, &this->creds->set); lib->credmgr->add_set(lib->credmgr, &this->creds->set);
load_certs(this); load_certs(this);
load_secrets(this, SECRETS_FILE, 0, NULL); load_secrets(this, SECRETS_FILE, 0, NULL);
this->cachecrl = FALSE;
return &this->public; return &this->public;
} }