Update copyright year.

[umurmur.git] / src / ssl.c

diff --git a/src/ssl.c b/src/ssl.c
index e413db6de7b0afb6906b9f5f280d3f17159ff0ff..6b7a5353f7aeb25674ccb093c82db9af800826cc 100644 (file)
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2012, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2012, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2013, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2013, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -30,6 +30,7 @@
 */
 #include <string.h>
 #include <stdlib.h>
+#include <fcntl.h>
 
 #include "conf.h"
 #include "log.h"
@@ -67,7 +68,11 @@ static x509_cert certificate;
 static rsa_context key;
 bool_t builtInTestCertificate;
 
-havege_state hs; /* exported to crypt.c */
+#ifdef USE_POLARSSL_HAVEGE
+havege_state hs;
+#else
+int urandom_fd;
+#endif
 
 /* DH prime */
 char *my_dhm_P =
@@ -145,6 +150,21 @@ static void initKey()
                Log_fatal("Could not read RSA key file %s", keyfile);
 }
 
+#ifndef USE_POLARSSL_HAVEGE
+int urandom_bytes(void *ctx, unsigned char *dest, size_t len)
+{
+       int cur;
+       
+       while (len) {
+               cur = read(urandom_fd, dest, len);
+               if (cur < 0)
+                       continue;
+               len -= cur;
+       }
+       return 0;
+}
+#endif
+
 #define DEBUG_LEVEL 0
 static void pssl_debug(void *ctx, int level, const char *str)
 {
@@ -168,14 +188,18 @@ void SSLi_init(void)
 #else
        initKey();
 #endif
+
+       /* Initialize random number generator */
+#ifdef USE_POLARSSL_HAVEGE
     havege_init(&hs);
+#else
+    urandom_fd = open("/dev/urandom", O_RDONLY);
+    if (urandom_fd < 0)
+           Log_fatal("Cannot open /dev/urandom");
+#endif
     
-#ifdef POLARSSL_VERSION_MAJOR
     version_get_string(verstring);
     Log_info("PolarSSL library version %s initialized", verstring);
-#else
-       Log_info("PolarSSL library initialized");
-#endif
 }
 
 void SSLi_deinit(void)
@@ -219,16 +243,17 @@ SSL_handle_t *SSLi_newconnection(int *fd, bool_t *SSLready)
        
        ssl_set_endpoint(ssl, SSL_IS_SERVER);   
        ssl_set_authmode(ssl, SSL_VERIFY_OPTIONAL);
-
+       
+#ifdef USE_POLARSSL_HAVEGE
        ssl_set_rng(ssl, HAVEGE_RAND, &hs);
+#else
+       ssl_set_rng(ssl, urandom_bytes, NULL);
+#endif
+       
        ssl_set_dbg(ssl, pssl_debug, NULL);
        ssl_set_bio(ssl, net_recv, fd, net_send, fd);
 
-#ifdef POLARSSL_API_V1
        ssl_set_ciphersuites(ssl, ciphers);
-#else
-       ssl_set_ciphers(ssl, ciphers);
-#endif
 
 #ifdef POLARSSL_API_V1_2
     ssl_set_session(ssl, ssn);
