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

certificate handling for XAuth responder.

Browse Source
This commit is contained in:
Clavister OpenSource
2012-03-20 17:31:11 +01:00
parent a846be3116
commit 7d9269bfce
6 changed files with 572 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/encoding/message.c
Regular → Executable
+2 -2
View File
@@ -438,7 +438,7 @@ static payload_rule_t id_prot_i_rules[] = {
{CERTIFICATE_REQUEST_V1, 0, MAX_CERTREQ_PAYLOADS, FALSE, FALSE},
{NAT_D_V1, 0, MAX_NAT_D_PAYLOADS, FALSE, FALSE},
{ID_V1, 0, 1, TRUE, FALSE},
{CERTIFICATE_V1, 0, 1, TRUE, FALSE},
{CERTIFICATE_V1, 0, 2, TRUE, FALSE},
{SIGNATURE_V1, 0, 1, TRUE, FALSE},
{HASH_V1, 0, 1, TRUE, FALSE},
};
@@ -474,7 +474,7 @@ static payload_rule_t id_prot_r_rules[] = {
{CERTIFICATE_REQUEST_V1, 0, MAX_CERTREQ_PAYLOADS, FALSE, FALSE},
{NAT_D_V1, 0, MAX_NAT_D_PAYLOADS, FALSE, FALSE},
{ID_V1, 0, 1, TRUE, FALSE},
{CERTIFICATE_V1, 0, 1, TRUE, FALSE},
{CERTIFICATE_V1, 0, 2, TRUE, FALSE},
{SIGNATURE_V1, 0, 1, TRUE, FALSE},
{HASH_V1, 0, 1, TRUE, FALSE},
};
src/libcharon/encoding/payloads/certreq_payload.c
Regular → Executable
+42 -4
View File
@@ -64,6 +64,11 @@ struct private_certreq_payload_t {
* The contained certreq data value.
*/
chunk_t data;
/**
* Payload type for certificate request.
*/
payload_type_t payload_type;
};
/**
@@ -122,6 +127,13 @@ METHOD(payload_t, verify, status_t,
return SUCCESS;
}
METHOD(payload_t, verify_v1, status_t,
private_certreq_payload_t *this)
{
/*TODO: */
return SUCCESS;
}
METHOD(payload_t, get_encoding_rules, int,
private_certreq_payload_t *this, encoding_rule_t **rules)
{
@@ -138,7 +150,7 @@ METHOD(payload_t, get_header_length, int,
METHOD(payload_t, get_type, payload_type_t,
private_certreq_payload_t *this)
{
return CERTIFICATE_REQUEST;
return this->payload_type;
}
METHOD(payload_t, get_next_type, payload_type_t,
@@ -159,6 +171,23 @@ METHOD(payload_t, get_length, size_t,
return this->payload_length;
}
METHOD(certreq_payload_t, get_dn, chunk_t,
private_certreq_payload_t *this)
{
return this->data;
}
METHOD(certreq_payload_t, set_dn, void,
private_certreq_payload_t *this, chunk_t dn)
{
if (this->data.ptr)
{
free(this->data.ptr);
}
this->data = chunk_clone(dn);
this->payload_length = get_header_length(this) + this->data.len;
}
METHOD(certreq_payload_t, add_keyid, void,
private_certreq_payload_t *this, chunk_t keyid)
{
@@ -238,7 +267,7 @@ METHOD2(payload_t, certreq_payload_t, destroy, void,
/*
* Described in header
*/
certreq_payload_t *certreq_payload_create()
certreq_payload_t *certreq_payload_create(payload_type_t payload_type)
{
private_certreq_payload_t *this;
@@ -258,19 +287,28 @@ certreq_payload_t *certreq_payload_create()
.get_cert_type = _get_cert_type,
.add_keyid = _add_keyid,
.destroy = _destroy,
.get_dn = _get_dn,
.set_dn = _set_dn,
},
.next_payload = NO_PAYLOAD,
.payload_length = get_header_length(this),
.payload_type = payload_type,
);
if (payload_type == CERTIFICATE_REQUEST_V1)
{
this->public.payload_interface.verify = _verify_v1;
}
return &this->public;
}
/*
* Described in header
*/
certreq_payload_t *certreq_payload_create_type(certificate_type_t type)
certreq_payload_t *certreq_payload_create_type(payload_type_t payload_type, certificate_type_t type)
{
private_certreq_payload_t *this = (private_certreq_payload_t*)certreq_payload_create();
private_certreq_payload_t *this = (private_certreq_payload_t*)certreq_payload_create(payload_type);
switch (type)
{
src/libcharon/encoding/payloads/certreq_payload.h
Regular → Executable
+19 -4
View File
@@ -40,7 +40,7 @@ struct certreq_payload_t {
payload_t payload_interface;
/**
* Create an enumerator over contained keyids.
* Create an enumerator over contained keyids (IKEv2 only).
*
* @return enumerator over chunk_t's.
*/
@@ -54,13 +54,28 @@ struct certreq_payload_t {
certificate_type_t (*get_cert_type)(certreq_payload_t *this);
/**
* Add a certificates keyid to the payload.
* Add a certificates keyid to the payload (IKEv2 only).
*
* @param keyid keyid of the trusted certifcate
* @return
*/
void (*add_keyid)(certreq_payload_t *this, chunk_t keyid);
/**
* Get certificate request data (IKEv1 only).
*
* @return certifcate request data
*/
chunk_t (*get_dn)(certreq_payload_t *this);
/**
* Set certificate request data (IKEv1 only).
*
* @param dn certifcate request data to set
* @return
*/
void (*set_dn)(certreq_payload_t *this, chunk_t dn);
/**
* Destroys an certreq_payload_t object.
*/
@@ -72,7 +87,7 @@ struct certreq_payload_t {
*
* @return certreq payload
*/
certreq_payload_t *certreq_payload_create(void);
certreq_payload_t *certreq_payload_create(payload_type_t payload_type);
/**
* Creates an empty certreq_payload_t for a kind of certificates.
@@ -80,6 +95,6 @@ certreq_payload_t *certreq_payload_create(void);
* @param type type of the added keyids
* @return certreq payload
*/
certreq_payload_t *certreq_payload_create_type(certificate_type_t type);
certreq_payload_t *certreq_payload_create_type(payload_type_t payload_type, certificate_type_t type);
#endif /** CERTREQ_PAYLOAD_H_ @}*/
src/libcharon/encoding/payloads/payload.c
Regular → Executable
+3 -1
View File
@@ -213,7 +213,8 @@ payload_t *payload_create(payload_type_t type)
case CERTIFICATE_V1:
return (payload_t*)cert_payload_create(type);
case CERTIFICATE_REQUEST:
return (payload_t*)certreq_payload_create();
case CERTIFICATE_REQUEST_V1:
return (payload_t*)certreq_payload_create(type);
case TRAFFIC_SELECTOR_SUBSTRUCTURE:
return (payload_t*)traffic_selector_substructure_create();
case TRAFFIC_SELECTOR_INITIATOR:
@@ -233,6 +234,7 @@ payload_t *payload_create(payload_type_t type)
case VENDOR_ID_V1:
return (payload_t*)vendor_id_payload_create(type);
case HASH_V1:
case SIGNATURE_V1:
case NAT_D_V1:
return (payload_t*)hash_payload_create(type);
case CONFIGURATION: