#include "platform.h"
#include <gcrypt.h>
#include "gnunet_common.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_disk_lib.h"
-#include "gnunet_strings_lib.h"
+#include "gnunet_util_lib.h"
#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
#define LOG_STRERROR_FILE(kind,syscall,filename) GNUNET_log_from_strerror_file (kind, "util", syscall, filename)
+
/**
* The private information of an RSA key pair.
- * NOTE: this must match the definition in crypto_ksk.c
+ * NOTE: this must match the definition in crypto_ksk.c and gnunet-rsa.c!
*/
struct GNUNET_CRYPTO_RsaPrivateKey
{
}
}
-/**
- * Create a new private key. Caller must free return value.
- *
- * @return fresh private key
- */
-struct GNUNET_CRYPTO_RsaPrivateKey *
-GNUNET_CRYPTO_rsa_key_create ()
-{
- struct GNUNET_CRYPTO_RsaPrivateKey *ret;
- gcry_sexp_t s_key;
- gcry_sexp_t s_keyparam;
-
- GNUNET_assert (0 ==
- gcry_sexp_build (&s_keyparam, NULL,
- "(genkey(rsa(nbits %d)(rsa-use-e 3:257)))",
- HOSTKEY_LEN));
- GNUNET_assert (0 == gcry_pk_genkey (&s_key, s_keyparam));
- gcry_sexp_release (s_keyparam);
-#if EXTRA_CHECKS
- GNUNET_assert (0 == gcry_pk_testkey (s_key));
-#endif
- ret = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_RsaPrivateKey));
- ret->sexp = s_key;
- return ret;
-}
/**
* Free memory occupied by hostkey
GNUNET_free (hostkey);
}
+
+/**
+ * FIXME: document!
+ */
static int
key_from_sexp (gcry_mpi_t * array, gcry_sexp_t sexp, const char *topname,
const char *elems)
}
+/**
+ * Create a new private key. Caller must free return value.
+ *
+ * @return fresh private key
+ */
+static struct GNUNET_CRYPTO_RsaPrivateKey *
+rsa_key_create ()
+{
+ struct GNUNET_CRYPTO_RsaPrivateKey *ret;
+ gcry_sexp_t s_key;
+ gcry_sexp_t s_keyparam;
+
+ GNUNET_assert (0 ==
+ gcry_sexp_build (&s_keyparam, NULL,
+ "(genkey(rsa(nbits %d)(rsa-use-e 3:257)))",
+ HOSTKEY_LEN));
+ GNUNET_assert (0 == gcry_pk_genkey (&s_key, s_keyparam));
+ gcry_sexp_release (s_keyparam);
+#if EXTRA_CHECKS
+ GNUNET_assert (0 == gcry_pk_testkey (s_key));
+#endif
+ ret = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_RsaPrivateKey));
+ ret->sexp = s_key;
+ return ret;
+}
+
+
+/**
+ * Try to read the private key from the given file.
+ *
+ * @param filename file to read the key from
+ * @return NULL on error
+ */
+static struct GNUNET_CRYPTO_RsaPrivateKey *
+try_read_key (const char *filename)
+{
+ struct GNUNET_CRYPTO_RsaPrivateKey *ret;
+ struct GNUNET_CRYPTO_RsaPrivateKeyBinaryEncoded *enc;
+ struct GNUNET_DISK_FileHandle *fd;
+ OFF_T fs;
+ uint16_t len;
+
+ if (GNUNET_YES != GNUNET_DISK_file_test (filename))
+ return NULL;
+
+ /* hostkey file exists already, read it! */
+ if (NULL == (fd = GNUNET_DISK_file_open (filename, GNUNET_DISK_OPEN_READ,
+ GNUNET_DISK_PERM_NONE)))
+ {
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "open", filename);
+ return NULL;
+ }
+ if (GNUNET_OK != (GNUNET_DISK_file_handle_size (fd, &fs)))
+ {
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "stat", filename);
+ (void) GNUNET_DISK_file_close (fd);
+ return NULL;
+ }
+ if (0 == fs)
+ {
+ GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (fd));
+ return NULL;
+ }
+ if (fs > UINT16_MAX)
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("File `%s' does not contain a valid private key (too long, %llu bytes). Deleting it.\n"),
+ filename,
+ (unsigned long long) fs);
+ GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (fd));
+ if (0 != UNLINK (filename))
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "unlink", filename);
+ return NULL;
+ }
+
+ enc = GNUNET_malloc (fs);
+ GNUNET_break (fs == GNUNET_DISK_file_read (fd, enc, fs));
+ len = ntohs (enc->len);
+ ret = NULL;
+ if ((len != fs) ||
+ (NULL == (ret = GNUNET_CRYPTO_rsa_decode_key ((char *) enc, len))))
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("File `%s' does not contain a valid private key (failed decode, %llu bytes). Deleting it.\n"),
+ filename,
+ (unsigned long long) fs);
+ GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (fd));
+ if (0 != UNLINK (filename))
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "unlink", filename);
+ GNUNET_free (enc);
+ return NULL;
+ }
+ GNUNET_free (enc);
+
+ GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (fd));
+ return ret;
+}
+
+
+/**
+ * Wait for a short time (we're trying to lock a file or want
+ * to give another process a shot at finishing a disk write, etc.).
+ * Sleeps for 100ms (as that should be long enough for virtually all
+ * modern systems to context switch and allow another process to do
+ * some 'real' work).
+ */
+static void
+short_wait ()
+{
+ struct GNUNET_TIME_Relative timeout;
+
+ timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 100);
+ GNUNET_NETWORK_socket_select (NULL, NULL, NULL, timeout);
+}
+
+
/**
* Create a new private key by reading it from a file. If the
* files does not exist, create a new key and write it to the
sizeof (struct GNUNET_CRYPTO_RsaPrivateKeyBinaryEncoded),
GNUNET_YES))
{
- sleep (1);
+ short_wait (1);
if (0 == ++cnt % 10)
{
ec = errno;
LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Could not aquire lock on file `%s': %s...\n"), filename,
+ _("Could not acquire lock on file `%s': %s...\n"), filename,
STRERROR (ec));
}
}
LOG (GNUNET_ERROR_TYPE_INFO,
_("Creating a new private key. This may take a while.\n"));
- ret = GNUNET_CRYPTO_rsa_key_create ();
+ ret = rsa_key_create ();
GNUNET_assert (ret != NULL);
enc = GNUNET_CRYPTO_rsa_encode_key (ret);
GNUNET_assert (enc != NULL);
{
ec = errno;
LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Could not aquire lock on file `%s': %s...\n"), filename,
+ _("Could not acquire lock on file `%s': %s...\n"), filename,
STRERROR (ec));
LOG (GNUNET_ERROR_TYPE_ERROR,
_
("This may be ok if someone is currently generating a hostkey.\n"));
}
- sleep (1);
+ short_wait (1);
continue;
}
if (GNUNET_YES != GNUNET_DISK_file_test (filename))
return NULL;
}
- if (GNUNET_YES != GNUNET_DISK_file_size (filename, &fs, GNUNET_YES))
+ if (GNUNET_OK != GNUNET_DISK_file_size (filename, &fs, GNUNET_YES, GNUNET_YES))
fs = 0;
if (fs < sizeof (struct GNUNET_CRYPTO_RsaPrivateKeyBinaryEncoded))
{
_
("This may be ok if someone is currently generating a hostkey.\n"));
}
- sleep (2); /* wait a bit longer! */
+ short_wait (1); /* wait a bit longer! */
continue;
}
break;
}
+/**
+ * Handle to cancel private key generation and state for the
+ * key generation operation.
+ */
+struct GNUNET_CRYPTO_RsaKeyGenerationContext
+{
+
+ /**
+ * Continuation to call upon completion.
+ */
+ GNUNET_CRYPTO_RsaKeyCallback cont;
+
+ /**
+ * Closure for 'cont'.
+ */
+ void *cont_cls;
+
+ /**
+ * Name of the file.
+ */
+ char *filename;
+
+ /**
+ * Handle to the helper process which does the key generation.
+ */
+ struct GNUNET_OS_Process *gnunet_rsa;
+
+ /**
+ * Handle to 'stdout' of gnunet-rsa. We 'read' on stdout to detect
+ * process termination (instead of messing with SIGCHLD).
+ */
+ struct GNUNET_DISK_PipeHandle *gnunet_rsa_out;
+
+ /**
+ * Location where we store the private key if it already existed.
+ * (if this is used, 'filename', 'gnunet_rsa' and 'gnunet_rsa_out' will
+ * not be used).
+ */
+ struct GNUNET_CRYPTO_RsaPrivateKey *pk;
+
+ /**
+ * Task reading from 'gnunet_rsa_out' to wait for process termination.
+ */
+ GNUNET_SCHEDULER_TaskIdentifier read_task;
+
+};
+
+
+/**
+ * Task called upon shutdown or process termination of 'gnunet-rsa' during
+ * RSA key generation. Check where we are and perform the appropriate
+ * action.
+ *
+ * @param cls the 'struct GNUNET_CRYPTO_RsaKeyGenerationContext'
+ * @param tc scheduler context
+ */
+static void
+check_key_generation_completion (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_CRYPTO_RsaKeyGenerationContext *gc = cls;
+ struct GNUNET_CRYPTO_RsaPrivateKey *pk;
+
+ gc->read_task = GNUNET_SCHEDULER_NO_TASK;
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+ {
+ gc->cont (gc->cont_cls, NULL, _("interrupted by shutdown"));
+ GNUNET_CRYPTO_rsa_key_create_stop (gc);
+ return;
+ }
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_OS_process_wait (gc->gnunet_rsa));
+ GNUNET_OS_process_destroy (gc->gnunet_rsa);
+ gc->gnunet_rsa = NULL;
+ if (NULL == (pk = try_read_key (gc->filename)))
+ {
+ GNUNET_break (0);
+ gc->cont (gc->cont_cls, NULL, _("gnunet-rsa failed"));
+ GNUNET_CRYPTO_rsa_key_create_stop (gc);
+ return;
+ }
+ gc->cont (gc->cont_cls, pk, NULL);
+ GNUNET_DISK_pipe_close (gc->gnunet_rsa_out);
+ GNUNET_free (gc->filename);
+ GNUNET_free (gc);
+}
+
+
+/**
+ * Return the private RSA key which already existed on disk
+ * (asynchronously) to the caller.
+ *
+ * @param cls the 'struct GNUNET_CRYPTO_RsaKeyGenerationContext'
+ * @param tc scheduler context (unused)
+ */
+static void
+async_return_key (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_CRYPTO_RsaKeyGenerationContext *gc = cls;
+
+ gc->cont (gc->cont_cls,
+ gc->pk,
+ NULL);
+ GNUNET_free (gc);
+}
+
+
+/**
+ * Create a new private key by reading it from a file. If the files
+ * does not exist, create a new key and write it to the file. If the
+ * contents of the file are invalid the old file is deleted and a
+ * fresh key is created.
+ *
+ * @param filename name of file to use for storage
+ * @param cont function to call when done (or on errors)
+ * @param cont_cls closure for 'cont'
+ * @return handle to abort operation, NULL on fatal errors (cont will not be called if NULL is returned)
+ */
+struct GNUNET_CRYPTO_RsaKeyGenerationContext *
+GNUNET_CRYPTO_rsa_key_create_start (const char *filename,
+ GNUNET_CRYPTO_RsaKeyCallback cont,
+ void *cont_cls)
+{
+ struct GNUNET_CRYPTO_RsaKeyGenerationContext *gc;
+ struct GNUNET_CRYPTO_RsaPrivateKey *pk;
+ const char *weak_random;
+
+ if (NULL != (pk = try_read_key (filename)))
+ {
+ /* quick happy ending: key already exists! */
+ gc = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_RsaKeyGenerationContext));
+ gc->pk = pk;
+ gc->cont = cont;
+ gc->cont_cls = cont_cls;
+ gc->read_task = GNUNET_SCHEDULER_add_now (&async_return_key,
+ gc);
+ return gc;
+ }
+ gc = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_RsaKeyGenerationContext));
+ gc->filename = GNUNET_strdup (filename);
+ gc->cont = cont;
+ gc->cont_cls = cont_cls;
+ gc->gnunet_rsa_out = GNUNET_DISK_pipe (GNUNET_NO,
+ GNUNET_NO,
+ GNUNET_NO,
+ GNUNET_YES);
+ if (NULL == gc->gnunet_rsa_out)
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "pipe");
+ GNUNET_free (gc->filename);
+ GNUNET_free (gc);
+ return NULL;
+ }
+ weak_random = NULL;
+ if (GNUNET_YES ==
+ GNUNET_CRYPTO_random_is_weak ())
+ weak_random = "-w";
+ gc->gnunet_rsa = GNUNET_OS_start_process (GNUNET_NO,
+ GNUNET_OS_INHERIT_STD_ERR,
+ NULL,
+ gc->gnunet_rsa_out,
+ "gnunet-rsa",
+ "gnunet-rsa",
+ gc->filename,
+ weak_random,
+ NULL);
+ if (NULL == gc->gnunet_rsa)
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "fork");
+ GNUNET_DISK_pipe_close (gc->gnunet_rsa_out);
+ GNUNET_free (gc->filename);
+ GNUNET_free (gc);
+ return NULL;
+ }
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_DISK_pipe_close_end (gc->gnunet_rsa_out,
+ GNUNET_DISK_PIPE_END_WRITE));
+ gc->read_task = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_DISK_pipe_handle (gc->gnunet_rsa_out,
+ GNUNET_DISK_PIPE_END_READ),
+ &check_key_generation_completion,
+ gc);
+ return gc;
+}
+
+
+/**
+ * Abort RSA key generation.
+ *
+ * @param gc key generation context to abort
+ */
+void
+GNUNET_CRYPTO_rsa_key_create_stop (struct GNUNET_CRYPTO_RsaKeyGenerationContext *gc)
+{
+ if (GNUNET_SCHEDULER_NO_TASK != gc->read_task)
+ {
+ GNUNET_SCHEDULER_cancel (gc->read_task);
+ gc->read_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (NULL != gc->gnunet_rsa)
+ {
+ (void) GNUNET_OS_process_kill (gc->gnunet_rsa, SIGKILL);
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_OS_process_wait (gc->gnunet_rsa));
+ GNUNET_OS_process_destroy (gc->gnunet_rsa);
+ GNUNET_DISK_pipe_close (gc->gnunet_rsa_out);
+ }
+
+ if (NULL != gc->filename)
+ {
+ if (0 != UNLINK (gc->filename))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", gc->filename);
+ GNUNET_free (gc->filename);
+ }
+ if (NULL != gc->pk)
+ GNUNET_CRYPTO_rsa_key_free (gc->pk);
+ GNUNET_free (gc);
+}
+
+
/**
* Setup a hostkey file for a peer given the name of the
* configuration file (!). This function is used so that
size_t isize;
size_t erroff;
- GNUNET_assert (size <= sizeof (GNUNET_HashCode));
+ GNUNET_assert (size <= sizeof (struct GNUNET_HashCode));
pubkey = public2PrivateKey (publicKey);
if (pubkey == NULL)
return GNUNET_SYSERR;
gcry_sexp_t data;
size_t ssize;
gcry_mpi_t rval;
- GNUNET_HashCode hc;
+ struct GNUNET_HashCode hc;
char *buff;
int bufSize;
[bufSize -
strlen
("0123456789012345678901234567890123456789012345678901234567890123))")
- - 1], &hc, sizeof (GNUNET_HashCode));
+ - 1], &hc, sizeof (struct GNUNET_HashCode));
GNUNET_assert (0 == gcry_sexp_new (&data, buff, bufSize, 0));
GNUNET_free (buff);
GNUNET_assert (0 == gcry_pk_sign (&result, data, key->sexp));
size_t size;
gcry_mpi_t val;
struct GNUNET_CRYPTO_RsaPrivateKey *hostkey;
- GNUNET_HashCode hc;
+ struct GNUNET_HashCode hc;
char *buff;
int bufSize;
size_t erroff;
[strlen (FORMATSTRING) -
strlen
("0123456789012345678901234567890123456789012345678901234567890123))")],
- &hc, sizeof (GNUNET_HashCode));
+ &hc, sizeof (struct GNUNET_HashCode));
GNUNET_assert (0 == gcry_sexp_new (&data, buff, bufSize, 0));
GNUNET_free (buff);
hostkey = public2PrivateKey (publicKey);
projects / oweals / gnunet.git / blobdiff