This commit is contained in:
+1
-1
@@ -177,7 +177,7 @@ static void initialize(private_daemon_t *this, bool strict)
|
|||||||
this->public.send_queue = send_queue_create();
|
this->public.send_queue = send_queue_create();
|
||||||
this->public.connections = (connection_store_t*)local_connection_store_create();
|
this->public.connections = (connection_store_t*)local_connection_store_create();
|
||||||
this->public.policies = (policy_store_t*)local_policy_store_create();
|
this->public.policies = (policy_store_t*)local_policy_store_create();
|
||||||
this->public.credentials = (credential_store_t*)(cred_store = local_credential_store_create());
|
this->public.credentials = (credential_store_t*)(cred_store = local_credential_store_create(strict));
|
||||||
|
|
||||||
/* load keys & certs */
|
/* load keys & certs */
|
||||||
cred_store->load_ca_certificates(cred_store, CA_CERTIFICATE_DIR);
|
cred_store->load_ca_certificates(cred_store, CA_CERTIFICATE_DIR);
|
||||||
|
|||||||
@@ -206,7 +206,7 @@ static status_t verify_auth_data (private_authenticator_t *this,
|
|||||||
&preshared_secret);
|
&preshared_secret);
|
||||||
if (status != SUCCESS)
|
if (status != SUCCESS)
|
||||||
{
|
{
|
||||||
this->logger->log(this->logger, ERROR|LEVEL1, "no shared secret found for '%s'",
|
this->logger->log(this->logger, ERROR, "no shared secret found for '%s'",
|
||||||
other_id->get_string(other_id));
|
other_id->get_string(other_id));
|
||||||
other_id->destroy(other_id);
|
other_id->destroy(other_id);
|
||||||
return status;
|
return status;
|
||||||
@@ -254,7 +254,7 @@ static status_t verify_auth_data (private_authenticator_t *this,
|
|||||||
other_id);
|
other_id);
|
||||||
if (public_key == NULL)
|
if (public_key == NULL)
|
||||||
{
|
{
|
||||||
this->logger->log(this->logger, ERROR|LEVEL1, "no public key found for '%s'",
|
this->logger->log(this->logger, ERROR, "no public key found for '%s'",
|
||||||
other_id->get_string(other_id));
|
other_id->get_string(other_id));
|
||||||
other_id->destroy(other_id);
|
other_id->destroy(other_id);
|
||||||
return NOT_FOUND;
|
return NOT_FOUND;
|
||||||
@@ -340,7 +340,7 @@ static status_t compute_auth_data (private_authenticator_t *this,
|
|||||||
|
|
||||||
identification_t *my_id = my_id_payload->get_identification(my_id_payload);
|
identification_t *my_id = my_id_payload->get_identification(my_id_payload);
|
||||||
|
|
||||||
this->logger->log(this->logger, CONTROL, "looking for public key belonging to '%s'",
|
this->logger->log(this->logger, CONTROL|LEVEL1, "looking for public key belonging to '%s'",
|
||||||
my_id->get_string(my_id));
|
my_id->get_string(my_id));
|
||||||
|
|
||||||
my_pubkey = charon->credentials->get_rsa_public_key(charon->credentials, my_id);
|
my_pubkey = charon->credentials->get_rsa_public_key(charon->credentials, my_id);
|
||||||
@@ -362,8 +362,8 @@ static status_t compute_auth_data (private_authenticator_t *this,
|
|||||||
char buf[BUF_LEN];
|
char buf[BUF_LEN];
|
||||||
|
|
||||||
chunk_to_hex(buf, BUF_LEN, my_pubkey->get_keyid(my_pubkey));
|
chunk_to_hex(buf, BUF_LEN, my_pubkey->get_keyid(my_pubkey));
|
||||||
this->logger->log(this->logger, ERROR, "no private key found with keyid %s",
|
this->logger->log(this->logger, ERROR, "no private key found with for %s with keyid %s",
|
||||||
buf);
|
my_id->get_string(my_id), buf);
|
||||||
goto end_rsa;
|
goto end_rsa;
|
||||||
}
|
}
|
||||||
this->logger->log(this->logger, CONTROL|LEVEL2, "matching private key found");
|
this->logger->log(this->logger, CONTROL|LEVEL2, "matching private key found");
|
||||||
|
|||||||
Reference in New Issue
Block a user