Use less secure random number generation so we can generate private

 keys on the fly. Drop libiphone-initconf.

1 files changed, 270 insertions, 54 deletions

diff --git a/src/userpref.c b/src/userpref.c
index 3e5eb06..0e83133 100644
--- a/src/userpref.c
+++ b/src/userpref.c
@@ -8,25 +8,28 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library 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
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <glib.h>
 #include <glib/gprintf.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <gnutls/gnutls.h>
+#include <gnutls/x509.h>
+#include <gcrypt.h>
+
 #include "userpref.h"
 #include "utils.h"
-#include <string.h>
-#include <stdlib.h>
 
 #define LIBIPHONE_CONF_DIR  "libiphone"
 #define LIBIPHONE_CONF_FILE "libiphonerc"
@@ -49,9 +52,75 @@ static void create_config_dir(void)
 	g_free(config_dir);
 }
 
+static int get_rand(int min, int max)
+{
+	int retval = (rand() % (max - min)) + min;
+	return retval;
+}
+
+/** Generates a valid HostID (which is actually a UUID).
+ *
+ * @return A null terminated string containing a valid HostID.
+ */
+static char *lockdownd_generate_hostid()
+{
+	char *hostid = (char *) malloc(sizeof(char) * 37);	// HostID's are just UUID's, and UUID's are 36 characters long
+	const char *chars = "ABCDEF0123456789";
+	srand(time(NULL));
+	int i = 0;
+
+	for (i = 0; i < 36; i++) {
+		if (i == 8 || i == 13 || i == 18 || i == 23) {
+			hostid[i] = '-';
+			continue;
+		} else {
+			hostid[i] = chars[get_rand(0, 16)];
+		}
+	}
+	hostid[36] = '\0';			// make it a real string
+	return hostid;
+}
+
+/** Store HostID in config file.
+ *
+ * @param host_id A null terminated string containing a valid HostID.
+ */
+static int write_host_id(char *host_id)
+{
+	GKeyFile *key_file;
+	gsize length;
+	gchar *buf, *config_file;
+	GIOChannel *file;
+
+	if (!host_id)
+		return 0;
+
+	/* Make sure config directory exists */
+	create_config_dir();
+
+	/* Now parse file to get the HostID */
+	key_file = g_key_file_new();
 
-/** Reads the HostID from a previously generated configuration file. 
- * 
+	/* Store in config file */
+	log_debug_msg("init_config_file(): setting hostID to %s\n", host_id);
+	g_key_file_set_value(key_file, "Global", "HostID", host_id);
+
+	/* Write config file on disk */
+	buf = g_key_file_to_data(key_file, &length, NULL);
+	config_file =
+		g_build_path(G_DIR_SEPARATOR_S, g_get_user_config_dir(), LIBIPHONE_CONF_DIR, LIBIPHONE_CONF_FILE, NULL);
+	file = g_io_channel_new_file(config_file, "w", NULL);
+	g_free(config_file);
+	g_io_channel_write_chars(file, buf, length, NULL, NULL);
+	g_io_channel_shutdown(file, TRUE, NULL);
+	g_io_channel_unref(file);
+
+	g_key_file_free(key_file);
+	return 1;
+}
+
+/** Reads the HostID from a previously generated configuration file.
+ *
  * @note It is the responsibility of the calling function to free the returned host_id
  *
  * @return The string containing the HostID or NULL
@@ -77,6 +146,12 @@ char *get_host_id(void)
 	g_key_file_free(key_file);
 	g_free(config_file);
 
+	if (!host_id) {
+		//no config, generate host_id
+		host_id = lockdownd_generate_hostid();
+		write_host_id(host_id);
+	}
+
 	log_debug_msg("get_host_id(): Using %s as HostID\n", host_id);
 	return host_id;
 }
@@ -156,56 +231,220 @@ static int read_file_in_confdir(const char *file, gnutls_datum_t * data)
 	g_free(filepath);
 
 	/* Add it to the gnutls_datnum_t structure */
-	data->data = content;
+	data->data = (uint8_t*) content;
 	data->size = size;
 
 	return success;
 }
 
-/** Read the root private key
- *
- * @param root_privkey A pointer to the appropriate gnutls structure
+
+/** Private function which generate private keys and certificates.
  *
- * @return 1 if the file was successfully read and 0 otherwise.
+ * @return IPHONE_E_SUCCESS if keys were successfully generated.
  */