@@ -249,13 +274,9 @@ int SSLi_nonblockaccept(SSL_handle_t *ssl, bool_t *SSLready)
        
        rc = ssl_handshake(ssl);
        if (rc != 0) {
-#ifdef POLARSSL_API_V1         
                if (rc == POLARSSL_ERR_NET_WANT_READ || rc == POLARSSL_ERR_NET_WANT_WRITE) {
-#else
-               if (rc == POLARSSL_ERR_NET_TRY_AGAIN) {
-#endif
                        return 0;
-               } else if (POLARSSL_ERR_X509_CERT_VERIFY_FAILED) { /* Allow this (selfsigned etc) */
+               } else if (rc == POLARSSL_ERR_X509_CERT_VERIFY_FAILED) { /* Allow this (selfsigned etc) */
                        return 0;                       
                } else {
                        Log_warn("SSL handshake failed: %d", rc);
@@ -271,11 +292,7 @@ int SSLi_read(SSL_handle_t *ssl, uint8_t *buf, int len)
        int rc;
 
        rc = ssl_read(ssl, buf, len);
-#ifdef POLARSSL_API_V1         
        if (rc == POLARSSL_ERR_NET_WANT_READ)
-#else
-       if (rc == POLARSSL_ERR_NET_TRY_AGAIN)
-#endif
                return SSLI_ERROR_WANT_READ;
        return rc;
 }
@@ -285,11 +302,7 @@ int SSLi_write(SSL_handle_t *ssl, uint8_t *buf, int len)
        int rc;
        
        rc = ssl_write(ssl, buf, len);
-#ifdef POLARSSL_API_V1         
        if (rc == POLARSSL_ERR_NET_WANT_WRITE)
-#else
-       if (rc == POLARSSL_ERR_NET_TRY_AGAIN)
-#endif
                return SSLI_ERROR_WANT_WRITE;
        return rc;
 }
@@ -312,7 +325,10 @@ void SSLi_shutdown(SSL_handle_t *ssl)
 void SSLi_free(SSL_handle_t *ssl)
 {
        Log_debug("SSLi_free");
-       free(ssl->session); /* XXX - Hmmm. */
+#if (POLARSSL_VERSION_MINOR <= 2 && POLARSSL_VERSION_PATCH < 6)
+       free(ssl->session); /* Workaround for memory leak in PolarSSL < 1.2.6 */
+       ssl->session = NULL;
+#endif
        ssl_free(ssl);
        free(ssl);
 }
@@ -405,23 +421,15 @@ static RSA *SSL_readprivatekey(char *keyfile)
 static void SSL_writecert(char *certfile, X509 *x509)
 {
        FILE *fp;
-       BIO *err_output;
-       
-       /* prepare a BIO for outputting error messages */
-       
-       err_output = BIO_new_fp(stderr,BIO_NOCLOSE);
-       
+               
        /* open the private key file */
        fp = fopen(certfile, "w");
        if (fp == NULL) {
-               BIO_printf(err_output, "Unable to open the X509 file for writing.\n");
-               BIO_free(err_output);
+               Log_warn("Unable to open the X509 file %s for writing", certfile);
                return;
-       }
-               
+       }               
        if (PEM_write_X509(fp, x509) == 0) {
-               BIO_printf(err_output, "Error trying to write X509 info.\n");
-               ERR_print_errors(err_output);
+               Log_warn("Error trying to write X509 info.");
        }
        fclose(fp);
 }
@@ -429,22 +437,16 @@ static void SSL_writecert(char *certfile, X509 *x509)
 static void SSL_writekey(char *keyfile, RSA *rsa)
 {
        FILE *fp;
-       BIO *err_output;
-       /* prepare a BIO for outputing error messages */        
-       err_output = BIO_new_fp(stderr, BIO_NOCLOSE);
        
        /* open the private key file for reading */
        fp = fopen(keyfile, "w");
        if (fp == NULL) {
-               BIO_printf(err_output, "Unable to open the private key file %s for writing.\n", keyfile);
-               BIO_free(err_output);
+               Log_warn("Unable to open the private key file %s for writing.", keyfile);
                return;
        }
        
        if (PEM_write_RSAPrivateKey(fp, rsa, NULL, NULL, 0, NULL, NULL) == 0) {
-               /* error reading the key - check the error stack */
-               BIO_printf(err_output, "Error trying to write private key\n");
-               ERR_print_errors(err_output);
+               Log_warn("Error trying to write private key");
        }
        fclose(fp);
 }
@@ -495,14 +497,11 @@ static void SSL_initializeCert() {
 #endif
        
        if (!rsa || !x509) {
-               logthis("Generating new server certificate.");
+               Log_info("Generating new server certificate.");
 
-               BIO *bio_err;
                
                CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-               
-               bio_err=BIO_new_fp(stderr, BIO_NOCLOSE);
-               
+                               
                x509 = X509_new();
                pkey = EVP_PKEY_new();
                rsa = RSA_generate_key(1024,RSA_F4,NULL,NULL);