Revert "Add own test cert and key since there seem to be a problem with the ones...

[umurmur.git] / src / ssl.c

diff --git a/src/ssl.c b/src/ssl.c
index dc2245352b6fff895948f665ceca3087c5861c4a..44fa0c9378d07a0eda9aaa5f7542adcb9154f3c7 100644 (file)
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2011, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -64,6 +64,8 @@ int ciphers[] =
 };
 static x509_cert certificate;
 static rsa_context key;
+bool_t builtInTestCertificate;
+
 havege_state hs; /* exported to crypt.c */
 
 /* DH prime */
@@ -77,17 +79,51 @@ char *my_dhm_P =
        "DEF409C08E8AC24D1732A6128D2220DC53";
 char *my_dhm_G = "4";
 
+static void initTestCert()
+{
+       int rc;
+       builtInTestCertificate = true;
+       rc = x509parse_crt(&certificate, (unsigned char *)test_srv_crt,
+                                          strlen(test_srv_crt));       
+       if (rc != 0)
+               Log_fatal("Could not parse built-in test certificate");
+       rc = x509parse_crt(&certificate, (unsigned char *)test_ca_crt,
+                                          strlen(test_ca_crt));
+       if (rc != 0)
+               Log_fatal("Could not parse built-in test CA certificate");
+}
+
+static void initTestKey()
+{
+       int rc;
+       
+       rc = x509parse_key(&key, (unsigned char *)test_srv_key,
+                                          strlen(test_srv_key), NULL, 0);
+       if (rc != 0)
+               Log_fatal("Could not parse built-in test RSA key");
+}
+
+/*
+ * openssl genrsa 1024 > host.key
+ * openssl req -new -x509 -nodes -sha1 -days 365 -key host.key > host.cert
+ */
 static void initCert()
 {
        int rc;
        char *crtfile = (char *)getStrConf(CERTIFICATE);
        char *ca_file, *p;
        
-       if (crtfile == NULL)
-               Log_fatal("No certificate file specified"); 
+       if (crtfile == NULL) {
+               Log_warn("No certificate file specified");
+               initTestCert();
+               return;
+       }
        rc = x509parse_crtfile(&certificate, crtfile);
-       if (rc != 0)
-               Log_fatal("Could not read certificate file %s", crtfile);
+       if (rc != 0) {
+               Log_warn("Could not read certificate file %s", crtfile);
+               initTestCert();
+               return;
+       }
        
        /* Look for CA certificate file in same dir */
        ca_file = malloc(strlen(crtfile) + strlen(CA_CRT_FILENAME) + 1);
@@ -101,21 +137,25 @@ static void initCert()
        rc = x509parse_crtfile(&certificate, ca_file);
        if (rc != 0) { /* No CA certifiacte found. Assume self-signed. */
                Log_info("CA certificate file %s not found. Assuming self-signed certificate.", ca_file);
-               /*
-                * Apparently PolarSSL needs to read something more into certificate chain.
-                * Doesn't seem to matter what. Read own certificate again.
-                */
-               rc = x509parse_crtfile(&certificate, crtfile);
-               if (rc != 0)
-                       Log_fatal("Could not read certificate file %s", crtfile);
        }
+       
+       /*
+        * PolarSSL 0.11 - 0.12,1 has a bug; it ignores the last certificate in the chain.
+        * Read the certificate again so that it gets last in chain. Later releases like 0.14.0 works
+        * fine with the extra certificate, so I don't see any harm in doing so.
+        */
+       rc = x509parse_crtfile(&certificate, crtfile);
+       if (rc != 0)
+               Log_fatal("Could not read certificate file %s", crtfile);
+       
+       free(ca_file);
 }
 
 static void initKey()
 {
        int rc;
        char *keyfile = (char *)getStrConf(KEY);
-       
+
        if (keyfile == NULL)
                Log_fatal("No key file specified"); 
        rc = x509parse_keyfile(&key, keyfile, NULL);
@@ -124,7 +164,7 @@ static void initKey()
 }
 
 #define DEBUG_LEVEL 0
-static void pssl_debug(void *ctx, int level, char *str)
+static void pssl_debug(void *ctx, int level, const char *str)
 {
     if (level <= DEBUG_LEVEL)
                Log_debug("PolarSSL [level %d]: %s", level, str);
@@ -133,7 +173,13 @@ static void pssl_debug(void *ctx, int level, char *str)
 void SSLi_init(void)
 {
        initCert();
-       initKey();
+       if (builtInTestCertificate) {
+               Log_warn("*** Using built-in test certificate and RSA key ***");
+               Log_warn("*** This is not secure! Please use a CA-signed certificate or create a self-signed certificate ***");
+               initTestKey();
+       }
+       else
+               initKey();
     havege_init(&hs);
        Log_info("PolarSSL library initialized");
 }
@@ -230,7 +276,9 @@ void SSLi_shutdown(SSL_handle_t *ssl)
 
 void SSLi_free(SSL_handle_t *ssl)
 {
-       free(ssl->session);
+       Log_debug("SSLi_free");
+       free(ssl->session); /* XXX - Hmmm. */
+       ssl_free(ssl);
        free(ssl);
 }