-int get_root_private_key(gnutls_datum_t * root_privkey)
+static iphone_error_t gen_keys_and_cert(void)
 {
-	return read_file_in_confdir(LIBIPHONE_ROOT_PRIVKEY, root_privkey);
+	iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
+	gnutls_x509_privkey_t root_privkey;
+	gnutls_x509_privkey_t host_privkey;
+	gnutls_x509_crt_t root_cert;
+	gnutls_x509_crt_t host_cert;
+
+	gnutls_global_deinit();
+	gnutls_global_init();
+
+	//use less secure random to speed up key generation
+	gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM);
+
+	gnutls_x509_privkey_init(&root_privkey);
+	gnutls_x509_privkey_init(&host_privkey);
+
+	gnutls_x509_crt_init(&root_cert);
+	gnutls_x509_crt_init(&host_cert);
+
+	/* generate root key */
+	gnutls_x509_privkey_generate(root_privkey, GNUTLS_PK_RSA, 2048, 0);
+	gnutls_x509_privkey_generate(host_privkey, GNUTLS_PK_RSA, 2048, 0);
+
+	/* generate certificates */
+	gnutls_x509_crt_set_key(root_cert, root_privkey);
+	gnutls_x509_crt_set_serial(root_cert, "\x00", 1);
+	gnutls_x509_crt_set_version(root_cert, 3);
+	gnutls_x509_crt_set_ca_status(root_cert, 1);
+	gnutls_x509_crt_set_activation_time(root_cert, time(NULL));
+	gnutls_x509_crt_set_expiration_time(root_cert, time(NULL) + (60 * 60 * 24 * 365 * 10));
+	gnutls_x509_crt_sign(root_cert, root_cert, root_privkey);
+
+
+	gnutls_x509_crt_set_key(host_cert, host_privkey);
+	gnutls_x509_crt_set_serial(host_cert, "\x00", 1);
+	gnutls_x509_crt_set_version(host_cert, 3);
+	gnutls_x509_crt_set_ca_status(host_cert, 0);
+	gnutls_x509_crt_set_key_usage(host_cert, GNUTLS_KEY_KEY_ENCIPHERMENT | GNUTLS_KEY_DIGITAL_SIGNATURE);
+	gnutls_x509_crt_set_activation_time(host_cert, time(NULL));
+	gnutls_x509_crt_set_expiration_time(host_cert, time(NULL) + (60 * 60 * 24 * 365 * 10));
+	gnutls_x509_crt_sign(host_cert, root_cert, root_privkey);
+
+	/* export to PEM format */
+	gnutls_datum_t root_key_pem = { NULL, 0 };
+	gnutls_datum_t host_key_pem = { NULL, 0 };
+
+	gnutls_x509_privkey_export(root_privkey, GNUTLS_X509_FMT_PEM, NULL, &root_key_pem.size);
+	gnutls_x509_privkey_export(host_privkey, GNUTLS_X509_FMT_PEM, NULL, &host_key_pem.size);
+
+	root_key_pem.data = gnutls_malloc(root_key_pem.size);
+	host_key_pem.data = gnutls_malloc(host_key_pem.size);
+
+	gnutls_x509_privkey_export(root_privkey, GNUTLS_X509_FMT_PEM, root_key_pem.data, &root_key_pem.size);
+	gnutls_x509_privkey_export(host_privkey, GNUTLS_X509_FMT_PEM, host_key_pem.data, &host_key_pem.size);
+
+	gnutls_datum_t root_cert_pem = { NULL, 0 };
+	gnutls_datum_t host_cert_pem = { NULL, 0 };
+
+	gnutls_x509_crt_export(root_cert, GNUTLS_X509_FMT_PEM, NULL, &root_cert_pem.size);
+	gnutls_x509_crt_export(host_cert, GNUTLS_X509_FMT_PEM, NULL, &host_cert_pem.size);
+
+	root_cert_pem.data = gnutls_malloc(root_cert_pem.size);
+	host_cert_pem.data = gnutls_malloc(host_cert_pem.size);
+
+	gnutls_x509_crt_export(root_cert, GNUTLS_X509_FMT_PEM, root_cert_pem.data, &root_cert_pem.size);
+	gnutls_x509_crt_export(host_cert, GNUTLS_X509_FMT_PEM, host_cert_pem.data, &host_cert_pem.size);
+
+	if (NULL != root_cert_pem.data && 0 != root_cert_pem.size &&
+		NULL != host_cert_pem.data && 0 != host_cert_pem.size)
+		ret = IPHONE_E_SUCCESS;
+
+	/* store values in config file */
+	init_config_file( &root_key_pem, &host_key_pem, &root_cert_pem, &host_cert_pem);
+
+	gnutls_free(root_key_pem.data);
+	gnutls_free(host_key_pem.data);
+	gnutls_free(root_cert_pem.data);
+	gnutls_free(host_cert_pem.data);
+
+	//restore gnutls env
+	gnutls_global_deinit();
+	gnutls_global_init();
+
+	return ret;
 }
 
