- removed prime pool

This commit is contained in:
Martin Willi
2005-12-07 15:53:34 +00:00
parent 0d43ad12dd
commit c3903a1861
11 changed files with 50 additions and 630 deletions
+1 -2
View File
@@ -67,8 +67,7 @@ struct authenticator_t {
* @todo Document RSA error status types
*
* @return
* - SUCCESS if verification could be processed
* (does not mean the data could be verified)
* - SUCCESS if verification successful
* - FAILED if verification failed
* - NOT_SUPPORTED if AUTH method not supported
* - NOT_FOUND if the data for specific AUTH method could not be found
@@ -120,11 +120,6 @@ TEST_OBJS+= $(BUILD_DIR)rsa_test.o
$(BUILD_DIR)rsa_test.o : $(TESTCASES_DIR)rsa_test.c $(TESTCASES_DIR)rsa_test.h
$(CC) $(CFLAGS) -c -o $@ $<
TEST_OBJS+= $(BUILD_DIR)prime_pool_test.o
$(BUILD_DIR)prime_pool_test.o : $(TESTCASES_DIR)prime_pool_test.c $(TESTCASES_DIR)prime_pool_test.h
$(CC) $(CFLAGS) -c -o $@ $<
TEST_OBJS+= $(BUILD_DIR)kernel_interface_test.o
$(BUILD_DIR)kernel_interface_test.o : $(TESTCASES_DIR)kernel_interface_test.c $(TESTCASES_DIR)kernel_interface_test.h
$(CC) $(CFLAGS) -c -o $@ $<
@@ -65,11 +65,11 @@ void test_kernel_interface(protected_tester_t *tester)
//status = kernel_interface->get_spi(kernel_interface, me, other, 51, TRUE, &spi);
status = kernel_interface->get_spi(kernel_interface, me, other, 50, TRUE, &spi);
//status |= kernel_interface->get_spi(kernel_interface, me, other, 50, TRUE, &spi);
//tester->assert_true(tester, status == SUCCESS, "spi get");
tester->assert_true(tester, status == SUCCESS, "spi get");
status = kernel_interface->add_sa(kernel_interface, me, other, spi, 50, TRUE, ENCR_AES_CBC, 16, enc_key,AUTH_HMAC_MD5_96,16,inc_key,FALSE);
status = kernel_interface->add_sa(kernel_interface, me, other, spi, 50, TRUE, ENCR_AES_CBC, 16, enc_key,AUTH_HMAC_MD5_96,16,inc_key,TRUE);
tester->assert_true(tester, status == SUCCESS, "build sa");
-67
View File
@@ -1,67 +0,0 @@
/**
* @file prime_pool_test.h
*
* @brief Tests for the hasher_t classes.
*
*/
/*
* Copyright (C) 2005 Jan Hutter, Martin Willi
* Hochschule fuer Technik Rapperswil
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#include <string.h>
#include <unistd.h>
#include "prime_pool_test.h"
#include <daemon.h>
#include <utils/allocator.h>
#include <utils/logger.h>
#include <threads/prime_pool.h>
/*
* described in Header-File
*/
void test_prime_pool(protected_tester_t *tester)
{
mpz_t p1, p2, p3, p4;
prime_pool_t *prime_pool;
prime_pool = prime_pool_create(20);
prime_pool->get_prime(prime_pool, 4, &p1);
sleep(1);
tester->assert_true(tester, prime_pool->get_count(prime_pool, 4) == 20, "number of 4 bytes primes");
tester->assert_true(tester, prime_pool->get_count(prime_pool, 8) == 0, "number of 8 bytes primes");
tester->assert_true(tester, prime_pool->get_count(prime_pool, 16) == 0, "number of 16 bytes primes");
prime_pool->get_prime(prime_pool, 8, &p2);
sleep(1);
tester->assert_true(tester, prime_pool->get_count(prime_pool, 4) == 20, "number of 4 bytes primes");
tester->assert_true(tester, prime_pool->get_count(prime_pool, 8) == 20, "number of 8 bytes primes");
tester->assert_true(tester, prime_pool->get_count(prime_pool, 16) == 0, "number of 16 bytes primes");
prime_pool->get_prime(prime_pool, 16, &p3);
sleep(1);
tester->assert_true(tester, prime_pool->get_count(prime_pool, 4) == 20, "number of 4 bytes primes");
tester->assert_true(tester, prime_pool->get_count(prime_pool, 8) == 20, "number of 8 bytes primes");
tester->assert_true(tester, prime_pool->get_count(prime_pool, 16) == 20, "number of 16 bytes primes");
prime_pool->get_prime(prime_pool, 16, &p4);
mpz_clear(p1);
mpz_clear(p2);
mpz_clear(p3);
mpz_clear(p4);
prime_pool->destroy(prime_pool);
}
-39
View File
@@ -1,39 +0,0 @@
/**
* @file prime_pool_test.h
*
* @brief Tests for the prime_pool_t class.
*
*/
/*
* Copyright (C) 2005 Jan Hutter, Martin Willi
* Hochschule fuer Technik Rapperswil
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#ifndef PRIME_POOL_TEST_H
#define PRIME_POOL_TEST_H
#include <threads/prime_pool.h>
#include <utils/tester.h>
/**
* @brief Test function used to test the prime_pool functionality.
*
* @param tester associated tester object
*
* @ingroup testcases
*/
void test_prime_pool(protected_tester_t *tester);
#endif /*PRIME_POOL_TEST_H*/
+1 -1
View File
@@ -58,7 +58,7 @@ void test_rsa(protected_tester_t *tester)
private_key = rsa_private_key_create();
private_key->generate_key(private_key, 1024);
private_key->generate_key(private_key, 512);
status = private_key->build_emsa_pkcs1_signature(private_key, HASH_MD5, data, &signature);
tester->assert_true(tester, status == SUCCESS, "build emsa_pkcs1_signature");
+1 -6
View File
@@ -59,7 +59,6 @@
#include <testcases/init_config_test.h>
#include <testcases/sa_config_test.h>
#include <testcases/rsa_test.h>
#include <testcases/prime_pool_test.h>
#include <testcases/kernel_interface_test.h>
/* output for test messages */
@@ -124,7 +123,6 @@ test_t encryption_payload_test = {test_encryption_payload, "encryption payload t
test_t init_config_test = {test_init_config, "init_config_t test"};
test_t sa_config_test = {test_sa_config, "sa_config_t test"};
test_t rsa_test = {test_rsa, "RSA private/public key test"};
test_t prime_pool_test = {test_prime_pool, "Prime pool"};
test_t kernel_interface_test = {test_kernel_interface, "Kernel Interface"};
@@ -136,7 +134,6 @@ static void daemon_kill(daemon_t *this, char* none)
this->socket->destroy(this->socket);
this->ike_sa_manager->destroy(this->ike_sa_manager);
this->job_queue->destroy(this->job_queue);
this->prime_pool->destroy(this->prime_pool);
this->event_queue->destroy(this->event_queue);
this->send_queue->destroy(this->send_queue);
this->configuration_manager->destroy(this->configuration_manager);
@@ -161,7 +158,6 @@ daemon_t *daemon_create()
charon->job_queue = job_queue_create();
charon->event_queue = event_queue_create();
charon->send_queue = send_queue_create();
charon->prime_pool = prime_pool_create(0);
charon->configuration_manager = configuration_manager_create(RETRANSMIT_TIMEOUT,MAX_RETRANSMIT_COUNT,HALF_OPEN_IKE_SA_TIMEOUT);
charon->sender = NULL;
charon->receiver = NULL;
@@ -236,7 +232,6 @@ int main()
&init_config_test,
&sa_config_test,
&rsa_test,
&prime_pool_test,
NULL
};
@@ -252,7 +247,7 @@ int main()
tester->perform_tests(tester,all_tests);
// tester->perform_test(tester,&packet_test);
// tester->perform_test(tester,&rsa_test);
tester->destroy(tester);
-4
View File
@@ -30,10 +30,6 @@ OBJS+= $(BUILD_DIR)thread_pool.o
$(BUILD_DIR)thread_pool.o : $(THREADS_DIR)thread_pool.c $(THREADS_DIR)thread_pool.h
$(CC) $(CFLAGS) -c -o $@ $<
OBJS+= $(BUILD_DIR)prime_pool.o
$(BUILD_DIR)prime_pool.o : $(THREADS_DIR)prime_pool.c $(THREADS_DIR)prime_pool.h
$(CC) $(CFLAGS) -c -o $@ $<
OBJS+= $(BUILD_DIR)kernel_interface.o
$(BUILD_DIR)kernel_interface.o :$(THREADS_DIR)kernel_interface.c $(THREADS_DIR)kernel_interface.h
$(CC) $(CFLAGS) -c -o $@ $<
-402
View File
@@ -1,402 +0,0 @@
/**
* @file prime_pool.c
*
* @brief Implementation of prime_pool_t.
*
*/
/*
* Copyright (C) 2005 Jan Hutter, Martin Willi
* Hochschule fuer Technik Rapperswil
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#include <pthread.h>
#include "prime_pool.h"
#include <daemon.h>
#include <utils/allocator.h>
#include <utils/linked_list.h>
#include <utils/randomizer.h>
typedef struct prime_list_t prime_list_t;
/**
* A prime_list_t contains prime values of a specific size.
*/
struct prime_list_t {
/**
* Size of the stored primes .
*/
size_t prime_size;
/**
* Is this much used prime_size ?
*/
u_int32_t usage;
/**
* List of primes.
*/
linked_list_t *primes;
};
typedef struct private_prime_pool_t private_prime_pool_t;
/**
* @brief Private data of prime_pool_t.
*/
struct private_prime_pool_t {
/**
* Public part of the prime_pool_t object.
*/
prime_pool_t public;
/**
* A list which contains a set of prime_list_t's.
*/
linked_list_t *prime_lists;
/**
* prime generation is stopped if more than
* that primes of a kind are already generated.
*/
int generation_limit;
/**
* Access to prime_lists is locked through this mutex.
*/
pthread_mutex_t mutex;
/**
* If the queue is empty a thread has to wait
* This condvar is used to wake up such a thread.
*/
pthread_cond_t condvar;
/**
* Prime generation thread.
*/
pthread_t thread;
/**
* Logger instance for the prime_pool.
*/
logger_t *logger;
/**
* Function for the prime thread, generate primes.
*/
void (*generate_primes) (private_prime_pool_t *this);
/**
* Calculate a prime of requested size.
*/
void (*compute_prime) (private_prime_pool_t *this, size_t prime_size, mpz_t *prime);
};
/**
* Implementation of prime_pool_t.get_count.
*/
static int get_count(private_prime_pool_t *this, size_t prime_size)
{
int count = 0;
iterator_t *iterator;
pthread_mutex_lock(&(this->mutex));
iterator = this->prime_lists->create_iterator(this->prime_lists, TRUE);
while (iterator->has_next(iterator))
{
prime_list_t *prime_list;
iterator->current(iterator, (void*)&prime_list);
if (prime_list->prime_size == prime_size)
{
count = prime_list->primes->get_count(prime_list->primes);
break;
}
}
iterator->destroy(iterator);
pthread_mutex_unlock(&(this->mutex));
return count;
}
/**
* Implementation of prime_pool_t.get_prime.
*/
static void get_prime(private_prime_pool_t *this, size_t prime_size, mpz_t *prime)
{
bool prime_found = FALSE;
iterator_t *iterator;
bool create_new_list = TRUE;
pthread_mutex_lock(&(this->mutex));
iterator = this->prime_lists->create_iterator(this->prime_lists, TRUE);
while (iterator->has_next(iterator))
{
prime_list_t *prime_list;
iterator->current(iterator, (void*)&prime_list);
/* decrease usage marker for every kind of prime */
prime_list->usage = max(prime_list->usage - 1, 0);
if (prime_list->prime_size == prime_size)
{
mpz_t *removed_prime;
create_new_list = FALSE;
/* this prime is well selling, increase usage marker by number of different prime sizes */
prime_list->usage += this->prime_lists->get_count(this->prime_lists);
if (prime_list->primes->remove_first(prime_list->primes, (void*)&removed_prime) == SUCCESS)
{
this->logger->log(this->logger, CONTROL|LEVEL2, "Thread removed a prime with size %d", prime_size);
mpz_init_set(*prime, *removed_prime);
mpz_clear(*removed_prime);
allocator_free(removed_prime);
prime_found = TRUE;
}
/* wake up prime thread, he may be sleeping */
pthread_cond_signal(&(this->condvar));
}
}
iterator->destroy(iterator);
if (create_new_list)
{
this->logger->log(this->logger, CONTROL|LEVEL1, "Creating a new list for primes with size %d", prime_size);
/* there is no list for this prime size, create one */
prime_list_t *prime_list;
prime_list = allocator_alloc_thing(prime_list_t);
prime_list->usage = 1;
prime_list->primes = linked_list_create();
prime_list->prime_size = prime_size;
this->prime_lists->insert_last(this->prime_lists, (void*)prime_list);
/* wake up prime thread, he may be sleeping */
pthread_cond_signal(&(this->condvar));
}
pthread_mutex_unlock(&(this->mutex));
if (!prime_found)
{
/* no prime found, create one ourself */
this->logger->log(this->logger, CONTROL|LEVEL2, "Caller didn't find a prime, generates on it's own.");
this->compute_prime(this, prime_size, prime);
}
}
/**
* Implementation of private_prime_pool_t.compute_prime.
*/
void compute_prime(private_prime_pool_t *this, size_t prime_size, mpz_t *prime)
{
randomizer_t *randomizer;
chunk_t random_bytes;
randomizer = randomizer_create();
mpz_init(*prime);
do
{
/* TODO change to true random device ? */
randomizer->allocate_pseudo_random_bytes(randomizer, prime_size, &random_bytes);
/* make sure most significant bit is set */
random_bytes.ptr[0] = random_bytes.ptr[0] | 0x80;
/* convert chunk to mpz value */
mpz_import(*prime, random_bytes.len, 1, 1, 1, 0, random_bytes.ptr);
/* get next prime */
mpz_nextprime (*prime, *prime);
allocator_free(random_bytes.ptr);
}
/* check if it isnt too large */
while (((mpz_sizeinbase(*prime, 2) + 7) / 8) > prime_size);
randomizer->destroy(randomizer);
}
/**
* Implementation of private_prime_pool_t.generate_primes.
*/
void generate_primes(private_prime_pool_t *this)
{
/* allow cancellation */
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
while (TRUE)
{
prime_list_t *selected_prime_list = NULL;
u_int32_t max_usage = 0;
iterator_t *iterator;
mpz_t *prime;
this->logger->log(this->logger, CONTROL|LEVEL2, "Finding most important prime size...");
pthread_mutex_lock(&(this->mutex));
/* get aprime to generate */
iterator = this->prime_lists->create_iterator(this->prime_lists, TRUE);
while (iterator->has_next(iterator))
{
prime_list_t *prime_list;
iterator->current(iterator, (void*)&prime_list);
this->logger->log(this->logger, CONTROL|LEVEL2, "Primes with size %d have usage %d, %d in list",
prime_list->prime_size, prime_list->usage,
prime_list->primes->get_count(prime_list->primes));
/* get the prime_size with the highest usage factor */
if (prime_list->usage > max_usage)
{
if (prime_list->primes->get_count(prime_list->primes) < this->generation_limit)
{
/* there is work to do */
max_usage = prime_list->usage;
selected_prime_list = prime_list;
}
}
}
iterator->destroy(iterator);
if (selected_prime_list == NULL)
{
this->logger->log(this->logger, CONTROL|LEVEL1, "Nothing to do, goint to sleep");
/* nothing to do. wait, while able to cancel */
pthread_cleanup_push((void(*)(void*))pthread_mutex_unlock, (void*)&(this->mutex));
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
pthread_cond_wait(&(this->condvar), &(this->mutex));
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
pthread_cleanup_pop(0);
}
pthread_mutex_unlock(&(this->mutex));
if (selected_prime_list != NULL)
{
this->logger->log(this->logger, CONTROL|LEVEL1, "Going to generate a prime with size %d",
selected_prime_list->prime_size);
/* generate the prime of requested size */
prime = allocator_alloc_thing(mpz_t);
compute_prime(this, selected_prime_list->prime_size, prime);
/* insert prime */
this->logger->log(this->logger, CONTROL|LEVEL2, "Prime generated, inserting in list");
pthread_mutex_lock(&(this->mutex));
selected_prime_list->primes->insert_last(selected_prime_list->primes, (void*)prime);
pthread_mutex_unlock(&(this->mutex));
}
/* abort if requested */
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
pthread_testcancel();
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
}
}
/**
* Implementation of prime_pool_t.destroy.
*/
static void destroy (private_prime_pool_t *this)
{
/* cancel thread, if available */
if (this->generation_limit > 0)
{
pthread_cancel(this->thread);
pthread_join(this->thread, NULL);
}
/* get every prime list */
while ((this->prime_lists->get_count(this->prime_lists) > 0))
{
prime_list_t *prime_list;
this->prime_lists->remove_last(this->prime_lists, (void*)&prime_list);
/* clear every mpz */
while (prime_list->primes->get_count(prime_list->primes) > 0)
{
mpz_t *prime;
prime_list->primes->remove_last(prime_list->primes, (void**)&prime);
mpz_clear(*prime);
allocator_free(prime);
}
prime_list->primes->destroy(prime_list->primes);
allocator_free(prime_list);
}
this->prime_lists->destroy(this->prime_lists);
pthread_mutex_destroy(&(this->mutex));
pthread_cond_destroy(&(this->condvar));
charon->logger_manager->destroy_logger(charon->logger_manager, this->logger);
allocator_free(this);
}
/*
* Documented in header,
*/
prime_pool_t *prime_pool_create(int generation_limit)
{
private_prime_pool_t *this = allocator_alloc_thing(private_prime_pool_t);
/* public functions */
this->public.get_count = (int(*)(prime_pool_t*,size_t)) get_count;
this->public.get_prime = (void(*)(prime_pool_t*,size_t,mpz_t*)) get_prime;
this->public.destroy = (void(*)(prime_pool_t*)) destroy;
/* private members */
this->logger = charon->logger_manager->create_logger(charon->logger_manager, PRIME_POOL, NULL);
this->generate_primes = generate_primes;
this->compute_prime = compute_prime;
this->generation_limit = generation_limit;
this->prime_lists = linked_list_create();
pthread_mutex_init(&(this->mutex), NULL);
pthread_cond_init(&(this->condvar), NULL);
/* thread is only created if he has anything to do */
if (generation_limit > 0)
{
if (pthread_create(&(this->thread), NULL, (void*(*)(void*))this->generate_primes, this) != 0)
{
/* failed. we live with that problem, since getting primes is still possible */
this->logger->log(this->logger, ERROR, "Thread creation failed, working without thread!");
}
/* set priority */
else
{
struct sched_param param;
int policy;
/* get params first */
if (pthread_getschedparam(this->thread, &policy, &param) == 0)
{
param.sched_priority = sched_get_priority_min(policy);
if (pthread_setschedparam(this->thread, policy, &param) != 0)
{
/* failed to set priority */
this->logger->log(this->logger, ERROR, "Could not reduce priority of thread, running in default priority!");
}
}
else
{
/* failed to get priority */
this->logger->log(this->logger, ERROR, "Could not reduce priority of thread, running in default priority!");
}
}
}
return (&this->public);
}
-99
View File
@@ -1,99 +0,0 @@
/**
* @file prime_pool.h
*
* @brief Interface of prime_pool_t.
*
*/
/*
* Copyright (C) 2005 Jan Hutter, Martin Willi
* Hochschule fuer Technik Rapperswil
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#ifndef PRIME_POOL_H_
#define PRIME_POOL_H_
#include <gmp.h>
#include <types.h>
#include <network/packet.h>
typedef struct prime_pool_t prime_pool_t;
/**
* @brief Prime generation thread.
*
* Starts a low-priority thread which will
* preallocate primes in the background.
* This increases responsibility, since prime generation
* is the most time-consuming task.
*
* @b Constructors:
* - prime_pool_create()
*
* @todo Store and load prime values
*
* @ingroup threads
*/
struct prime_pool_t {
/**
* @brief Get the number of available primes for the given prime size.
*
* @param prime_pool calling object
* @param prime_size size of the prime
* @returns number of primes
*/
int (*get_count) (prime_pool_t *prime_pool, size_t prime_size);
/**
* @brief Get a prime of the given size.
*
* If no primes are available, the threads generates one of its own.
* Supplied mpz will be initialized to a prime and must be cleared
* after usage.
*
* @param prime_pool calling object
* @param prime_size size of the prime to return
* @param prime the prime value will be written into pointed mpz_t value.
* @return chunk containing the prime
*/
void (*get_prime) (prime_pool_t *prime_pool, size_t prime_size, mpz_t *prime);
/**
* @brief Destroys a prime_pool object.
*
* Stopps the prime thread and destroys the pool.
*
* @param prime_pool calling object
*/
void (*destroy) (prime_pool_t *prime_pool);
};
/**
* @brief Creates a prime pool with a thread in it.
*
* The specified limit limits the preallocation of primes
* for a specific prime_size. If limit is zero, no thread
* will be created, prime computation is done from
* the get_prime-calling thread.
*
* @param generation_limit generation limit to use
* @return prime_pool_t object
*
* @ingroup threads
*/
prime_pool_t *prime_pool_create(int generation_limit);
#endif /*PRIME_POOL_H_*/
+44 -2
View File
@@ -123,8 +123,49 @@ struct private_rsa_private_key_t {
*/
chunk_t (*rsasp1) (private_rsa_private_key_t *this, chunk_t data);
/**
* @brief Generate a prime value.
*
* @param this calling object
* @param prime_size size of the prime, in bytes
* @param[out] prime uninitialized mpz
*/
void (*compute_prime) (private_rsa_private_key_t *this, size_t prime_size, mpz_t *prime);
};
/**
* Implementation of private_rsa_private_key_t.compute_prime.
*/
static void compute_prime(private_rsa_private_key_t *this, size_t prime_size, mpz_t *prime)
{
randomizer_t *randomizer;
chunk_t random_bytes;
randomizer = randomizer_create();
mpz_init(*prime);
do
{
randomizer->allocate_random_bytes(randomizer, prime_size, &random_bytes);
/* make sure most significant bit is set */
random_bytes.ptr[0] = random_bytes.ptr[0] | 0x80;
/* convert chunk to mpz value */
mpz_import(*prime, random_bytes.len, 1, 1, 1, 0, random_bytes.ptr);
/* get next prime */
mpz_nextprime (*prime, *prime);
allocator_free(random_bytes.ptr);
}
/* check if it isnt too large */
while (((mpz_sizeinbase(*prime, 2) + 7) / 8) > prime_size);
randomizer->destroy(randomizer);
}
/**
* Implementation of private_rsa_private_key_t.rsadp and private_rsa_private_key_t.rsasp1.
*/
@@ -406,8 +447,8 @@ static status_t generate_key(private_rsa_private_key_t *this, size_t key_size)
mpz_init(coeff);
/* Get values of primes p and q */
charon->prime_pool->get_prime(charon->prime_pool, key_size/2, &p);
charon->prime_pool->get_prime(charon->prime_pool, key_size/2, &q);
this->compute_prime(this, key_size/2, &p);
this->compute_prime(this, key_size/2, &q);
/* Swapping Primes so p is larger then q */
if (mpz_cmp(p, q) < 0)
@@ -541,6 +582,7 @@ rsa_private_key_t *rsa_private_key_create(hash_algorithm_t hash_algoritm)
/* private functions */
this->rsadp = rsadp;
this->rsasp1 = rsadp; /* same algorithm */
this->compute_prime = compute_prime;
this->is_key_set = FALSE;