diff --git a/src/libsimaka/simaka_crypto.c b/src/libsimaka/simaka_crypto.c
index 4dd971c29..4819d1b99 100644
--- a/src/libsimaka/simaka_crypto.c
+++ b/src/libsimaka/simaka_crypto.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Martin Willi
+ * Copyright (C) 2009-2011 Martin Willi
  * Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -76,26 +76,20 @@ struct private_simaka_crypto_t {
 	bool derived;
 };
 
-/**
- * Implementation of simaka_crypto_t.get_signer
- */
-static signer_t* get_signer(private_simaka_crypto_t *this)
+METHOD(simaka_crypto_t, get_signer, signer_t*,
+	private_simaka_crypto_t *this)
 {
 	return this->derived ? this->signer : NULL;
 }
 
-/**
- * Implementation of simaka_crypto_t.get_crypter
- */
-static crypter_t* get_crypter(private_simaka_crypto_t *this)
+METHOD(simaka_crypto_t, get_crypter, crypter_t*,
+	private_simaka_crypto_t *this)
 {
 	return this->derived ? this->crypter : NULL;
 }
 
-/**
- * Implementation of simaka_crypto_t.get_rng
- */
-static rng_t* get_rng(private_simaka_crypto_t *this)
+METHOD(simaka_crypto_t, get_rng, rng_t*,
+	private_simaka_crypto_t *this)
 {
 	return this->rng;
 }
@@ -121,11 +115,9 @@ static void call_hook(private_simaka_crypto_t *this, chunk_t encr, chunk_t auth)
 	mgr->key_hook(mgr, encr, auth);
 }
 
-/**
- * Implementation of simaka_crypto_t.derive_keys_full
- */
-static chunk_t derive_keys_full(private_simaka_crypto_t *this,
-								identification_t *id, chunk_t data, chunk_t *mk)
+METHOD(simaka_crypto_t, derive_keys_full, chunk_t,
+	private_simaka_crypto_t *this, identification_t *id,
+	chunk_t data, chunk_t *mk)
 {
 	chunk_t str, msk, k_encr, k_auth;
 	int i;
@@ -158,10 +150,8 @@ static chunk_t derive_keys_full(private_simaka_crypto_t *this,
 	return chunk_clone(msk);
 }
 
-/**
- * Implementation of simaka_crypto_t.derive_keys_reauth
- */
-static void derive_keys_reauth(private_simaka_crypto_t *this, chunk_t mk)
+METHOD(simaka_crypto_t, derive_keys_reauth, void,
+	private_simaka_crypto_t *this, chunk_t mk)
 {
 	chunk_t str, k_encr, k_auth;
 	int i;
@@ -185,12 +175,9 @@ static void derive_keys_reauth(private_simaka_crypto_t *this, chunk_t mk)
 	this->derived = TRUE;
 }
 
-/**
- * Implementation of simaka_crypto_t.derive_keys_reauth_msk
- */
-static chunk_t derive_keys_reauth_msk(private_simaka_crypto_t *this,
-									  identification_t *id, chunk_t counter,
-									  chunk_t nonce_s, chunk_t mk)
+METHOD(simaka_crypto_t, derive_keys_reauth_msk, chunk_t,
+	private_simaka_crypto_t *this, identification_t *id, chunk_t counter,
+	chunk_t nonce_s, chunk_t mk)
 {
 	char xkey[HASH_SIZE_SHA1];
 	chunk_t str, msk;
@@ -214,18 +201,14 @@ static chunk_t derive_keys_reauth_msk(private_simaka_crypto_t *this,
 	return chunk_clone(msk);
 }
 
-/**
- * Implementation of simaka_crypto_t.clear_keys
- */
-static void clear_keys(private_simaka_crypto_t *this)
+METHOD(simaka_crypto_t, clear_keys, void,
+	private_simaka_crypto_t *this)
 {
 	this->derived = FALSE;
 }
 
-/**
- * Implementation of simaka_crypto_t.destroy.
- */
-static void destroy(private_simaka_crypto_t *this)
+METHOD(simaka_crypto_t, destroy, void,
+	private_simaka_crypto_t *this)
 {
 	DESTROY_IF(this->rng);
 	DESTROY_IF(this->hasher);
@@ -240,24 +223,26 @@ static void destroy(private_simaka_crypto_t *this)
  */
 simaka_crypto_t *simaka_crypto_create(eap_type_t type)
 {
-	private_simaka_crypto_t *this = malloc_thing(private_simaka_crypto_t);
+	private_simaka_crypto_t *this;
 
-	this->public.get_signer = (signer_t*(*)(simaka_crypto_t*))get_signer;
-	this->public.get_crypter = (crypter_t*(*)(simaka_crypto_t*))get_crypter;
-	this->public.get_rng = (rng_t*(*)(simaka_crypto_t*))get_rng;
-	this->public.derive_keys_full = (chunk_t(*)(simaka_crypto_t*, identification_t *id, chunk_t data, chunk_t *mk))derive_keys_full;
-	this->public.derive_keys_reauth = (void(*)(simaka_crypto_t*, chunk_t mk))derive_keys_reauth;
-	this->public.derive_keys_reauth_msk = (chunk_t(*)(simaka_crypto_t*, identification_t *id, chunk_t counter, chunk_t nonce_s, chunk_t mk))derive_keys_reauth_msk;
-	this->public.clear_keys = (void(*)(simaka_crypto_t*))clear_keys;
-	this->public.destroy = (void(*)(simaka_crypto_t*))destroy;
-
-	this->type = type;
-	this->derived = FALSE;
-	this->rng = lib->crypto->create_rng(lib->crypto, RNG_WEAK);
-	this->hasher = lib->crypto->create_hasher(lib->crypto, HASH_SHA1);
-	this->prf = lib->crypto->create_prf(lib->crypto, PRF_FIPS_SHA1_160);
-	this->signer = lib->crypto->create_signer(lib->crypto, AUTH_HMAC_SHA1_128);
-	this->crypter = lib->crypto->create_crypter(lib->crypto, ENCR_AES_CBC, 16);
+	INIT(this,
+		.public = {
+			.get_signer = _get_signer,
+			.get_crypter = _get_crypter,
+			.get_rng = _get_rng,
+			.derive_keys_full = _derive_keys_full,
+			.derive_keys_reauth = _derive_keys_reauth,
+			.derive_keys_reauth_msk = _derive_keys_reauth_msk,
+			.clear_keys = _clear_keys,
+			.destroy = _destroy,
+		},
+		.type = type,
+		.rng = lib->crypto->create_rng(lib->crypto, RNG_WEAK),
+		.hasher = lib->crypto->create_hasher(lib->crypto, HASH_SHA1),
+		.prf = lib->crypto->create_prf(lib->crypto, PRF_FIPS_SHA1_160),
+		.signer = lib->crypto->create_signer(lib->crypto, AUTH_HMAC_SHA1_128),
+		.crypter = lib->crypto->create_crypter(lib->crypto, ENCR_AES_CBC, 16),
+	);
 	if (!this->rng || !this->hasher || !this->prf ||
 		!this->signer || !this->crypter)
 	{
@@ -268,4 +253,3 @@ simaka_crypto_t *simaka_crypto_create(eap_type_t type)
 	}
 	return &this->public;
 }
-