-/** Read the host private key
+/** Private function which import the given key into a gnutls structure.
  *
- * @param host_privkey A pointer to the appropriate gnutls structure
+ * @param key_name The filename of the private key to import.
+ * @param key the gnutls key structure.
  *
- * @return 1 if the file was successfully read and 0 otherwise.
+ * @return IPHONE_E_SUCCESS if the key was successfully imported.
  */
-int get_host_private_key(gnutls_datum_t * host_privkey)
+static iphone_error_t import_key(const char* key_name, gnutls_x509_privkey_t key)
 {
-	return read_file_in_confdir(LIBIPHONE_HOST_PRIVKEY, host_privkey);
+	iphone_error_t ret = IPHONE_E_INVALID_CONF;
+	gnutls_datum_t pem_key = { NULL, 0 };
+
+	if ( read_file_in_confdir(key_name, &pem_key) ) {
+			if (GNUTLS_E_SUCCESS == gnutls_x509_privkey_import(key, &pem_key, GNUTLS_X509_FMT_PEM))
+				ret = IPHONE_E_SUCCESS;
+			else
+				ret = IPHONE_E_SSL_ERROR;
+	}
+	gnutls_free(pem_key.data);
+	return ret;
 }
 
-/** Read the root certificate
+/** Private function which import the given certificate into a gnutls structure.
  *
- * @param root_privkey A pointer to the appropriate gnutls structure
+ * @param crt_name The filename of the certificate to import.
+ * @param cert the gnutls certificate structure.
  *
- * @return 1 if the file was successfully read and 0 otherwise.
+ * @return IPHONE_E_SUCCESS if the certificate was successfully imported.
  */
-int get_root_certificate(gnutls_datum_t * root_cert)
+static iphone_error_t import_crt(const char* crt_name, gnutls_x509_crt_t cert)
 {
-	return read_file_in_confdir(LIBIPHONE_ROOT_CERTIF, root_cert);
+	iphone_error_t ret = IPHONE_E_INVALID_CONF;
+	gnutls_datum_t pem_cert = { NULL, 0 };
+
+	if ( read_file_in_confdir(crt_name, &pem_cert) ) {
+			if (GNUTLS_E_SUCCESS == gnutls_x509_crt_import(cert, &pem_cert, GNUTLS_X509_FMT_PEM))
+				ret = IPHONE_E_SUCCESS;
+			else
+				ret = IPHONE_E_SSL_ERROR;
+	}
+	gnutls_free(pem_cert.data);
+	return ret;
 }
 
-/** Read the host certificate
+/** Function to retrieve host keys and certificates.
+ * This function trigger key generation if they do not exists yet or are invalid.
  *
- * @param root_privkey A pointer to the appropriate gnutls structure
+ * @note This function can take few seconds to complete (typically 5 seconds)
  *
- * @return 1 if the file was successfully read and 0 otherwise.
+ * @param root_privkey The root private key.
+ * @param root_crt The root certificate.
+ * @param host_privkey The host private key.
+ * @param host_crt The host certificate.
+ *
+ * @return IPHONE_E_SUCCESS if the keys and certificates were successfully retrieved.
  */
