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

Updates ike_cert_post task with modifications needed for dealing with updated cert_payload class.

Browse Source
This commit is contained in:
Clavister OpenSource
2012-03-20 17:30:49 +01:00
parent c71760570e
commit 79e9f776dc
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/tasks/ike_cert_post.c
+5 -5
View File
@@ -62,14 +62,14 @@ static cert_payload_t *build_cert_payload(private_ike_cert_post_t *this,
if (!this->ike_sa->supports_extension(this->ike_sa, EXT_HASH_AND_URL)) if (!this->ike_sa->supports_extension(this->ike_sa, EXT_HASH_AND_URL))
{ {
return cert_payload_create_from_cert(cert); return cert_payload_create_from_cert(cert, CERTIFICATE);
} }
hasher = lib->crypto->create_hasher(lib->crypto, HASH_SHA1); hasher = lib->crypto->create_hasher(lib->crypto, HASH_SHA1);
if (!hasher) if (!hasher)
{ {
DBG1(DBG_IKE, "unable to use hash-and-url: sha1 not supported"); DBG1(DBG_IKE, "unable to use hash-and-url: sha1 not supported");
return cert_payload_create_from_cert(cert); return cert_payload_create_from_cert(cert, CERTIFICATE);
} }
if (!cert->get_encoding(cert, CERT_ASN1_DER, &encoded)) if (!cert->get_encoding(cert, CERT_ASN1_DER, &encoded))
@@ -86,12 +86,12 @@ static cert_payload_t *build_cert_payload(private_ike_cert_post_t *this,
enumerator = lib->credmgr->create_cdp_enumerator(lib->credmgr, CERT_X509, id); enumerator = lib->credmgr->create_cdp_enumerator(lib->credmgr, CERT_X509, id);
if (enumerator->enumerate(enumerator, &url)) if (enumerator->enumerate(enumerator, &url))
{ {
payload = cert_payload_create_from_hash_and_url(hash, url); payload = cert_payload_create_from_hash_and_url(hash, url, CERTIFICATE);
DBG1(DBG_IKE, "sending hash-and-url \"%s\"", url); DBG1(DBG_IKE, "sending hash-and-url \"%s\"", url);
} }
else else
{ {
payload = cert_payload_create_from_cert(cert); payload = cert_payload_create_from_cert(cert, CERTIFICATE);
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
chunk_free(&hash); chunk_free(&hash);
@@ -154,7 +154,7 @@ static void build_certs(private_ike_cert_post_t *this, message_t *message)
{ {
if (type == AUTH_RULE_IM_CERT) if (type == AUTH_RULE_IM_CERT)
{ {
payload = cert_payload_create_from_cert(cert); payload = cert_payload_create_from_cert(cert, CERTIFICATE);
if (payload) if (payload)
{ {
DBG1(DBG_IKE, "sending issuer cert \"%Y\"", DBG1(DBG_IKE, "sending issuer cert \"%Y\"",