1 files changed, 17 insertions, 74 deletions

diff --git a/src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c b/src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c
index e30ab858b..67c2e47d4 100644
--- a/src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c
+++ b/src/libstrongswan/plugins/openssl/openssl_rsa_public_key.c
@@ -298,93 +298,36 @@ static private_openssl_rsa_public_key_t *create_empty()
 }
 
 /**
- * Load a public key from an ASN1 encoded blob
+ * See header.
  */
-static openssl_rsa_public_key_t *load(chunk_t blob)
+openssl_rsa_public_key_t *openssl_rsa_public_key_load(key_type_t type,
+													  va_list args)
 {
-	u_char *p = blob.ptr;
-	private_openssl_rsa_public_key_t *this = create_empty();
+	private_openssl_rsa_public_key_t *this;
+	chunk_t blob;
 
-	this->rsa = d2i_RSAPublicKey(NULL, (const u_char**)&p, blob.len);
-	if (!this->rsa)
-	{
-		destroy(this);
-		return NULL;
-	}
-
-	return &this->public;
-}
-
-typedef struct private_builder_t private_builder_t;
-
-/**
- * Builder implementation for key loading
- */
-struct private_builder_t {
-	/** implements the builder interface */
-	builder_t public;
-	/** loaded public key */
-	openssl_rsa_public_key_t *key;
-};
-
-/**
- * Implementation of builder_t.build
- */
-static openssl_rsa_public_key_t *build(private_builder_t *this)
-{
-	openssl_rsa_public_key_t *key = this->key;
-
-	free(this);
-	return key;
-}
-
-/**
- * Implementation of builder_t.add
- */
-static void add(private_builder_t *this, builder_part_t part, ...)
-{
-	if (!this->key)
+	while (TRUE)
 	{
-		va_list args;
-
-		switch (part)
+		switch (va_arg(args, builder_part_t))
 		{
 			case BUILD_BLOB_ASN1_DER:
-			{
-				va_start(args, part);
-				this->key = load(va_arg(args, chunk_t));
-				va_end(args);
-				return;
-			}
-			default:
+				blob = va_arg(args, chunk_t);
+				continue;
+			case BUILD_END:
 				break;
+			default:
+				return NULL;
 		}
+		break;
 	}
-	if (this->key)
-	{
-		destroy((private_openssl_rsa_public_key_t*)this->key);
-	}
-	builder_cancel(&this->public);
-}
 
-/**
- * Builder construction function
- */
-builder_t *openssl_rsa_public_key_builder(key_type_t type)
-{
-	private_builder_t *this;
-
-	if (type != KEY_RSA)
+	this = create_empty();
+	this->rsa = d2i_RSAPublicKey(NULL, (const u_char**)&blob.ptr, blob.len);
+	if (!this->rsa)
 	{
+		destroy(this);
 		return NULL;
 	}
-
-	this = malloc_thing(private_builder_t);
-
-	this->key = NULL;
-	this->public.add = (void(*)(builder_t *this, builder_part_t part, ...))add;
-	this->public.build = (void*(*)(builder_t *this))build;
-
 	return &this->public;
 }