Updated gmp plugin to the new builder API
authorMartin Willi <martin@strongswan.org>
Wed, 9 Sep 2009 14:20:53 +0000 (16:20 +0200)
committerMartin Willi <martin@strongswan.org>
Thu, 10 Sep 2009 14:20:19 +0000 (16:20 +0200)
src/libstrongswan/plugins/gmp/gmp_plugin.c
src/libstrongswan/plugins/gmp/gmp_rsa_private_key.c
src/libstrongswan/plugins/gmp/gmp_rsa_private_key.h
src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c
src/libstrongswan/plugins/gmp/gmp_rsa_public_key.h

index 84c55df..b70ff88 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Martin Willi
+ * Copyright (C) 2008-2009 Martin Willi
  * Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -41,9 +41,11 @@ static void destroy(private_gmp_plugin_t *this)
        lib->crypto->remove_dh(lib->crypto,
                                                (dh_constructor_t)gmp_diffie_hellman_create);
        lib->creds->remove_builder(lib->creds,
-                                               (builder_constructor_t)gmp_rsa_private_key_builder);
+                                               (builder_function_t)gmp_rsa_private_key_gen);
        lib->creds->remove_builder(lib->creds,
-                                               (builder_constructor_t)gmp_rsa_public_key_builder);
+                                               (builder_function_t)gmp_rsa_private_key_load);
+       lib->creds->remove_builder(lib->creds,
+                                               (builder_function_t)gmp_rsa_public_key_load);
        free(this);
 }
 
@@ -74,9 +76,11 @@ plugin_t *plugin_create()
                                                (dh_constructor_t)gmp_diffie_hellman_create);
 
        lib->creds->add_builder(lib->creds, CRED_PRIVATE_KEY, KEY_RSA,
-                                               (builder_constructor_t)gmp_rsa_private_key_builder);
+                                               (builder_function_t)gmp_rsa_private_key_gen);
+       lib->creds->add_builder(lib->creds, CRED_PRIVATE_KEY, KEY_RSA,
+                                               (builder_function_t)gmp_rsa_private_key_load);
        lib->creds->add_builder(lib->creds, CRED_PUBLIC_KEY, KEY_RSA,
-                                               (builder_constructor_t)gmp_rsa_public_key_builder);
+                                               (builder_function_t)gmp_rsa_public_key_load);
 
        return &this->public.plugin;
 }
index 4241e82..43579e2 100644 (file)
@@ -605,14 +605,34 @@ static private_gmp_rsa_private_key_t *gmp_rsa_private_key_create_empty(void)
 }
 
 /**
- * Generate an RSA key of specified key size
+ * See header.
  */
-static gmp_rsa_private_key_t *generate(size_t key_size)
+gmp_rsa_private_key_t *gmp_rsa_private_key_gen(key_type_t type, va_list args)
 {
-       mpz_t p, q, n, e, d, exp1, exp2, coeff;
-       mpz_t m, q1, t;
-       private_gmp_rsa_private_key_t *this = gmp_rsa_private_key_create_empty();
+       mpz_t p, q, n, e, d, exp1, exp2, coeff, m, q1, t;
+       private_gmp_rsa_private_key_t *this;
+       u_int key_size = 0;
 
+       while (TRUE)
+       {
+               switch (va_arg(args, builder_part_t))
+               {
+                       case BUILD_KEY_SIZE:
+                               key_size = va_arg(args, u_int);
+                               continue;
+                       case BUILD_END:
+                               break;
+                       default:
+                               return NULL;
+               }
+               break;
+       }
+       if (!key_size)
+       {
+               return NULL;
+       }
+
+       this = gmp_rsa_private_key_create_empty();
        key_size = key_size / BITS_PER_BYTE;
 
        /* Get values of primes p and q  */
@@ -689,12 +709,51 @@ static gmp_rsa_private_key_t *generate(size_t key_size)
 }
 
 /**
- * load private key from a RSA components
+ * See header.
  */
