ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

removed list_crls() and list_ocsp() methods

This commit is contained in:
Andreas Steffen 2007-04-06 09:43:20 +00:00
parent 3c5c3431b3
commit 4c56bd64e5
2 changed files with 42 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/charon/config/credentials/local_credential_store.c
View File

@ -874,59 +874,6 @@ static iterator_t* create_cainfo_iterator(private_local_credential_store_t *this
return this->ca_infos->create_iterator(this->ca_infos, TRUE);
}
/**
* Implements local_credential_store_t.list_crls
*/
static void list_crls(private_local_credential_store_t *this, FILE *out, bool utc)
{
iterator_t *iterator = this->ca_infos->create_iterator(this->ca_infos, TRUE);
ca_info_t *ca_info;
bool first = TRUE;
while (iterator->iterate(iterator, (void **)&ca_info))
{
if (ca_info->has_crl(ca_info))
{
if (first)
{
fprintf(out, "\n");
fprintf(out, "List of X.509 CRLs:\n");
fprintf(out, "\n");
first = FALSE;
}
ca_info->list_crl(ca_info, out, utc);
break;
}
}
iterator->destroy(iterator);
}
/**
* Implements local_credential_store_t.list_ocsp
*/
static void list_ocsp(private_local_credential_store_t *this, FILE *out, bool utc)
{
iterator_t *iterator = this->ca_infos->create_iterator(this->ca_infos, TRUE);
ca_info_t *ca_info;
bool first = TRUE;
while (iterator->iterate(iterator, (void **)&ca_info))
{
if (ca_info->has_certinfos(ca_info))
{
if (first)
{
fprintf(out, "\n");
fprintf(out, "List of OCSP responses:\n");
first = FALSE;
}
fprintf(out, "\n");
ca_info->list_certinfos(ca_info, out, utc);
}
}
iterator->destroy(iterator);
}
/**
* Implements local_credential_store_t.load_auth_certificates
*/
@ -1270,8 +1217,8 @@ static void load_secrets(private_local_credential_store_t *this)
this->private_keys->insert_last(this->private_keys, (void*)key);
}
}
else if ((match("PSK", &token)) ||
(match("EAP", &token) && (is_eap = TRUE)))
else if ( match("PSK", &token) ||
((match("EAP", &token) || match("XAUTH", &token)) && (is_eap = TRUE)))
{
shared_key_t *shared_key;
@ -1397,8 +1344,6 @@ local_credential_store_t * local_credential_store_create(bool strict)
this->public.credential_store.create_cert_iterator = (iterator_t* (*) (credential_store_t*))create_cert_iterator;
this->public.credential_store.create_auth_cert_iterator = (iterator_t* (*) (credential_store_t*))create_auth_cert_iterator;
this->public.credential_store.create_cainfo_iterator = (iterator_t* (*) (credential_store_t*))create_cainfo_iterator;
this->public.credential_store.list_crls = (void (*) (credential_store_t*,FILE*,bool))list_crls;
this->public.credential_store.list_ocsp = (void (*) (credential_store_t*,FILE*,bool))list_ocsp;
this->public.credential_store.load_ca_certificates = (void (*) (credential_store_t*))load_ca_certificates;
this->public.credential_store.load_ocsp_certificates = (void (*) (credential_store_t*))load_ocsp_certificates;
this->public.credential_store.load_crls = (void (*) (credential_store_t*))load_crls;

42
src/charon/threads/stroke_interface.c
View File

@ -1132,7 +1132,26 @@ static void stroke_list(stroke_msg_t *msg, FILE *out)
}
if (msg->list.flags & LIST_CRLS)
{
charon->credentials->list_crls(charon->credentials, out, msg->list.utc);
ca_info_t *ca_info;
bool first = TRUE;
iterator = charon->credentials->create_cainfo_iterator(charon->credentials);
while (iterator->iterate(iterator, (void **)&ca_info))
{
if (ca_info->has_crl(ca_info))
{
if (first)
{
fprintf(out, "\n");
fprintf(out, "List of X.509 CRLs:\n");
fprintf(out, "\n");
first = FALSE;
}
ca_info->list_crl(ca_info, out, msg->list.utc);
}
}
iterator->destroy(iterator);
}
if (msg->list.flags & LIST_OCSPCERTS)
{
@ -1140,7 +1159,26 @@ static void stroke_list(stroke_msg_t *msg, FILE *out)
}
if (msg->list.flags & LIST_OCSP)
{
charon->credentials->list_ocsp(charon->credentials, out, msg->list.utc);
ca_info_t *ca_info;
bool first = TRUE;
iterator = charon->credentials->create_cainfo_iterator(charon->credentials);
while (iterator->iterate(iterator, (void **)&ca_info))
{
if (ca_info->has_certinfos(ca_info))
{
if (first)
{
fprintf(out, "\n");
fprintf(out, "List of OCSP responses:\n");
first = FALSE;
}
fprintf(out, "\n");
ca_info->list_certinfos(ca_info, out, msg->list.utc);
}
}
iterator->destroy(iterator);
}
}