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

renamed tls_reader|writer to bio_* and moved to libstrongswan

Browse Source
This commit is contained in:
Andreas Steffen
2011-05-31 15:46:51 +02:00
parent 4cefb9bd10
commit 7e432eff6b
35 changed files with 299 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/eap_peap/eap_peap_avp.c
+2 -2
View File
@@ -45,7 +45,7 @@ struct private_eap_peap_avp_t {
};
METHOD(eap_peap_avp_t, build, void,
private_eap_peap_avp_t *this, tls_writer_t *writer, chunk_t data)
private_eap_peap_avp_t *this, bio_writer_t *writer, chunk_t data)
{
u_int8_t code;
eap_packet_t *pkt;
@@ -70,7 +70,7 @@ METHOD(eap_peap_avp_t, build, void,
}
METHOD(eap_peap_avp_t, process, status_t,
private_eap_peap_avp_t* this, tls_reader_t *reader, chunk_t *data,
private_eap_peap_avp_t* this, bio_reader_t *reader, chunk_t *data,
u_int8_t identifier)
{
u_int8_t code;
src/libcharon/plugins/eap_peap/eap_peap_avp.h
+4 -4
View File
@@ -25,8 +25,8 @@ typedef struct eap_peap_avp_t eap_peap_avp_t;
#include <library.h>
#include <tls_reader.h>
#include <tls_writer.h>
#include <bio/bio_reader.h>
#include <bio/bio_writer.h>
/**
* EAP-PEAP Attribute-Value Pair (AVP) handler.
@@ -44,7 +44,7 @@ struct eap_peap_avp_t {
* - FAILED if AVP processing failed
* - NEED_MORE if another invocation of process/build needed
*/
status_t (*process)(eap_peap_avp_t *this, tls_reader_t *reader,
status_t (*process)(eap_peap_avp_t *this, bio_reader_t *reader,
chunk_t *data, u_int8_t identifier);
/**
@@ -53,7 +53,7 @@ struct eap_peap_avp_t {
* @param writer TLS data buffer to write to
* @param data EAP Message to send
*/
void (*build)(eap_peap_avp_t *this, tls_writer_t *writer, chunk_t data);
void (*build)(eap_peap_avp_t *this, bio_writer_t *writer, chunk_t data);
/**
* Destroy a eap_peap_application_t.
src/libcharon/plugins/eap_peap/eap_peap_peer.c
+2 -2
View File
@@ -63,7 +63,7 @@ struct private_eap_peap_peer_t {
};
METHOD(tls_application_t, process, status_t,
private_eap_peap_peer_t *this, tls_reader_t *reader)
private_eap_peap_peer_t *this, bio_reader_t *reader)
{
chunk_t data = chunk_empty;
status_t status;
@@ -185,7 +185,7 @@ METHOD(tls_application_t, process, status_t,
}
METHOD(tls_application_t, build, status_t,
private_eap_peap_peer_t *this, tls_writer_t *writer)
private_eap_peap_peer_t *this, bio_writer_t *writer)
{
chunk_t data;
eap_code_t code;
src/libcharon/plugins/eap_peap/eap_peap_server.c
+2 -2
View File
@@ -158,7 +158,7 @@ static status_t start_phase2_tnc(private_eap_peap_server_t *this)
}
METHOD(tls_application_t, process, status_t,
private_eap_peap_server_t *this, tls_reader_t *reader)
private_eap_peap_server_t *this, bio_reader_t *reader)
{
chunk_t data = chunk_empty;
status_t status;
@@ -330,7 +330,7 @@ METHOD(tls_application_t, process, status_t,
}
METHOD(tls_application_t, build, status_t,
private_eap_peap_server_t *this, tls_writer_t *writer)
private_eap_peap_server_t *this, bio_writer_t *writer)
{
chunk_t data;
eap_code_t code;
src/libcharon/plugins/eap_ttls/eap_ttls_avp.c
+4 -4
View File
@@ -54,7 +54,7 @@ struct private_eap_ttls_avp_t {
};
METHOD(eap_ttls_avp_t, build, void,
private_eap_ttls_avp_t *this, tls_writer_t *writer, chunk_t data)
private_eap_ttls_avp_t *this, bio_writer_t *writer, chunk_t data)
{
char zero_padding[] = { 0x00, 0x00, 0x00 };
chunk_t avp_padding;
@@ -73,14 +73,14 @@ METHOD(eap_ttls_avp_t, build, void,
}
METHOD(eap_ttls_avp_t, process, status_t,
private_eap_ttls_avp_t* this, tls_reader_t *reader, chunk_t *data)
private_eap_ttls_avp_t* this, bio_reader_t *reader, chunk_t *data)
{
size_t len;
chunk_t buf;
if (this->process_header)
{
tls_reader_t *header;
bio_reader_t *header;
u_int32_t avp_code;
u_int8_t avp_flags;
u_int32_t avp_len;
@@ -110,7 +110,7 @@ METHOD(eap_ttls_avp_t, process, status_t,
}
/* parse AVP header */
header = tls_reader_create(this->input);
header = bio_reader_create(this->input);
success = header->read_uint32(header, &avp_code) &&
header->read_uint8(header, &avp_flags) &&
header->read_uint24(header, &avp_len);
src/libcharon/plugins/eap_ttls/eap_ttls_avp.h
+4 -4
View File
@@ -25,8 +25,8 @@ typedef struct eap_ttls_avp_t eap_ttls_avp_t;
#include <library.h>
#include <tls_reader.h>
#include <tls_writer.h>
#include <bio/bio_reader.h>
#include <bio/bio_writer.h>
/**
* EAP-TTLS Attribute-Value Pair (AVP) handler.
@@ -43,7 +43,7 @@ struct eap_ttls_avp_t {
* - FAILED if AVP processing failed
* - NEED_MORE if another invocation of process/build needed
*/
status_t (*process)(eap_ttls_avp_t *this, tls_reader_t *reader,
status_t (*process)(eap_ttls_avp_t *this, bio_reader_t *reader,
chunk_t *data);
/**
@@ -52,7 +52,7 @@ struct eap_ttls_avp_t {
* @param writer TLS data buffer to write to
* @param data EAP Message to send
*/
void (*build)(eap_ttls_avp_t *this, tls_writer_t *writer, chunk_t data);
void (*build)(eap_ttls_avp_t *this, bio_writer_t *writer, chunk_t data);
/**
* Destroy a eap_ttls_application_t.
src/libcharon/plugins/eap_ttls/eap_ttls_peer.c
+2 -2
View File
@@ -67,7 +67,7 @@ struct private_eap_ttls_peer_t {
#define MAX_RADIUS_ATTRIBUTE_SIZE 253
METHOD(tls_application_t, process, status_t,
private_eap_ttls_peer_t *this, tls_reader_t *reader)
private_eap_ttls_peer_t *this, bio_reader_t *reader)
{
chunk_t avp_data = chunk_empty;
chunk_t eap_data = chunk_empty;
@@ -229,7 +229,7 @@ METHOD(tls_application_t, process, status_t,
}
METHOD(tls_application_t, build, status_t,
private_eap_ttls_peer_t *this, tls_writer_t *writer)
private_eap_ttls_peer_t *this, bio_writer_t *writer)
{
chunk_t data;
eap_code_t code;
src/libcharon/plugins/eap_ttls/eap_ttls_server.c
+2 -2
View File
@@ -135,7 +135,7 @@ static status_t start_phase2_tnc(private_eap_ttls_server_t *this)
}
METHOD(tls_application_t, process, status_t,
private_eap_ttls_server_t *this, tls_reader_t *reader)
private_eap_ttls_server_t *this, bio_reader_t *reader)
{
chunk_t data = chunk_empty;
status_t status;
@@ -284,7 +284,7 @@ METHOD(tls_application_t, process, status_t,
}
METHOD(tls_application_t, build, status_t,
private_eap_ttls_server_t *this, tls_writer_t *writer)
private_eap_ttls_server_t *this, bio_writer_t *writer)
{
chunk_t data;
eap_code_t code;
src/libcharon/plugins/tnccs_20/Makefile.am
-1
View File
@@ -8,7 +8,6 @@ if MONOLITHIC
noinst_LTLIBRARIES = libstrongswan-tnccs-20.la
else
plugin_LTLIBRARIES = libstrongswan-tnccs-20.la
libstrongswan_tnccs_20_la_LIBADD = $(top_builddir)/src/libtls/libtls.la
endif
libstrongswan_tnccs_20_la_SOURCES = \
src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c
+8 -8
View File
@@ -20,8 +20,8 @@
#include <debug.h>
#include <utils/linked_list.h>
#include <tls_writer.h>
#include <tls_reader.h>
#include <bio/bio_writer.h>
#include <bio/bio_reader.h>
#include <tnc/tnccs/tnccs.h>
#include <tnc/pen/pen.h>
@@ -143,7 +143,7 @@ METHOD(pb_tnc_batch_t, build, void,
enumerator_t *enumerator;
pb_tnc_msg_type_t msg_type;
pb_tnc_msg_t *msg;
tls_writer_t *writer;
bio_writer_t *writer;
/* compute total PB-TNC batch size by summing over all messages */
batch_len = PB_TNC_BATCH_HEADER_SIZE;
@@ -157,7 +157,7 @@ METHOD(pb_tnc_batch_t, build, void,
enumerator->destroy(enumerator);
/* build PB-TNC batch header */
writer = tls_writer_create(batch_len);
writer = bio_writer_create(batch_len);
writer->write_uint8 (writer, PB_TNC_VERSION);
writer->write_uint8 (writer, this->is_server ?
PB_TNC_BATCH_FLAG_D : PB_TNC_BATCH_FLAG_NONE);
@@ -193,7 +193,7 @@ METHOD(pb_tnc_batch_t, build, void,
static status_t process_batch_header(private_pb_tnc_batch_t *this,
pb_tnc_state_machine_t *state_machine)
{
tls_reader_t *reader;
bio_reader_t *reader;
pb_tnc_msg_t *msg;
pb_error_msg_t *err_msg;
u_int8_t version, flags, reserved, type;
@@ -209,7 +209,7 @@ static status_t process_batch_header(private_pb_tnc_batch_t *this,
goto fatal;
}
reader = tls_reader_create(this->encoding);
reader = bio_reader_create(this->encoding);
reader->read_uint8 (reader, &version);
reader->read_uint8 (reader, &flags);
reader->read_uint8 (reader, &reserved);
@@ -278,7 +278,7 @@ fatal:
static status_t process_tnc_msg(private_pb_tnc_batch_t *this)
{
tls_reader_t *reader;
bio_reader_t *reader;
pb_tnc_msg_t *pb_tnc_msg, *msg;
u_int8_t flags;
u_int32_t vendor_id, msg_type, msg_len, offset;
@@ -297,7 +297,7 @@ static status_t process_tnc_msg(private_pb_tnc_batch_t *this)
goto fatal;
}
reader = tls_reader_create(data);
reader = bio_reader_create(data);
reader->read_uint8 (reader, &flags);
reader->read_uint24(reader, &vendor_id);
reader->read_uint32(reader, &msg_type);
src/libcharon/plugins/tnccs_20/messages/pb_access_recommendation_msg.c
+6 -6
View File
@@ -15,8 +15,8 @@
#include "pb_access_recommendation_msg.h"
#include <tls_writer.h>
#include <tls_reader.h>
#include <bio/bio_writer.h>
#include <bio/bio_reader.h>
#include <debug.h>
ENUM(pb_access_recommendation_code_names, PB_REC_ACCESS_ALLOWED, PB_REC_QUARANTINED,
@@ -80,10 +80,10 @@ METHOD(pb_tnc_msg_t, get_encoding, chunk_t,
METHOD(pb_tnc_msg_t, build, void,
private_pb_access_recommendation_msg_t *this)
{
tls_writer_t *writer;
bio_writer_t *writer;
/* build message */
writer = tls_writer_create(ACCESS_RECOMMENDATION_MSG_SIZE);
writer = bio_writer_create(ACCESS_RECOMMENDATION_MSG_SIZE);
writer->write_uint16(writer, ACCESS_RECOMMENDATION_RESERVED);
writer->write_uint16(writer, this->recommendation);
free(this->encoding.ptr);
@@ -95,11 +95,11 @@ METHOD(pb_tnc_msg_t, build, void,
METHOD(pb_tnc_msg_t, process, status_t,
private_pb_access_recommendation_msg_t *this, u_int32_t *offset)
{
tls_reader_t *reader;
bio_reader_t *reader;
u_int16_t reserved;
/* process message */
reader = tls_reader_create(this->encoding);
reader = bio_reader_create(this->encoding);
reader->read_uint16(reader, &reserved);
reader->read_uint16(reader, &this->recommendation);
reader->destroy(reader);
src/libcharon/plugins/tnccs_20/messages/pb_assessment_result_msg.c
+6 -6
View File
@@ -15,8 +15,8 @@
#include "pb_assessment_result_msg.h"
#include <tls_writer.h>
#include <tls_reader.h>
#include <bio/bio_writer.h>
#include <bio/bio_reader.h>
#include <tnc/tncifimv.h>
#include <debug.h>
@@ -75,10 +75,10 @@ METHOD(pb_tnc_msg_t, get_encoding, chunk_t,
METHOD(pb_tnc_msg_t, build, void,
private_pb_assessment_result_msg_t *this)
{
tls_writer_t *writer;
bio_writer_t *writer;
/* build message */
writer = tls_writer_create(ASSESSMENT_RESULT_MSG_SIZE);
writer = bio_writer_create(ASSESSMENT_RESULT_MSG_SIZE);
writer->write_uint32(writer, this->assessment_result);
free(this->encoding.ptr);
this->encoding = writer->get_buf(writer);
@@ -89,10 +89,10 @@ METHOD(pb_tnc_msg_t, build, void,
METHOD(pb_tnc_msg_t, process, status_t,
private_pb_assessment_result_msg_t *this, u_int32_t *offset)
{
tls_reader_t *reader;
bio_reader_t *reader;
/* process message */
reader = tls_reader_create(this->encoding);
reader = bio_reader_create(this->encoding);
reader->read_uint32(reader, &this->assessment_result);
reader->destroy(reader);
src/libcharon/plugins/tnccs_20/messages/pb_error_msg.c
+6 -6
View File
@@ -16,8 +16,8 @@
#include "pb_error_msg.h"
#include <debug.h>
#include <tls_writer.h>
#include <tls_reader.h>
#include <bio/bio_writer.h>
#include <bio/bio_reader.h>
#include <tnc/tnccs/tnccs.h>
#include <tnc/pen/pen.h>
@@ -117,10 +117,10 @@ METHOD(pb_tnc_msg_t, get_encoding, chunk_t,
METHOD(pb_tnc_msg_t, build, void,
private_pb_error_msg_t *this)
{
tls_writer_t *writer;
bio_writer_t *writer;
/* build message header */
writer = tls_writer_create(ERROR_HEADER_SIZE);
writer = bio_writer_create(ERROR_HEADER_SIZE);
writer->write_uint8 (writer, this->fatal ?
ERROR_FLAG_FATAL : ERROR_FLAG_NONE);
writer->write_uint24(writer, this->vendor_id);
@@ -153,7 +153,7 @@ METHOD(pb_tnc_msg_t, process, status_t,
{
u_int8_t flags, max_version, min_version;
u_int16_t reserved;
tls_reader_t *reader;
bio_reader_t *reader;
if (this->encoding.len < ERROR_HEADER_SIZE)
{
@@ -163,7 +163,7 @@ METHOD(pb_tnc_msg_t, process, status_t,
}
/* process message header */
reader = tls_reader_create(this->encoding);
reader = bio_reader_create(this->encoding);
reader->read_uint8 (reader, &flags);
reader->read_uint24(reader, &this->vendor_id);
reader->read_uint16(reader, &this->error_code);
src/libcharon/plugins/tnccs_20/messages/pb_language_preference_msg.c
+2 -2
View File
@@ -15,8 +15,8 @@
#include "pb_language_preference_msg.h"
#include <tls_writer.h>
#include <tls_reader.h>
#include <bio/bio_writer.h>
#include <bio/bio_reader.h>
#include <debug.h>
typedef struct private_pb_language_preference_msg_t private_pb_language_preference_msg_t;
src/libcharon/plugins/tnccs_20/messages/pb_pa_msg.c
+6 -6
View File
@@ -17,8 +17,8 @@
#include "pb_pa_msg.h"
#include <tls_writer.h>
#include <tls_reader.h>
#include <bio/bio_writer.h>
#include <bio/bio_reader.h>
#include <tnc/tnccs/tnccs.h>
#include <tnc/pen/pen.h>
#include <debug.h>
@@ -125,10 +125,10 @@ METHOD(pb_tnc_msg_t, build, void,
private_pb_pa_msg_t *this)
{
chunk_t msg_header;
tls_writer_t *writer;
bio_writer_t *writer;
/* build message header */
writer = tls_writer_create(64);
writer = bio_writer_create(64);
writer->write_uint8 (writer, this->excl ? PA_FLAG_EXCL : PA_FLAG_NONE);
writer->write_uint24(writer, this->vendor_id);
writer->write_uint32(writer, this->subtype);
@@ -147,10 +147,10 @@ METHOD(pb_tnc_msg_t, process, status_t,
{
u_int8_t flags;
size_t msg_body_len;
tls_reader_t *reader;
bio_reader_t *reader;
/* process message header */
reader = tls_reader_create(this->encoding);
reader = bio_reader_create(this->encoding);
reader->read_uint8 (reader, &flags);
reader->read_uint24(reader, &this->vendor_id);
reader->read_uint32(reader, &this->subtype);
src/libcharon/plugins/tnccs_20/messages/pb_reason_string_msg.c
+6 -6
View File
@@ -15,8 +15,8 @@
#include "pb_reason_string_msg.h"
#include <tls_writer.h>
#include <tls_reader.h>
#include <bio/bio_writer.h>
#include <bio/bio_reader.h>
#include <debug.h>
typedef struct private_pb_reason_string_msg_t private_pb_reason_string_msg_t;
@@ -81,10 +81,10 @@ METHOD(pb_tnc_msg_t, get_encoding, chunk_t,
METHOD(pb_tnc_msg_t, build, void,
private_pb_reason_string_msg_t *this)
{
tls_writer_t *writer;
bio_writer_t *writer;
/* build message */
writer = tls_writer_create(64);
writer = bio_writer_create(64);
writer->write_data32(writer, this->reason_string);
writer->write_data8 (writer, this->language_code);
@@ -97,10 +97,10 @@ METHOD(pb_tnc_msg_t, build, void,
METHOD(pb_tnc_msg_t, process, status_t,
private_pb_reason_string_msg_t *this, u_int32_t *offset)
{
tls_reader_t *reader;
bio_reader_t *reader;
/* process message */
reader = tls_reader_create(this->encoding);
reader = bio_reader_create(this->encoding);
if (!reader->read_data32(reader, &this->reason_string))
{
DBG1(DBG_TNC, "could not parse reason string");
src/libcharon/plugins/tnccs_20/messages/pb_remediation_parameters_msg.c
+6 -6
View File
@@ -15,8 +15,8 @@
#include "pb_remediation_parameters_msg.h"
#include <tls_writer.h>
#include <tls_reader.h>
#include <bio/bio_writer.h>
#include <bio/bio_reader.h>
#include <debug.h>
ENUM(pb_tnc_remed_param_type_names, PB_REMEDIATION_URI, PB_REMEDIATION_STRING,
@@ -106,10 +106,10 @@ METHOD(pb_tnc_msg_t, get_encoding, chunk_t,
METHOD(pb_tnc_msg_t, build, void,
private_pb_remediation_parameters_msg_t *this)
{
tls_writer_t *writer;
bio_writer_t *writer;
/* build message */
writer = tls_writer_create(64);
writer = bio_writer_create(64);
writer->write_uint32(writer, this->vendor_id);
writer->write_uint32(writer, this->parameters_type);
writer->write_data32(writer, this->remediation_string);
@@ -124,10 +124,10 @@ METHOD(pb_tnc_msg_t, build, void,
METHOD(pb_tnc_msg_t, process, status_t,
private_pb_remediation_parameters_msg_t *this, u_int32_t *offset)
{
tls_reader_t *reader;
bio_reader_t *reader;
/* process message */
reader = tls_reader_create(this->encoding);
reader = bio_reader_create(this->encoding);
reader->read_uint32(reader, &this->vendor_id);
reader->read_uint32(reader, &this->parameters_type);
src/libcharon/plugins/tnccs_dynamic/Makefile.am
-1
View File
@@ -8,7 +8,6 @@ if MONOLITHIC
noinst_LTLIBRARIES = libstrongswan-tnccs-dynamic.la
else
plugin_LTLIBRARIES = libstrongswan-tnccs-dynamic.la
libstrongswan_tnccs_dynamic_la_LIBADD = $(top_builddir)/src/libtls/libtls.la
endif
libstrongswan_tnccs_dynamic_la_SOURCES = \