Configure switch to enable built-in test certificate added. Defaults to disabled.

[umurmur.git] / src / ssl.c

diff --git a/src/ssl.c b/src/ssl.c
index e7a53a21d55810354c48d814a52ed58472033a10..e413db6de7b0afb6906b9f5f280d3f17159ff0ff 100644 (file)
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -80,6 +80,7 @@ char *my_dhm_P =
        "DEF409C08E8AC24D1732A6128D2220DC53";
 char *my_dhm_G = "4";
 
+#ifdef USE_POLARSSL_TESTCERT
 static void initTestCert()
 {
        int rc;
@@ -99,6 +100,7 @@ static void initTestKey()
        if (rc != 0)
                Log_fatal("Could not parse built-in test RSA key");
 }
+#endif
 
 /*
  * How to generate a self-signed cert with openssl:
@@ -111,14 +113,22 @@ static void initCert()
        char *crtfile = (char *)getStrConf(CERTIFICATE);
        
        if (crtfile == NULL) {
-               Log_warn("No certificate file specified");
+#ifdef USE_POLARSSL_TESTCERT
+               Log_warn("No certificate file specified. Falling back to test certificate.");
                initTestCert();
+#else
+               Log_fatal("No certificate file specified");
+#endif
                return;
        }
        rc = x509parse_crtfile(&certificate, crtfile);
        if (rc != 0) {
-               Log_warn("Could not read certificate file %s", crtfile);
+#ifdef USE_POLARSSL_TESTCERT
+               Log_warn("Could not read certificate file '%s'. Falling back to test certificate.", crtfile);
                initTestCert();
+#else
+               Log_fatal("Could not read certificate file '%s'", crtfile);
+#endif
                return;
        }
 }
@@ -147,13 +157,17 @@ void SSLi_init(void)
        char verstring[12];
        
        initCert();
+#ifdef USE_POLARSSL_TESTCERT
        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 ***");
+               Log_warn("*** This is not secure! Please use a CA-signed certificate or create a key and self-signed certificate ***");
                initTestKey();
        }
        else
                initKey();
+#else
+       initKey();
+#endif
     havege_init(&hs);
     
 #ifdef POLARSSL_VERSION_MAJOR
@@ -173,7 +187,7 @@ void SSLi_deinit(void)
 /* Create SHA1 of last certificate in the peer's chain. */
 bool_t SSLi_getSHA1Hash(SSL_handle_t *ssl, uint8_t *hash)
 {
-       x509_cert *cert;
+       x509_cert const *cert;
 #ifdef POLARSSL_API_V1_2
        cert = ssl_get_peer_cert(ssl);
 #else
@@ -201,7 +215,7 @@ SSL_handle_t *SSLi_newconnection(int *fd, bool_t *SSLready)
        
        rc = ssl_init(ssl);
        if (rc != 0 )
-               Log_fatal("Failed to initalize: %d", rc);
+               Log_fatal("Failed to initialize: %d", rc);
        
        ssl_set_endpoint(ssl, SSL_IS_SERVER);   
        ssl_set_authmode(ssl, SSL_VERIFY_OPTIONAL);