-int get_host_certificate(gnutls_datum_t * host_cert)
+iphone_error_t get_keys_and_certs(gnutls_x509_privkey_t root_privkey, gnutls_x509_crt_t root_crt, gnutls_x509_privkey_t host_privkey, gnutls_x509_crt_t host_crt)
 {
-	return read_file_in_confdir(LIBIPHONE_HOST_CERTIF, host_cert);
+  iphone_error_t ret = IPHONE_E_SUCCESS;
+
+	if (ret == IPHONE_E_SUCCESS)
+		ret = import_key(LIBIPHONE_ROOT_PRIVKEY, root_privkey);
+
+	if (ret == IPHONE_E_SUCCESS)
+		ret = import_key(LIBIPHONE_HOST_PRIVKEY, host_privkey);
+
+	if (ret == IPHONE_E_SUCCESS)
+		ret = import_crt(LIBIPHONE_ROOT_CERTIF, root_crt);
+
+	if (ret == IPHONE_E_SUCCESS)
+		ret = import_crt(LIBIPHONE_HOST_CERTIF, host_crt);
+
+
+	if (IPHONE_E_SUCCESS != ret) {
+		//we had problem reading or importing root cert
+		//try with a new ones.
+		ret = gen_keys_and_cert();
+
+		if (ret == IPHONE_E_SUCCESS)
+			ret = import_key(LIBIPHONE_ROOT_PRIVKEY, root_privkey);
+
+		if (ret == IPHONE_E_SUCCESS)
+			ret = import_key(LIBIPHONE_HOST_PRIVKEY, host_privkey);
+
+		if (ret == IPHONE_E_SUCCESS)
+			ret = import_crt(LIBIPHONE_ROOT_CERTIF, root_crt);
+
+		if (ret == IPHONE_E_SUCCESS)
+			ret = import_crt(LIBIPHONE_HOST_CERTIF, host_crt);
+	}
+
+	return ret;
 }
 
+/** Function to retrieve certificates encoded in PEM format.
+ *
+ * @param pem_root_cert The root certificate.
+ * @param pem_host_cert The host certificate.
+ *
+ * @return IPHONE_E_SUCCESS if the certificates were successfully retrieved.
+ */
+iphone_error_t get_certs_as_pem(gnutls_datum_t *pem_root_cert, gnutls_datum_t *pem_host_cert)
+{
+	iphone_error_t ret = IPHONE_E_INVALID_CONF;
+
+	if ( !pem_root_cert || !pem_host_cert)
+		return IPHONE_E_INVALID_ARG;
+
+	if ( read_file_in_confdir(LIBIPHONE_ROOT_CERTIF, pem_root_cert) && read_file_in_confdir(LIBIPHONE_HOST_CERTIF, pem_host_cert))
+		ret = IPHONE_E_SUCCESS;
+	else {
+		g_free(pem_root_cert->data);
+		g_free(pem_host_cert->data);
+	}
+	return ret;
+}
 /** Create and save a configuration file containing the given data.
  *
  * @note: All fields must specified and be non-null
@@ -218,41 +457,18 @@ int get_host_certificate(gnutls_datum_t * host_cert)
  *
  * @return 1 on success and 0 otherwise.
  */
-int init_config_file(char *host_id, gnutls_datum_t * root_key, gnutls_datum_t * host_key, gnutls_datum_t * root_cert,
+int init_config_file( gnutls_datum_t * root_key, gnutls_datum_t * host_key, gnutls_datum_t * root_cert,
 					 gnutls_datum_t * host_cert)
 {
 	FILE *pFile;
 	gchar *pem;
-	GKeyFile *key_file;
-	gsize length;
-	gchar *buf, *config_file;
-	GIOChannel *file;
 
-	if (!host_id || !root_key || !host_key || !root_cert || !host_cert)
+	if (!root_key || !host_key || !root_cert || !host_cert)
 		return 0;
 
 	/* Make sure config directory exists */
 	create_config_dir();
 
-	/* Now parse file to get the HostID */
-	key_file = g_key_file_new();
-
-	/* Store in config file */
-	log_debug_msg("init_config_file(): setting hostID to %s\n", host_id);
-	g_key_file_set_value(key_file, "Global", "HostID", host_id);
-
-	/* Write config file on disk */
-	buf = g_key_file_to_data(key_file, &length, NULL);
-	config_file =
-		g_build_path(G_DIR_SEPARATOR_S, g_get_user_config_dir(), LIBIPHONE_CONF_DIR, LIBIPHONE_CONF_FILE, NULL);
-	file = g_io_channel_new_file(config_file, "w", NULL);
-	g_free(config_file);
-	g_io_channel_write_chars(file, buf, length, NULL, NULL);
-	g_io_channel_shutdown(file, TRUE, NULL);
-	g_io_channel_unref(file);
-
-	g_key_file_free(key_file);
-
 	/* Now write keys and certificates to disk */
 	pem = g_build_path(G_DIR_SEPARATOR_S, g_get_user_config_dir(), LIBIPHONE_CONF_DIR, LIBIPHONE_ROOT_PRIVKEY, NULL);
 	pFile = fopen(pem, "wb");