-static gmp_rsa_private_key_t *load(chunk_t n, chunk_t e, chunk_t d,
-                               chunk_t p, chunk_t q, chunk_t exp1, chunk_t exp2, chunk_t coeff)
+gmp_rsa_private_key_t *gmp_rsa_private_key_load(key_type_t type, va_list args)
 {
-       private_gmp_rsa_private_key_t *this = gmp_rsa_private_key_create_empty();
+       chunk_t n, e, d, p, q, exp1, exp2, coeff;
+       private_gmp_rsa_private_key_t *this;
+
+       n = e = d = p = q = exp1 = exp2 = coeff = chunk_empty;
+       while (TRUE)
+       {
+               switch (va_arg(args, builder_part_t))
+               {
+                       case BUILD_RSA_MODULUS:
+                               n = va_arg(args, chunk_t);
+                               continue;
+                       case BUILD_RSA_PUB_EXP:
+                               e = va_arg(args, chunk_t);
+                               continue;
+                       case BUILD_RSA_PRIV_EXP:
+                               d = va_arg(args, chunk_t);
+                               continue;
+                       case BUILD_RSA_PRIME1:
+                               p = va_arg(args, chunk_t);
+                               continue;
+                       case BUILD_RSA_PRIME2:
+                               q = va_arg(args, chunk_t);
+                               continue;
+                       case BUILD_RSA_EXP1:
+                               exp1 = va_arg(args, chunk_t);
+                               continue;
+                       case BUILD_RSA_EXP2:
+                               exp2 = va_arg(args, chunk_t);
+                               continue;
+                       case BUILD_RSA_COEFF:
+                               coeff = va_arg(args, chunk_t);
+                               continue;
+                       case BUILD_END:
+                               break;
+                       default:
+                               return NULL;
+               }
+               break;
+       }
+
+       this = gmp_rsa_private_key_create_empty();
 
        mpz_init(this->n);
        mpz_init(this->e);
@@ -738,103 +797,3 @@ static gmp_rsa_private_key_t *load(chunk_t n, chunk_t e, chunk_t d,
        return &this->public;
 }
 
-typedef struct private_builder_t private_builder_t;
-/**
- * Builder implementation for key loading/generation
- */
-struct private_builder_t {
-       /** implements the builder interface */
-       builder_t public;
-       /** key size, if generating */
-       u_int key_size;
-       /** rsa key parameters */
-       chunk_t n, e, d, p, q, exp1, exp2, coeff;
-};
-
-/**
- * Implementation of builder_t.build
- */
-static gmp_rsa_private_key_t *build(private_builder_t *this)
-{
-       gmp_rsa_private_key_t *key = NULL;
-
-       if (this->key_size)
-       {
-               key = generate(this->key_size);
-       }
-       else
-       {
-               key = load(this->n, this->e, this->d, this->p, this->q,
-                                  this->exp1, this->exp2, this->coeff);
-       }
-       free(this);
-       return key;
-}
-
-/**
- * Implementation of builder_t.add
- */
-static void add(private_builder_t *this, builder_part_t part, ...)
-{
-       va_list args;
-
-       va_start(args, part);
-       switch (part)
-       {
-               case BUILD_KEY_SIZE:
-                       this->key_size = va_arg(args, u_int);
-                       return;
-               case BUILD_RSA_MODULUS:
-                       this->n = va_arg(args, chunk_t);
-                       break;
-               case BUILD_RSA_PUB_EXP:
-                       this->e = va_arg(args, chunk_t);
-                       break;
-               case BUILD_RSA_PRIV_EXP:
-                       this->d = va_arg(args, chunk_t);
-                       break;
-               case BUILD_RSA_PRIME1:
-                       this->p = va_arg(args, chunk_t);
-                       break;
-               case BUILD_RSA_PRIME2:
-                       this->q = va_arg(args, chunk_t);
-                       break;
-               case BUILD_RSA_EXP1:
-                       this->exp1 = va_arg(args, chunk_t);
-                       break;
-               case BUILD_RSA_EXP2:
-                       this->exp2 = va_arg(args, chunk_t);
-                       break;
-               case BUILD_RSA_COEFF:
-                       this->coeff = va_arg(args, chunk_t);
-                       break;
-               default:
-                       builder_cancel(&this->public);
-                       break;
-       }
-       va_end(args);
-}
-
-/**
- * Builder construction function
- */
-builder_t *gmp_rsa_private_key_builder(key_type_t type)
-{
-       private_builder_t *this;
-
-       if (type != KEY_RSA)
-       {
-               return NULL;
-       }
-
-       this = malloc_thing(private_builder_t);
-
-       this->n = this->e = this->d = this->p = this->q = chunk_empty;
-       this->exp1 = this->exp2 = this->coeff = chunk_empty;
-       this->key_size = 0;
-       this->public.add = (void(*)(builder_t *this, builder_part_t part, ...))add;
-       this->public.build = (void*(*)(builder_t *this))build;
-
-       return &this->public;
-}
-
index d47e258..db1fcf5 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Martin Willi
+ * Copyright (C) 2005-2009 Martin Willi
  * Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -21,6 +21,7 @@
 #ifndef GMP_RSA_PRIVATE_KEY_H_
 #define GMP_RSA_PRIVATE_KEY_H_
 
+#include <credentials/builder.h>
 #include <credentials/keys/private_key.h>
 
 typedef struct gmp_rsa_private_key_t gmp_rsa_private_key_t;
@@ -37,12 +38,25 @@ struct gmp_rsa_private_key_t {
 };
 
 /**
- * Create the builder for a private key.
+ * Generated a RSA private keys using libgmp.
+ *
+ * Accepts the BUILD_KEY_SIZE argument.
  *
  * @param type         type of the key, must be KEY_RSA
- * @return                     builder instance
+ * @param args         builder_part_t argument list
+ * @return                     generated key, NULL on failure
  */
-builder_t *gmp_rsa_private_key_builder(key_type_t type);
+gmp_rsa_private_key_t *gmp_rsa_private_key_gen(key_type_t type, va_list args);
 
-#endif /** GMP_RSA_PRIVATE_KEY_H_ @}*/
+/**
+ * Loaded a RSA private keys using libgmp.
+ *
+ * Accepts BUILD_RSA_* components.
+ *
+ * @param type         type of the key, must be KEY_RSA
+ * @param args         builder_part_t argument list
+ * @return                     loaded key, NULL on failure
+ */
+gmp_rsa_private_key_t *gmp_rsa_private_key_load(key_type_t type, va_list args);
 
+#endif /** GMP_RSA_PRIVATE_KEY_H_ @}*/
index 2d82a3d..a3b4a04 100644 (file)
@@ -452,11 +452,37 @@ static void destroy(private_gmp_rsa_public_key_t *this)
 }
 
 /**
- * Generic private constructor
+ * See header.
  */
