Moved to new module init structure.

[citadel.git] / citadel / serv_crypto.c

diff --git a/citadel/serv_crypto.c b/citadel/serv_crypto.c
index 60079aff430c8243539d009f8e464579e63e419c..a9dd5934bc58e357ad62878c3edc20b263462d53 100644 (file)
--- a/citadel/serv_crypto.c
+++ b/citadel/serv_crypto.c
@@ -35,11 +35,14 @@
 #include "server.h"
 #include "serv_crypto.h"
 #include "sysdep_decls.h"
-#include "serv_extensions.h"
 #include "citadel.h"
 #include "config.h"
 
 
+#include "ctdl_module.h"
+/* TODO: should we use the standard module init stuff to start this? */
+/* TODO: should we register an event handler to call destruct_ssl? */
+
 #ifdef HAVE_OPENSSL
 SSL_CTX *ssl_ctx;              /* SSL context */
 pthread_mutex_t **SSLCritters; /* Things needing locking */
@@ -49,6 +52,16 @@ static unsigned long id_callback(void)
        return (unsigned long) pthread_self();
 }
 
+void destruct_ssl(void)
+{
+       int a;
+       CtdlUnregisterProtoHook(cmd_stls, "STLS");
+       CtdlUnregisterProtoHook(cmd_gtls, "GTLS");
+       for (a = 0; a < CRYPTO_num_locks(); a++) 
+               free(SSLCritters[a]);
+       free (SSLCritters);
+}
+
 void init_ssl(void)
 {
        SSL_METHOD *ssl_method;
@@ -147,12 +160,12 @@ void init_ssl(void)
        /* Get our certificates in order.
         * First, create the key/cert directory if it's not there already...
         */
-       mkdir(CTDL_CRYPTO_DIR, 0700);
+       mkdir(ctdl_key_dir, 0700);
 
        /*
         * Generate a key pair if we don't have one.
         */
-       if (access(CTDL_KEY_PATH, R_OK) != 0) {
+       if (access(file_crpt_file_key, R_OK) != 0) {
                lprintf(CTDL_INFO, "Generating RSA key pair.\n");
                rsa = RSA_generate_key(1024,    /* modulus size */
                                        65537,  /* exponent */
@@ -163,9 +176,9 @@ void init_ssl(void)
                                ERR_reason_error_string(ERR_get_error()));
                }
                if (rsa != NULL) {
-                       fp = fopen(CTDL_KEY_PATH, "w");
+                       fp = fopen(file_crpt_file_key, "w");
                        if (fp != NULL) {
-                               chmod(CTDL_KEY_PATH, 0600);
+                               chmod(file_crpt_file_key, 0600);
                                if (PEM_write_RSAPrivateKey(fp, /* the file */
                                                        rsa,    /* the key */
                                                        NULL,   /* no enc */
@@ -176,7 +189,7 @@ void init_ssl(void)
                                ) != 1) {
                                        lprintf(CTDL_CRIT, "Cannot write key: %s\n",
                                                ERR_reason_error_string(ERR_get_error()));
-                                       unlink(CTDL_KEY_PATH);
+                                       unlink(file_crpt_file_key);
                                }
                                fclose(fp);
                        }
@@ -187,7 +200,7 @@ void init_ssl(void)
        /*
         * Generate a CSR if we don't have one.
         */
-       if (access(CTDL_CSR_PATH, R_OK) != 0) {
+       if (access(file_crpt_file_csr, R_OK) != 0) {
                lprintf(CTDL_INFO, "Generating a certificate signing request.\n");
 
                /*
@@ -196,7 +209,7 @@ void init_ssl(void)
                 * there is the possibility that the key was already on disk
                 * and we didn't just generate it now.
                 */
-               fp = fopen(CTDL_KEY_PATH, "r");
+               fp = fopen(file_crpt_file_key, "r");
                if (fp) {
                        rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
                        fclose(fp);
@@ -234,8 +247,12 @@ void init_ssl(void)
                                        X509_NAME_add_entry_by_txt(name, "OU",
                                                MBSTRING_ASC, "Citadel server", -1, -1, 0);
 
-                                       X509_NAME_add_entry_by_txt(name, "CN",
+                                       /* X509_NAME_add_entry_by_txt(name, "CN",
                                                MBSTRING_ASC, config.c_fqdn, -1, -1, 0);
+                                       */
+
+                                       X509_NAME_add_entry_by_txt(name, "CN",
+                                               MBSTRING_ASC, "*", -1, -1, 0);
                                
                                        X509_REQ_set_subject_name(req, name);
 
@@ -245,9 +262,9 @@ void init_ssl(void)
                                        }
                                        else {
                                                /* Write it to disk. */ 
-                                               fp = fopen(CTDL_CSR_PATH, "w");
+                                               fp = fopen(file_crpt_file_csr, "w");
                                                if (fp != NULL) {
-                                                       chmod(CTDL_CSR_PATH, 0600);
+                                                       chmod(file_crpt_file_csr, 0600);
                                                        PEM_write_X509_REQ(fp, req);
                                                        fclose(fp);
                                                }
@@ -270,13 +287,13 @@ void init_ssl(void)
        /*
         * Generate a self-signed certificate if we don't have one.
         */
-       if (access(CTDL_CER_PATH, R_OK) != 0) {
+       if (access(file_crpt_file_cer, R_OK) != 0) {
                lprintf(CTDL_INFO, "Generating a self-signed certificate.\n");
 
                /* Same deal as before: always read the key from disk because
                 * it may or may not have just been generated.
                 */
-               fp = fopen(CTDL_KEY_PATH, "r");
+               fp = fopen(file_crpt_file_key, "r");
                if (fp) {
                        rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
                        fclose(fp);
@@ -291,7 +308,7 @@ void init_ssl(void)
                                EVP_PKEY_assign_RSA(pk, rsa);
                        }
 
-                       fp = fopen(CTDL_CSR_PATH, "r");
+                       fp = fopen(file_crpt_file_csr, "r");
                        if (fp) {
                                req = PEM_read_X509_REQ(fp, NULL, NULL, NULL);
                                fclose(fp);
@@ -315,9 +332,9 @@ void init_ssl(void)
                                        }
                                        else {
                                                /* Write it to disk. */ 
-                                               fp = fopen(CTDL_CER_PATH, "w");
+                                               fp = fopen(file_crpt_file_cer, "w");
                                                if (fp != NULL) {
-                                                       chmod(CTDL_CER_PATH, 0600);
+                                                       chmod(file_crpt_file_cer, 0600);
                                                        PEM_write_X509(fp, cer);
                                                        fclose(fp);
                                                }
@@ -334,8 +351,8 @@ void init_ssl(void)
        /*
         * Now try to bind to the key and certificate.
         */
-        SSL_CTX_use_certificate_chain_file(ssl_ctx, CTDL_CER_PATH);
-        SSL_CTX_use_PrivateKey_file(ssl_ctx, CTDL_KEY_PATH, SSL_FILETYPE_PEM);
+        SSL_CTX_use_certificate_chain_file(ssl_ctx, file_crpt_file_cer);
+        SSL_CTX_use_PrivateKey_file(ssl_ctx, file_crpt_file_key, SSL_FILETYPE_PEM);
         if ( !SSL_CTX_check_private_key(ssl_ctx) ) {
                lprintf(CTDL_CRIT, "Cannot install certificate: %s\n",
                                ERR_reason_error_string(ERR_get_error()));