Migrated cert_payload to INIT/METHOD macros

src/libcharon/encoding/payloads/cert_payload.c

@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2008 Tobias Brunner
- * Copyright (C) 2005-2007 Martin Willi
+ * Copyright (C) 2005-2010 Martin Willi
+ * Copyright (C) 2010 revosec AG
  * Copyright (C) 2005 Jan Hutter
  * Hochschule fuer Technik Rapperswil
  *
@@ -43,9 +44,9 @@ typedef struct private_cert_payload_t private_cert_payload_t;
 
 /**
  * Private data of an cert_payload_t object.
- *
  */
 struct private_cert_payload_t {
+
 	/**
 	 * Public cert_payload_t interface.
 	 */
@@ -123,14 +124,14 @@ encoding_rule_t cert_payload_encodings[] = {
       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 */
 
-/**
+METHOD(payload_t, verify, status_t,
- * Implementation of payload_t.verify.
+	private_cert_payload_t *this)
- */
-static status_t verify(private_cert_payload_t *this)
 {
 	if (this->encoding == ENC_X509_HASH_AND_URL ||
 		this->encoding == ENC_X509_HASH_AND_URL_BUNDLE)
 	{
+		int i;
+
 		/* coarse verification of "Hash and URL" encoded certificates */
 		if (this->data.len <= 20)
 		{
@@ -139,9 +140,7 @@ static status_t verify(private_cert_payload_t *this)
 			this->invalid_hash_and_url = TRUE;
 			return SUCCESS;
 		}
-
+		for (i = 20; i < this->data.len; ++i)
-		int i = 20; /* skipping the hash */
-		for (; i < this->data.len; ++i)
 		{
 			if (this->data.ptr[i] == '\0')
 			{
@@ -156,71 +155,51 @@ static status_t verify(private_cert_payload_t *this)
 				return SUCCESS;
 			}
 		}
-
 		/* URL is not null terminated, correct that */
-		chunk_t data = chunk_alloc(this->data.len + 1);
+		this->data = chunk_cat("mc", this->data, chunk_from_chars(0));
-		memcpy(data.ptr, this->data.ptr, this->data.len);
-		data.ptr[this->data.len] = '\0';
-		chunk_free(&this->data);
-		this->data = data;
 	}
 	return SUCCESS;
 }
 
-/**
+METHOD(payload_t, get_encoding_rules, void,
- * Implementation of cert_payload_t.get_encoding_rules.
+	private_cert_payload_t *this, encoding_rule_t **rules, size_t *rule_count)
- */
-static void get_encoding_rules(private_cert_payload_t *this,
-							   encoding_rule_t **rules, size_t *rule_count)
 {
 	*rules = cert_payload_encodings;
-	*rule_count = sizeof(cert_payload_encodings) / sizeof(encoding_rule_t);
+	*rule_count = countof(cert_payload_encodings);
 }
 
-/**
+METHOD(payload_t, get_type, payload_type_t,
- * Implementation of payload_t.get_type.
+	private_cert_payload_t *this)
- */
-static payload_type_t get_payload_type(private_cert_payload_t *this)
 {
 	return CERTIFICATE;
 }
 
-/**
+METHOD(payload_t, get_next_type, payload_type_t,
- * Implementation of payload_t.get_next_type.
+	private_cert_payload_t *this)
- */
-static payload_type_t get_next_type(private_cert_payload_t *this)
 {
 	return this->next_payload;
 }
 
-/**
+METHOD(payload_t, set_next_type, void,
- * Implementation of payload_t.set_next_type.
+	private_cert_payload_t *this, payload_type_t type)
- */
-static void set_next_type(private_cert_payload_t *this,payload_type_t type)
 {
 	this->next_payload = type;
 }
 
-/**
+METHOD(payload_t, get_length, size_t,
- * Implementation of payload_t.get_length.
+	private_cert_payload_t *this)
- */
-static size_t get_length(private_cert_payload_t *this)
 {
 	return this->payload_length;
 }
 
-/**
+METHOD(cert_payload_t, get_cert_encoding, cert_encoding_t,
- * Implementation of cert_payload_t.get_cert_encoding.
+	private_cert_payload_t *this)
- */
-static cert_encoding_t get_cert_encoding(private_cert_payload_t *this)
 {
 	return this->encoding;
 }
 
-/**
+METHOD(cert_payload_t, get_cert, certificate_t*,
- * Implementation of cert_payload_t.get_cert.
+	private_cert_payload_t *this)
- */
-static certificate_t *get_cert(private_cert_payload_t *this)
 {
 	if (this->encoding != ENC_X509_SIGNATURE)
 	{
@@ -231,12 +210,11 @@ static certificate_t *get_cert(private_cert_payload_t *this)
 							  BUILD_END);
 }
 
-/**
+METHOD(cert_payload_t, get_hash, chunk_t,
- * Implementation of cert_payload_t.get_hash.
+	private_cert_payload_t *this)
- */
-static chunk_t get_hash(private_cert_payload_t *this)
 {
 	chunk_t hash = chunk_empty;
+
 	if ((this->encoding != ENC_X509_HASH_AND_URL &&
 		 this->encoding != ENC_X509_HASH_AND_URL_BUNDLE) ||
 		this->invalid_hash_and_url)
@@ -248,10 +226,8 @@ static chunk_t get_hash(private_cert_payload_t *this)
 	return hash;
 }
 
-/**
+METHOD(cert_payload_t, get_url, char*,
- * Implementation of cert_payload_t.get_url.
+	private_cert_payload_t *this)
- */
-static char *get_url(private_cert_payload_t *this)
 {
 	if ((this->encoding != ENC_X509_HASH_AND_URL &&
 		 this->encoding != ENC_X509_HASH_AND_URL_BUNDLE) ||
@@ -262,12 +238,10 @@ static char *get_url(private_cert_payload_t *this)
 	return (char*)this->data.ptr + 20;
 }
 
-/**
+METHOD2(payload_t, cert_payload_t, destroy, void,
- * Implementation of payload_t.destroy and cert_payload_t.destroy.
+	private_cert_payload_t *this)
- */
-static void destroy(private_cert_payload_t *this)
 {
-	chunk_free(&this->data);
+	free(this->data.ptr);
 	free(this);
 }
 
@@ -276,29 +250,28 @@ static void destroy(private_cert_payload_t *this)
  */
 cert_payload_t *cert_payload_create()
 {
-	private_cert_payload_t *this = malloc_thing(private_cert_payload_t);
+	private_cert_payload_t *this;
-
-	this->public.payload_interface.verify = (status_t (*) (payload_t*))verify;
-	this->public.payload_interface.get_encoding_rules = (void (*) (payload_t*,encoding_rule_t**, size_t*))get_encoding_rules;
-	this->public.payload_interface.get_length = (size_t (*) (payload_t*))get_length;
-	this->public.payload_interface.get_next_type = (payload_type_t (*) (payload_t*))get_next_type;
-	this->public.payload_interface.set_next_type = (void (*) (payload_t*,payload_type_t))set_next_type;
-	this->public.payload_interface.get_type = (payload_type_t (*) (payload_t*))get_payload_type;
-	this->public.payload_interface.destroy = (void (*) (payload_t*))destroy;
-
-	this->public.destroy = (void (*) (cert_payload_t*))destroy;
-	this->public.get_cert = (certificate_t* (*) (cert_payload_t*))get_cert;
-	this->public.get_cert_encoding = (cert_encoding_t (*) (cert_payload_t*))get_cert_encoding;
-	this->public.get_hash = (chunk_t (*) (cert_payload_t*))get_hash;
-	this->public.get_url = (char* (*) (cert_payload_t*))get_url;
-
-	this->critical = FALSE;
-	this->next_payload = NO_PAYLOAD;
-	this->payload_length = CERT_PAYLOAD_HEADER_LENGTH;
-	this->data = chunk_empty;
-	this->encoding = 0;
-	this->invalid_hash_and_url = FALSE;
 
+	INIT(this,
+		.public = {
+			.payload_interface = {
+				.verify = _verify,
+				.get_encoding_rules = _get_encoding_rules,
+				.get_length = _get_length,
+				.get_next_type = _get_next_type,
+				.set_next_type = _set_next_type,
+				.get_type = _get_type,
+				.destroy = _destroy,
+			},
+			.get_cert = _get_cert,
+			.get_cert_encoding = _get_cert_encoding,
+			.get_hash = _get_hash,
+			.get_url = _get_url,
+			.destroy = _destroy,
+		},
+		.next_payload = NO_PAYLOAD,
+		.payload_length = CERT_PAYLOAD_HEADER_LENGTH,
+	);
 	return &this->public;
 }