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

Fixed conftests after extending CERT payload.

Browse Source
This commit is contained in:
Tobias Brunner
2012-03-20 17:30:50 +01:00
parent b6016fcab3
commit d6cec44b24
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/conftest/hooks/ike_auth_fill.c
+1 -1
View File
@@ -108,7 +108,7 @@ METHOD(listener_t, message, bool,
diff = this->bytes - size - CERT_PAYLOAD_HEADER_LENGTH; diff = this->bytes - size - CERT_PAYLOAD_HEADER_LENGTH;
data = chunk_alloc(diff); data = chunk_alloc(diff);
memset(data.ptr, 0x12, data.len); memset(data.ptr, 0x12, data.len);
pld = cert_payload_create_custom(201, data); pld = cert_payload_create_custom(201, data, CERTIFICATE);
message->add_payload(message, &pld->payload_interface); message->add_payload(message, &pld->payload_interface);
DBG1(DBG_CFG, "inserting %d dummy bytes certificate payload", diff); DBG1(DBG_CFG, "inserting %d dummy bytes certificate payload", diff);
} }
src/conftest/hooks/pretend_auth.c
+2 -2
View File
@@ -154,7 +154,7 @@ static void build_certs(private_pretend_auth_t *this,
cert = auth->get(auth, AUTH_RULE_SUBJECT_CERT); cert = auth->get(auth, AUTH_RULE_SUBJECT_CERT);
if (cert) if (cert)
{ {
payload = cert_payload_create_from_cert(cert); payload = cert_payload_create_from_cert(cert, CERTIFICATE);
if (payload) if (payload)
{ {
DBG1(DBG_IKE, "pretending end entity cert \"%Y\"", DBG1(DBG_IKE, "pretending end entity cert \"%Y\"",
@@ -167,7 +167,7 @@ static void build_certs(private_pretend_auth_t *this,
{ {
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, "pretending issuer cert \"%Y\"", DBG1(DBG_IKE, "pretending issuer cert \"%Y\"",
src/libcharon/encoding/payloads/cert_payload.c
+4 -2
View File
@@ -332,7 +332,8 @@ cert_payload_t *cert_payload_create_from_cert(certificate_t *cert, payload_type_
/* /*
* Described in header * Described in header
*/ */
cert_payload_t *cert_payload_create_from_hash_and_url(chunk_t hash, char *url, payload_type_t type) cert_payload_t *cert_payload_create_from_hash_and_url(chunk_t hash, char *url,
payload_type_t type)
{ {
private_cert_payload_t *this = (private_cert_payload_t*)cert_payload_create(type); private_cert_payload_t *this = (private_cert_payload_t*)cert_payload_create(type);
@@ -345,7 +346,8 @@ cert_payload_t *cert_payload_create_from_hash_and_url(chunk_t hash, char *url, p
/* /*
* Described in header * Described in header
*/ */
cert_payload_t *cert_payload_create_custom(cert_encoding_t encoding, chunk_t data, payload_type_t type) cert_payload_t *cert_payload_create_custom(cert_encoding_t encoding,
chunk_t data, payload_type_t type)
{ {
private_cert_payload_t *this = (private_cert_payload_t*)cert_payload_create(type); private_cert_payload_t *this = (private_cert_payload_t*)cert_payload_create(type);