-static private_gmp_rsa_public_key_t *gmp_rsa_public_key_create_empty()
+gmp_rsa_public_key_t *gmp_rsa_public_key_load(key_type_t type, va_list args)
 {
-       private_gmp_rsa_public_key_t *this = malloc_thing(private_gmp_rsa_public_key_t);
+       private_gmp_rsa_public_key_t *this;
+       chunk_t n, e;
+
+       n = e = chunk_empty;
+       while (TRUE)
+       {
+               switch (va_arg(args, builder_part_t))
+               {
+                       case BUILD_RSA_MODULUS:
+                               n = va_arg(args, chunk_t);
+                               continue;
+                       case BUILD_RSA_PUB_EXP:
+                               e = va_arg(args, chunk_t);
+                               continue;
+                       case BUILD_END:
+                               break;
+                       default:
+                               return NULL;
+               }
+               break;
+       }
+       if (!e.ptr || !n.ptr)
+       {
+               return NULL;
+       }
+
+       this = malloc_thing(private_gmp_rsa_public_key_t);
 
        this->public.interface.get_type = (key_type_t (*) (public_key_t*))get_type;
        this->public.interface.verify = (bool (*) (public_key_t*, signature_scheme_t, chunk_t, chunk_t))verify;
@@ -470,16 +496,6 @@ static private_gmp_rsa_public_key_t *gmp_rsa_public_key_create_empty()
 
        this->ref = 1;
 
-       return this;
-}
-
-/**
- * Load a public key from n and e
- */
-static gmp_rsa_public_key_t *load(chunk_t n, chunk_t e)
-{
-       private_gmp_rsa_public_key_t *this = gmp_rsa_public_key_create_empty();
-
        mpz_init(this->n);
        mpz_init(this->e);
 
@@ -491,71 +507,3 @@ static gmp_rsa_public_key_t *load(chunk_t n, chunk_t e)
        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;
-       /** rsa key parameters */
-       chunk_t n, e;
-};
-
-/**
- * Implementation of builder_t.build
- */
-static gmp_rsa_public_key_t *build(private_builder_t *this)
-{
-       gmp_rsa_public_key_t *key;
-
-       key = load(this->n, this->e);
-       free(this);
-       return key;
-}
-
-/**
- * Implementation of builder_t.add
- */
-static void add(private_builder_t *this, builder_part_t part, ...)
-{
-       va_list args;
-
-       va_start(args, part);
-       switch (part)
-       {
-               case BUILD_RSA_MODULUS:
-                       this->n = va_arg(args, chunk_t);
-                       break;
-               case BUILD_RSA_PUB_EXP:
-                       this->e = va_arg(args, chunk_t);
-                       break;
-               default:
-                       builder_cancel(&this->public);
-                       break;
-       }
-       va_end(args);
-}
-
-/**
- * Builder construction function
- */
-builder_t *gmp_rsa_public_key_builder(key_type_t type)
-{
-       private_builder_t *this;
-
-       if (type != KEY_RSA)
-       {
-               return NULL;
-       }
-
-       this = malloc_thing(private_builder_t);
-
-       this->n = this->e = chunk_empty;
-       this->public.add = (void(*)(builder_t *this, builder_part_t part, ...))add;
-       this->public.build = (void*(*)(builder_t *this))build;
-
-       return &this->public;
-}
-
index ed7b942..807f0bb 100644 (file)
 #ifndef GMP_RSA_PUBLIC_KEY_H_
 #define GMP_RSA_PUBLIC_KEY_H_
 
-typedef struct gmp_rsa_public_key_t gmp_rsa_public_key_t;
-
+#include <credentials/builder.h>
 #include <credentials/keys/public_key.h>
 
+typedef struct gmp_rsa_public_key_t gmp_rsa_public_key_t;
+
 /**
  * public_key_t implementation of RSA algorithm using libgmp.
  */
@@ -38,11 +39,14 @@ struct gmp_rsa_public_key_t {
 };
 
 /**
- * Create the builder for a public key.
+ * Load a RSA public key using libgmp.
+ *
+ * Accepts BUILD_RSA_* components.
  *
  * @param type         type of the key, must be KEY_RSA
- * @return                     builder instance
+ * @param args         builder_part_t argument list
+ * @return                     loaded key, NULL on failure
  */
-builder_t *gmp_rsa_public_key_builder(key_type_t type);
+gmp_rsa_public_key_t *gmp_rsa_public_key_load(key_type_t type, va_list args);
 
 #endif /** GMP_RSA_PUBLIC_KEY_H_ @}*/