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

add_certificate() now returns pointer to added cert

Browse Source
This commit is contained in:
Andreas Steffen
2006-06-12 07:57:14 +00:00
parent c4a7413e72
commit bc35460db7
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/config/credentials/credential_store.h
+2 -1
View File
@@ -98,8 +98,9 @@ struct credential_store_t {
* *
* @param this calling object * @param this calling object
* @param cert certificate to be added * @param cert certificate to be added
* @return pointer to the added or already existing certificate
*/ */
void (*add_certificate) (credential_store_t *this, x509_t *cert); x509_t* (*add_certificate) (credential_store_t *this, x509_t *cert);
/** /**
* @brief Lists all certificates kept in the local credential store. * @brief Lists all certificates kept in the local credential store.
src/charon/config/credentials/local_credential_store.c
+6 -7
View File
@@ -150,7 +150,7 @@ static bool has_rsa_private_key(private_local_credential_store_t *this, rsa_publ
/** /**
* Implements credential_store_t.add_certificate * Implements credential_store_t.add_certificate
*/ */
static void add_certificate(private_local_credential_store_t *this, x509_t *cert) static x509_t* add_certificate(private_local_credential_store_t *this, x509_t *cert)
{ {
bool found = FALSE; bool found = FALSE;
@@ -164,19 +164,18 @@ static void add_certificate(private_local_credential_store_t *this, x509_t *cert
if (cert->equals(cert, current_cert)) if (cert->equals(cert, current_cert))
{ {
found = TRUE; found = TRUE;
cert->destroy(cert);
cert = current_cert;
break; break;
} }
} }
iterator->destroy(iterator); iterator->destroy(iterator);
if (found) if (!found)
{
cert->destroy(cert);
}
else
{ {
this->certs->insert_last(this->certs, (void*)cert); this->certs->insert_last(this->certs, (void*)cert);
} }
return cert;
} }
/** /**
@@ -432,7 +431,7 @@ local_credential_store_t * local_credential_store_create(void)
this->public.credential_store.get_rsa_private_key = (rsa_private_key_t*(*)(credential_store_t*,rsa_public_key_t*))get_rsa_private_key; this->public.credential_store.get_rsa_private_key = (rsa_private_key_t*(*)(credential_store_t*,rsa_public_key_t*))get_rsa_private_key;
this->public.credential_store.has_rsa_private_key = (bool(*)(credential_store_t*,rsa_public_key_t*))has_rsa_private_key; this->public.credential_store.has_rsa_private_key = (bool(*)(credential_store_t*,rsa_public_key_t*))has_rsa_private_key;
this->public.credential_store.get_rsa_public_key = (rsa_public_key_t*(*)(credential_store_t*,identification_t*))get_rsa_public_key; this->public.credential_store.get_rsa_public_key = (rsa_public_key_t*(*)(credential_store_t*,identification_t*))get_rsa_public_key;
this->public.credential_store.add_certificate = (void(*)(credential_store_t*,x509_t*))add_certificate; this->public.credential_store.add_certificate = (x509_t*(*)(credential_store_t*,x509_t*))add_certificate;
this->public.credential_store.log_certificates = (void(*)(credential_store_t*,logger_t*,bool))log_certificates; this->public.credential_store.log_certificates = (void(*)(credential_store_t*,logger_t*,bool))log_certificates;
this->public.credential_store.log_ca_certificates = (void(*)(credential_store_t*,logger_t*,bool))log_ca_certificates; this->public.credential_store.log_ca_certificates = (void(*)(credential_store_t*,logger_t*,bool))log_ca_certificates;
this->public.load_ca_certificates = (void(*)(local_credential_store_t*,const char*))load_ca_certificates; this->public.load_ca_certificates = (void(*)(local_credential_store_t*,const char*))load_ca_certificates;