Preparation for GnuTLS support
authorFelix Morgner <felix.morgner@gmail.com>
Thu, 17 Apr 2014 08:13:34 +0000 (10:13 +0200)
committerFelix Morgner <felix.morgner@gmail.com>
Thu, 17 Apr 2014 08:13:34 +0000 (10:13 +0200)
CMakeLists.txt
src/CMakeLists.txt
src/ssl.c [deleted file]
src/ssli_openssl.c [new file with mode: 0644]
src/ssli_polarssl.c [new file with mode: 0644]

index 6e81c3c12906a2bd8cd14367e9455b155c32a73c..7ff95a019e777695b7bd49f50a8d33234cdc593f 100644 (file)
@@ -9,9 +9,9 @@ option(USE_POLARSSL_TESTCERT "Link to the PolarSSL test certificate and key." OF
 option(USE_POLARSSL_HAVEGE "Use the PolarSSL HAVEGE random generator key." OFF)
 
 if(USE_POLARSSL_TESTCERT OR USE_POLARSSL_HAVEGE)
-  if(SSL MATCHES "openssl")
+  if(SSL MATCHES "openssl" OR SSL MATCHES "gnutls")
     message(FATAL_ERROR "Selecting USE_POLARSSL_TESTCERT or USE_POLARSSL_HAVEGE implies SSL=polarssl")
-  endif(SSL MATCHES "openssl")
+  endif(SSL MATCHES "openssl" OR SSL MATCHES "gnutls")
 endif(USE_POLARSSL_TESTCERT OR USE_POLARSSL_HAVEGE)
 
 find_package(Libconfig REQUIRED)
@@ -19,14 +19,18 @@ find_package(ProtobufC REQUIRED)
 include(CheckFunctionExists)
 include(CheckLibraryExists)
 
-if(SSL MATCHES "openssl")
+if("${SSL}" STREQUAL "")
+  set(SSL "polarssl")
+endif("${SSL}" STREQUAL "")
+
+if("${SSL}" STREQUAL "openssl")
   find_package(OpenSSL REQUIRED)
   if(OPENSSL_FOUND)
     set(SSLIMP_LIBRARIES ${OPENSSL_LIBRARIES})
     set(SSLIMP_INCLUDE_DIR ${OPENSSL_INCLUDE_DIR})
     set(SSLIMP_LIBRARY_DIR ${OPENSSL_LIB_DIR})
   endif(OPENSSL_FOUND)
-else(SSL MATCHES "openssl")
+elseif("${SSL}" STREQUAL "polarssl")
   find_package(PolarSSL REQUIRED)
   if(POLARSSL_FOUND)
     set(USE_POLARSSL ON)
@@ -34,7 +38,14 @@ else(SSL MATCHES "openssl")
     set(SSLIMP_INCLUDE_DIR ${POLARSSL_INCLUDE_DIR})
     set(SSLIMP_LIBRARY_DIR ${POLARSSL_LIB_DIR})
   endif(POLARSSL_FOUND)
-endif(SSL MATCHES "openssl")
+elseif("${SSL}" STREQUAL "gnutls")
+  find_package(GnuTLS REQUIRED)
+  if(GNUTLS_FOUND)
+    set(SSLIMP_LIBRARIES ${GNUTLS_LIBRARIES})
+    set(SSLIMP_INCLUDE_DIR ${GNUTLS_INCLUDE_DIR})
+    set(SSLIMP_LIBRARY_DIR ${GNUTLS_LIB_DIR})
+  endif(GNUTLS_FOUND)
+endif("${SSL}" STREQUAL "openssl")
 
 check_library_exists(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME_RT)
 
index 58288f5cd74774a667802d820611b12a51ebfa9b..465b133a997ef01aa36d73d90b886b6b9c5c19e8 100644 (file)
@@ -1,20 +1,27 @@
-set(SOURCE
-   ${SOURCE}
-   ${CMAKE_CURRENT_SOURCE_DIR}/Mumble.pb-c.c
-   ${CMAKE_CURRENT_SOURCE_DIR}/ban.c
-   ${CMAKE_CURRENT_SOURCE_DIR}/channel.c
-   ${CMAKE_CURRENT_SOURCE_DIR}/client.c
-   ${CMAKE_CURRENT_SOURCE_DIR}/conf.c
-   ${CMAKE_CURRENT_SOURCE_DIR}/crypt.c
-   ${CMAKE_CURRENT_SOURCE_DIR}/log.c
-   ${CMAKE_CURRENT_SOURCE_DIR}/main.c
-   ${CMAKE_CURRENT_SOURCE_DIR}/messagehandler.c
-   ${CMAKE_CURRENT_SOURCE_DIR}/messages.c
-   ${CMAKE_CURRENT_SOURCE_DIR}/pds.c
-   ${CMAKE_CURRENT_SOURCE_DIR}/server.c
-   ${CMAKE_CURRENT_SOURCE_DIR}/ssl.c
-   ${CMAKE_CURRENT_SOURCE_DIR}/timer.c
-   ${CMAKE_CURRENT_SOURCE_DIR}/voicetarget.c
+set(SOURCE_FILES
+  ${CMAKE_CURRENT_SOURCE_DIR}/Mumble.pb-c.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ban.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/channel.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/client.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/conf.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/crypt.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/log.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/main.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/messagehandler.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/messages.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/pds.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/server.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/timer.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/voicetarget.c
+  )
+
+if(SSL MATCHES "openssl")
+  list(APPEND SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/ssli_openssl.c)
+elseif(SSL MATCHES "polarssl")
+  list(APPEND SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/ssli_polarssl.c)
+elseif(SSL MATCHES "gnutls")
+  list(APPEND SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/ssli_gnutls.c)
+endif(SSL MATCHES "openssl")
+
+set(SOURCE ${SOURCE} ${SOURCE_FILES} PARENT_SCOPE)
 
-   PARENT_SCOPE
-)
diff --git a/src/ssl.c b/src/ssl.c
deleted file mode 100644 (file)
index 62257d0..0000000
--- a/src/ssl.c
+++ /dev/null
@@ -1,791 +0,0 @@
-/* Copyright (C) 2009-2014, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
-
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   - Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   - Redistributions in binary form must reproduce the above copyright notice,
-     this list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
-   - Neither the name of the Developers nor the names of its contributors may
-     be used to endorse or promote products derived from this software without
-     specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#include <string.h>
-#include <stdlib.h>
-#include <fcntl.h>
-
-#include "conf.h"
-#include "log.h"
-#include "ssl.h"
-
-#ifdef USE_POLARSSL
-/*
- * PolarSSL interface
- */
-
-#include <polarssl/config.h>
-#include <polarssl/havege.h>
-#include <polarssl/certs.h>
-#include <polarssl/x509.h>
-#include <polarssl/ssl.h>
-#include <polarssl/net.h>
-
-#ifdef POLARSSL_API_V1_2_ABOVE
-int ciphers[] =
-{
-    TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
-    TLS_RSA_WITH_AES_256_CBC_SHA,
-    TLS_RSA_WITH_AES_128_CBC_SHA,
-    0
-};
-#else
-int ciphers[] =
-{
-    SSL_EDH_RSA_AES_256_SHA,
-    SSL_RSA_AES_256_SHA,
-    SSL_RSA_AES_128_SHA,
-    0
-};
-#endif
-
-#ifdef POLARSSL_API_V1_3_ABOVE
-static x509_crt certificate;
-static inline int x509parse_keyfile(rsa_context *rsa, const char *path,
-                                    const char *pwd)
-{
-    int ret;
-    pk_context pk;
-
-    pk_init(&pk);
-    ret = pk_parse_keyfile(&pk, path, pwd);
-    if (ret == 0 && !pk_can_do( &pk, POLARSSL_PK_RSA))
-        ret = POLARSSL_ERR_PK_TYPE_MISMATCH;
-    if (ret == 0)
-        rsa_copy(rsa, pk_rsa(pk));
-    else
-        rsa_free(rsa);
-    pk_free(&pk);
-    return ret;
-}
-#else
-static x509_cert certificate;
-#endif
-
-static rsa_context key;
-bool_t builtInTestCertificate;
-
-#ifdef USE_POLARSSL_HAVEGE
-havege_state hs;
-#else
-int urandom_fd;
-#endif
-
-/* DH prime */
-char *my_dhm_P =
-       "9CE85640903BF123906947FEDE767261" \
-       "D9B4A973EB8F7D984A8C656E2BCC161C" \
-       "183D4CA471BA78225F940F16D1D99CA3" \
-       "E66152CC68EDCE1311A390F307741835" \
-       "44FF6AB553EC7073AD0CB608F2A3B480" \
-       "19E6C02BCED40BD30E91BB2469089670" \
-       "DEF409C08E8AC24D1732A6128D2220DC53";
-char *my_dhm_G = "4";
-
-#ifdef USE_POLARSSL_TESTCERT
-static void initTestCert()
-{
-       int rc;
-       builtInTestCertificate = true;
-#ifdef POLARSSL_API_V1_3_ABOVE
-       rc = x509_crt_parse_rsa(&certificate, (unsigned char *)test_srv_crt,
-               strlen(test_srv_crt));
-#else
-       rc = x509parse_crt(&certificate, (unsigned char *)test_srv_crt,
-               strlen(test_srv_crt));
-#endif
-       if (rc != 0)
-               Log_fatal("Could not parse built-in test certificate");
-}
-
-static void initTestKey()
-{
-       int rc;
-
-       rc = x509parse_key_rsa(&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");
-}
-#endif
-
-/*
- * How to generate a self-signed cert with openssl:
- * 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);
-
-       if (crtfile == NULL) {
-#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;
-       }
-#ifdef POLARSSL_API_V1_3_ABOVE
-       rc = x509_crt_parse_file(&certificate, crtfile);
-#else
-       rc = x509parse_crtfile(&certificate, crtfile);
-#endif
-       if (rc != 0) {
-#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;
-       }
-}
-
-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);
-       if (rc != 0)
-               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)
-{
-    if (level <= DEBUG_LEVEL)
-               Log_info("PolarSSL [level %d]: %s", level, str);
-}
-
-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 key and self-signed certificate ***");
-               initTestKey();
-       }
-       else
-               initKey();
-#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
-
-    version_get_string(verstring);
-    Log_info("PolarSSL library version %s initialized", verstring);
-}
-
-void SSLi_deinit(void)
-{
-#ifdef POLARSSL_API_V1_3_ABOVE
-       x509_crt_free(&certificate);
-#else
-       x509_free(&certificate);
-#endif
-       rsa_free(&key);
-}
-
-/* Create SHA1 of last certificate in the peer's chain. */
-bool_t SSLi_getSHA1Hash(SSL_handle_t *ssl, uint8_t *hash)
-{
-#ifdef POLARSSL_API_V1_3_ABOVE
-       x509_crt const *cert;
-#else
-       x509_cert const *cert;
-#endif
-#ifdef POLARSSL_API_V1_2_ABOVE
-       cert = ssl_get_peer_cert(ssl);
-#else
-       cert = ssl->peer_cert;
-#endif
-       if (!cert) {
-               return false;
-       }
-       sha1(cert->raw.p, cert->raw.len, hash);
-       return true;
-}
-
-SSL_handle_t *SSLi_newconnection(int *fd, bool_t *SSLready)
-{
-       ssl_context *ssl;
-       ssl_session *ssn;
-       int rc;
-
-       ssl = malloc(sizeof(ssl_context));
-       ssn = malloc(sizeof(ssl_session));
-       if (!ssl || !ssn)
-               Log_fatal("Out of memory");
-       memset(ssl, 0, sizeof(ssl_context));
-       memset(ssn, 0, sizeof(ssl_session));
-
-       rc = ssl_init(ssl);
-       if (rc != 0 )
-               Log_fatal("Failed to initialize: %d", rc);
-
-       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);
-
-       ssl_set_ciphersuites(ssl, ciphers);
-
-#ifdef POLARSSL_API_V1_2_ABOVE
-    ssl_set_session(ssl, ssn);
-#else
-    ssl_set_session(ssl, 0, 0, ssn);
-#endif
-
-    ssl_set_ca_chain(ssl, &certificate, NULL, NULL);
-#ifdef POLARSSL_API_V1_3_ABOVE
-       ssl_set_own_cert_rsa(ssl, &certificate, &key);
-#else
-       ssl_set_own_cert(ssl, &certificate, &key);
-#endif
-       ssl_set_dh_param(ssl, my_dhm_P, my_dhm_G);
-
-       return ssl;
-}
-
-int SSLi_nonblockaccept(SSL_handle_t *ssl, bool_t *SSLready)
-{
-       int rc;
-
-       rc = ssl_handshake(ssl);
-       if (rc != 0) {
-               if (rc == POLARSSL_ERR_NET_WANT_READ || rc == POLARSSL_ERR_NET_WANT_WRITE) {
-                       return 0;
-               } else if (rc == POLARSSL_ERR_X509_CERT_VERIFY_FAILED) { /* Allow this (selfsigned etc) */
-                       return 0;
-               } else {
-                       Log_warn("SSL handshake failed: %d", rc);
-                       return -1;
-               }
-       }
-       *SSLready = true;
-       return 0;
-}
-
-int SSLi_read(SSL_handle_t *ssl, uint8_t *buf, int len)
-{
-       int rc;
-
-       rc = ssl_read(ssl, buf, len);
-       if (rc == POLARSSL_ERR_NET_WANT_READ)
-               return SSLI_ERROR_WANT_READ;
-       return rc;
-}
-
-int SSLi_write(SSL_handle_t *ssl, uint8_t *buf, int len)
-{
-       int rc;
-
-       rc = ssl_write(ssl, buf, len);
-       if (rc == POLARSSL_ERR_NET_WANT_WRITE)
-               return SSLI_ERROR_WANT_WRITE;
-       return rc;
-}
-
-int SSLi_get_error(SSL_handle_t *ssl, int code)
-{
-       return code;
-}
-
-bool_t SSLi_data_pending(SSL_handle_t *ssl)
-{
-       return ssl_get_bytes_avail(ssl) > 0;
-}
-
-void SSLi_shutdown(SSL_handle_t *ssl)
-{
-       ssl_close_notify(ssl);
-}
-
-void SSLi_free(SSL_handle_t *ssl)
-{
-       Log_debug("SSLi_free");
-#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);
-}
-
-#else
-/*
- * OpenSSL interface
- */
-
-#include <openssl/x509v3.h>
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <openssl/safestack.h>
-static X509 *x509;
-static RSA *rsa;
-static SSL_CTX *context;
-static EVP_PKEY *pkey;
-
-static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx);
-
-static int SSL_add_ext(X509 * crt, int nid, char *value) {
-       X509_EXTENSION *ex;
-       X509V3_CTX ctx;
-       X509V3_set_ctx_nodb(&ctx);
-       X509V3_set_ctx(&ctx, crt, crt, NULL, NULL, 0);
-       ex = X509V3_EXT_conf_nid(NULL, &ctx, nid, value);
-       if (!ex)
-               return 0;
-
-       X509_add_ext(crt, ex, -1);
-       X509_EXTENSION_free(ex);
-       return 1;
-}
-
-static X509 *SSL_readcert(char *certfile)
-{
-       FILE *fp;
-       X509 *x509;
-
-       /* open the certificate file */
-       fp = fopen(certfile, "r");
-       if (fp == NULL) {
-               Log_warn("Unable to open the X509 file %s for reading.", certfile);
-               return NULL;
-       }
-
-       /* allocate memory for the cert structure */
-       x509 = X509_new();
-
-       if (PEM_read_X509(fp, &x509, NULL, NULL) == 0) {
-               /* error reading the x509 information - check the error stack */
-               Log_warn("Error trying to read X509 info.");
-               fclose(fp);
-               X509_free(x509);
-               return NULL;
-       }
-       fclose(fp);
-       return x509;
-}
-
-static RSA *SSL_readprivatekey(char *keyfile)
-{
-       FILE *fp;
-       RSA *rsa;
-
-/* open the private key file for reading */
-       fp = fopen(keyfile, "r");
-       if (fp == NULL) {
-               Log_warn("Unable to open the private key file %s for reading.", keyfile);
-               return NULL;
-       }
-
-/* allocate memory for the RSA structure */
-       rsa = RSA_new();
-
-       /* assign a callback function for the password */
-
-       /* read a private key from file */
-       if (PEM_read_RSAPrivateKey(fp, &rsa, NULL, NULL) <= 0) {
-               /* error reading the key - check the error stack */
-               Log_warn("Error trying to read private key.");
-               RSA_free(rsa);
-               fclose(fp);
-               return NULL;
-       }
-       fclose(fp);
-       return rsa;
-}
-
-static void SSL_writecert(char *certfile, X509 *x509)
-{
-       FILE *fp;
-
-       /* open the private key file */
-       fp = fopen(certfile, "w");
-       if (fp == NULL) {
-               Log_warn("Unable to open the X509 file %s for writing", certfile);
-               return;
-       }
-       if (PEM_write_X509(fp, x509) == 0) {
-               Log_warn("Error trying to write X509 info.");
-       }
-       fclose(fp);
-}
-
-static void SSL_writekey(char *keyfile, RSA *rsa)
-{
-       FILE *fp;
-
-       /* open the private key file for reading */
-       fp = fopen(keyfile, "w");
-       if (fp == NULL) {
-               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) {
-               Log_warn("Error trying to write private key");
-       }
-       fclose(fp);
-}
-
-static void SSL_initializeCert() {
-
-       char *crt, *key, *pass;
-
-       crt = (char *)getStrConf(CERTIFICATE);
-       key = (char *)getStrConf(KEY);
-       pass = (char *)getStrConf(PASSPHRASE);
-
-       x509 = SSL_readcert(crt);
-       rsa = SSL_readprivatekey(key);
-       if (rsa != NULL) {
-               pkey = EVP_PKEY_new();
-               EVP_PKEY_assign_RSA(pkey, rsa);
-       }
-
-
-#if 0
-       /* Later ... */
-       if (key && !x509) {
-               qscCert = QSslCertificate(key);
-               if (! qscCert.isNull()) {
-                       logthis("Using certificate from key.");
-               }
-       }
-
-       if (! qscCert.isNull()) {
-               QSsl::KeyAlgorithm alg = qscCert.publicKey().algorithm();
-               /* Fetch algorith from cert */
-               if (! key.isEmpty()) {
-                       /* get key */
-                       qskKey = QSslKey(key, alg, QSsl::Pem, QSsl::PrivateKey, pass);
-                       if (qskKey.isNull()) {
-                               logthis("Failed to parse key.");
-                       }
-               }
-
-               if (! crt.isEmpty() && qskKey.isNull()) {
-                       /* get key from certificate */
-                       qskKey = QSslKey(crt, alg, QSsl::Pem, QSsl::PrivateKey, pass);
-                       if (! qskKey.isNull()) {
-                               logthis("Using key from certificate.");
-                       }
-               }
-
-       }
-#endif
-
-       if (!rsa || !x509) {
-               Log_info("Generating new server certificate.");
-
-
-               CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-
-               x509 = X509_new();
-               pkey = EVP_PKEY_new();
-               rsa = RSA_generate_key(1024,RSA_F4,NULL,NULL);
-               EVP_PKEY_assign_RSA(pkey, rsa);
-
-               X509_set_version(x509, 2);
-               ASN1_INTEGER_set(X509_get_serialNumber(x509),1);
-               X509_gmtime_adj(X509_get_notBefore(x509),0);
-               X509_gmtime_adj(X509_get_notAfter(x509),60*60*24*365);
-               X509_set_pubkey(x509, pkey);
-
-               X509_NAME *name=X509_get_subject_name(x509);
-
-               X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC, (const uint8_t *)"Murmur Autogenerated Certificate v2", -1, -1, 0);
-               X509_set_issuer_name(x509, name);
-               SSL_add_ext(x509, NID_basic_constraints, "critical,CA:FALSE");
-               SSL_add_ext(x509, NID_ext_key_usage, "serverAuth,clientAuth");
-               SSL_add_ext(x509, NID_subject_key_identifier, "hash");
-               SSL_add_ext(x509, NID_netscape_comment, "Generated from umurmur");
-
-               X509_sign(x509, pkey, EVP_md5());
-
-               SSL_writecert(crt, x509);
-               SSL_writekey(key, rsa);
-       }
-
-}
-
-void SSLi_init(void)
-{
-       const SSL_METHOD *method;
-       SSL *ssl;
-       int i, offset = 0, cipherstringlen = 0;
-       STACK_OF(SSL_CIPHER) *cipherlist = NULL, *cipherlist_new = NULL;
-       SSL_CIPHER *cipher;
-       char *cipherstring, tempstring[128];
-
-       SSL_library_init();
-       OpenSSL_add_all_algorithms();           /* load & register all cryptos, etc. */
-       SSL_load_error_strings();                       /* load all error messages */
-       ERR_load_crypto_strings();                      /* load all error messages */
-       method = SSLv23_server_method();                /* create new server-method instance */
-       context = SSL_CTX_new(method);                  /* create new context from method */
-       if (context == NULL)
-       {
-               ERR_print_errors_fp(stderr);
-               abort();
-       }
-
-       char* sslCAPath = getStrConf(CAPATH);
-       if(sslCAPath != NULL)
-       {
-               SSL_CTX_load_verify_locations(context, NULL, sslCAPath);
-       }
-
-       SSL_initializeCert();
-       if (SSL_CTX_use_certificate(context, x509) <= 0)
-               Log_fatal("Failed to initialize cert");
-       if (SSL_CTX_use_PrivateKey(context, pkey) <= 0) {
-               ERR_print_errors_fp(stderr);
-               Log_fatal("Failed to initialize private key");
-       }
-
-       /* Set cipher list */
-       ssl = SSL_new(context);
-       cipherlist = (STACK_OF(SSL_CIPHER) *) SSL_get_ciphers(ssl);
-       cipherlist_new = (STACK_OF(SSL_CIPHER) *) sk_SSL_CIPHER_new_null();
-
-       for ( i = 0; (cipher = sk_SSL_CIPHER_value(cipherlist, i)) != NULL; i++) {
-               if (SSL_CIPHER_get_bits(cipher, NULL) >= 128) {
-                       sk_SSL_CIPHER_push(cipherlist_new, cipher);
-               }
-       }
-       Log_debug("List of ciphers:");
-       if (cipherlist_new) {
-               for (i = 0; (cipher = sk_SSL_CIPHER_value(cipherlist_new, i)) != NULL; i++) {
-                       Log_debug("%s", SSL_CIPHER_get_name(cipher));
-                       cipherstringlen += strlen(SSL_CIPHER_get_name(cipher)) + 1;
-               }
-               cipherstring = malloc(cipherstringlen + 1);
-               if (cipherstring == NULL)
-                       Log_fatal("Out of memory");
-               for (i = 0; (cipher = sk_SSL_CIPHER_value(cipherlist_new, i)) != NULL; i++) {
-                       offset += sprintf(cipherstring + offset, "%s:", SSL_CIPHER_get_name(cipher));
-               }
-       }
-
-       if (cipherlist_new)
-               sk_SSL_CIPHER_free(cipherlist_new);
-
-       if (strlen(cipherstring) == 0)
-               Log_fatal("No suitable ciphers found!");
-
-       if (SSL_CTX_set_cipher_list(context, cipherstring) == 0)
-               Log_fatal("Failed to set cipher list!");
-
-       free(cipherstring);
-
-       SSL_CTX_set_verify(context, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
-                          verify_callback);
-
-       SSL_free(ssl);
-       Log_info("OpenSSL library initialized");
-
-}
-
-void SSLi_deinit(void)
-{
-       SSL_CTX_free(context);
-       EVP_cleanup();
-}
-
-int SSLi_nonblockaccept(SSL_handle_t *ssl, bool_t *SSLready)
-{
-       int rc;
-       rc = SSL_accept(ssl);
-       if (rc < 0) {
-               if (SSL_get_error(ssl, rc) == SSL_ERROR_WANT_READ ||
-                       SSL_get_error(ssl, rc) == SSL_ERROR_WANT_WRITE) {
-                       Log_debug("SSL not ready");
-                       return 0;
-               } else {
-                       Log_warn("SSL error: %s", ERR_error_string(SSL_get_error(ssl, rc), NULL));
-                       return -1;
-               }
-       }
-       *SSLready = true;
-       return 0;
-}
-
-SSL_handle_t *SSLi_newconnection(int *fd, bool_t *SSLready)
-{
-       SSL *ssl;
-
-       *SSLready = false;
-       ssl = SSL_new(context);
-       SSL_set_fd(ssl, *fd);
-       if (SSLi_nonblockaccept(ssl, SSLready) < 0) {
-               SSL_free(ssl);
-               return NULL;
-       }
-       return ssl;
-}
-
-/* Create SHA1 of last certificate in the peer's chain. */
-bool_t SSLi_getSHA1Hash(SSL_handle_t *ssl, uint8_t *hash)
-{
-       X509 *x509;
-       uint8_t *buf, *p;
-       int len;
-
-       x509 = SSL_get_peer_certificate(ssl);
-       if (!x509) {
-               return false;
-       }
-
-       len = i2d_X509(x509, NULL);
-       buf = malloc(len);
-       if (buf == NULL) {
-               Log_fatal("malloc");
-       }
-
-       p = buf;
-       i2d_X509(x509, &p);
-
-       SHA1(buf, len, hash);
-       free(buf);
-       return true;
-}
-
-void SSLi_closeconnection(SSL_handle_t *ssl)
-{
-       SSL_free(ssl);
-}
-
-void SSLi_shutdown(SSL_handle_t *ssl)
-{
-       SSL_shutdown(ssl);
-}
-
-int SSLi_read(SSL_handle_t *ssl, uint8_t *buf, int len)
-{
-       return SSL_read(ssl, buf, len);
-}
-
-int SSLi_write(SSL_handle_t *ssl, uint8_t *buf, int len)
-{
-       return SSL_write(ssl, buf, len);
-}
-
-int SSLi_get_error(SSL_handle_t *ssl, int code)
-{
-       return SSL_get_error(ssl, code);
-}
-
-bool_t SSLi_data_pending(SSL_handle_t *ssl)
-{
-       return SSL_pending(ssl);
-}
-
-void SSLi_free(SSL_handle_t *ssl)
-{
-       SSL_free(ssl);
-}
-
-static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
-{
-       char    buf[256];
-       X509   *err_cert;
-       int     err, depth;
-       SSL    *ssl;
-
-    err_cert = X509_STORE_CTX_get_current_cert(ctx);
-    err = X509_STORE_CTX_get_error(ctx);
-    depth = X509_STORE_CTX_get_error_depth(ctx);
-
-    ssl = X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());
-    X509_NAME_oneline(X509_get_subject_name(err_cert), buf, 256);
-
-    if (depth > 5) {
-        preverify_ok = 0;
-        err = X509_V_ERR_CERT_CHAIN_TOO_LONG;
-        X509_STORE_CTX_set_error(ctx, err);
-    }
-    if (!preverify_ok) {
-           Log_warn("SSL: verify error:num=%d:%s:depth=%d:%s\n", err,
-                    X509_verify_cert_error_string(err), depth, buf);
-    }
-    /*
-     * At this point, err contains the last verification error. We can use
-     * it for something special
-     */
-    if (!preverify_ok && (err == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT)) {
-           X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf, 256);
-           Log_warn("issuer= %s", buf);
-    }
-    return 1;
-}
-
-#endif
diff --git a/src/ssli_openssl.c b/src/ssli_openssl.c
new file mode 100644 (file)
index 0000000..470332c
--- /dev/null
@@ -0,0 +1,446 @@
+/* Copyright (C) 2009-2014, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
+
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+   - Neither the name of the Developers nor the names of its contributors may
+     be used to endorse or promote products derived from this software without
+     specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#include <string.h>
+#include <stdlib.h>
+#include <fcntl.h>
+
+#include "conf.h"
+#include "log.h"
+#include "ssl.h"
+
+/*
+ * OpenSSL interface
+ */
+
+#include <openssl/x509v3.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <openssl/safestack.h>
+static X509 *x509;
+static RSA *rsa;
+static SSL_CTX *context;
+static EVP_PKEY *pkey;
+
+static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx);
+
+static int SSL_add_ext(X509 * crt, int nid, char *value) {
+       X509_EXTENSION *ex;
+       X509V3_CTX ctx;
+       X509V3_set_ctx_nodb(&ctx);
+       X509V3_set_ctx(&ctx, crt, crt, NULL, NULL, 0);
+       ex = X509V3_EXT_conf_nid(NULL, &ctx, nid, value);
+       if (!ex)
+               return 0;
+
+       X509_add_ext(crt, ex, -1);
+       X509_EXTENSION_free(ex);
+       return 1;
+}
+
+static X509 *SSL_readcert(char *certfile)
+{
+       FILE *fp;
+       X509 *x509;
+
+       /* open the certificate file */
+       fp = fopen(certfile, "r");
+       if (fp == NULL) {
+               Log_warn("Unable to open the X509 file %s for reading.", certfile);
+               return NULL;
+       }
+
+       /* allocate memory for the cert structure */
+       x509 = X509_new();
+
+       if (PEM_read_X509(fp, &x509, NULL, NULL) == 0) {
+               /* error reading the x509 information - check the error stack */
+               Log_warn("Error trying to read X509 info.");
+               fclose(fp);
+               X509_free(x509);
+               return NULL;
+       }
+       fclose(fp);
+       return x509;
+}
+
+static RSA *SSL_readprivatekey(char *keyfile)
+{
+       FILE *fp;
+       RSA *rsa;
+
+/* open the private key file for reading */
+       fp = fopen(keyfile, "r");
+       if (fp == NULL) {
+               Log_warn("Unable to open the private key file %s for reading.", keyfile);
+               return NULL;
+       }
+
+/* allocate memory for the RSA structure */
+       rsa = RSA_new();
+
+       /* assign a callback function for the password */
+
+       /* read a private key from file */
+       if (PEM_read_RSAPrivateKey(fp, &rsa, NULL, NULL) <= 0) {
+               /* error reading the key - check the error stack */
+               Log_warn("Error trying to read private key.");
+               RSA_free(rsa);
+               fclose(fp);
+               return NULL;
+       }
+       fclose(fp);
+       return rsa;
+}
+
+static void SSL_writecert(char *certfile, X509 *x509)
+{
+       FILE *fp;
+
+       /* open the private key file */
+       fp = fopen(certfile, "w");
+       if (fp == NULL) {
+               Log_warn("Unable to open the X509 file %s for writing", certfile);
+               return;
+       }
+       if (PEM_write_X509(fp, x509) == 0) {
+               Log_warn("Error trying to write X509 info.");
+       }
+       fclose(fp);
+}
+
+static void SSL_writekey(char *keyfile, RSA *rsa)
+{
+       FILE *fp;
+
+       /* open the private key file for reading */
+       fp = fopen(keyfile, "w");
+       if (fp == NULL) {
+               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) {
+               Log_warn("Error trying to write private key");
+       }
+       fclose(fp);
+}
+
+static void SSL_initializeCert() {
+
+       char *crt, *key, *pass;
+
+       crt = (char *)getStrConf(CERTIFICATE);
+       key = (char *)getStrConf(KEY);
+       pass = (char *)getStrConf(PASSPHRASE);
+
+       x509 = SSL_readcert(crt);
+       rsa = SSL_readprivatekey(key);
+       if (rsa != NULL) {
+               pkey = EVP_PKEY_new();
+               EVP_PKEY_assign_RSA(pkey, rsa);
+       }
+
+
+#if 0
+       /* Later ... */
+       if (key && !x509) {
+               qscCert = QSslCertificate(key);
+               if (! qscCert.isNull()) {
+                       logthis("Using certificate from key.");
+               }
+       }
+
+       if (! qscCert.isNull()) {
+               QSsl::KeyAlgorithm alg = qscCert.publicKey().algorithm();
+               /* Fetch algorith from cert */
+               if (! key.isEmpty()) {
+                       /* get key */
+                       qskKey = QSslKey(key, alg, QSsl::Pem, QSsl::PrivateKey, pass);
+                       if (qskKey.isNull()) {
+                               logthis("Failed to parse key.");
+                       }
+               }
+
+               if (! crt.isEmpty() && qskKey.isNull()) {
+                       /* get key from certificate */
+                       qskKey = QSslKey(crt, alg, QSsl::Pem, QSsl::PrivateKey, pass);
+                       if (! qskKey.isNull()) {
+                               logthis("Using key from certificate.");
+                       }
+               }
+
+       }
+#endif
+
+       if (!rsa || !x509) {
+               Log_info("Generating new server certificate.");
+
+
+               CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+
+               x509 = X509_new();
+               pkey = EVP_PKEY_new();
+               rsa = RSA_generate_key(1024,RSA_F4,NULL,NULL);
+               EVP_PKEY_assign_RSA(pkey, rsa);
+
+               X509_set_version(x509, 2);
+               ASN1_INTEGER_set(X509_get_serialNumber(x509),1);
+               X509_gmtime_adj(X509_get_notBefore(x509),0);
+               X509_gmtime_adj(X509_get_notAfter(x509),60*60*24*365);
+               X509_set_pubkey(x509, pkey);
+
+               X509_NAME *name=X509_get_subject_name(x509);
+
+               X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC, (const uint8_t *)"Murmur Autogenerated Certificate v2", -1, -1, 0);
+               X509_set_issuer_name(x509, name);
+               SSL_add_ext(x509, NID_basic_constraints, "critical,CA:FALSE");
+               SSL_add_ext(x509, NID_ext_key_usage, "serverAuth,clientAuth");
+               SSL_add_ext(x509, NID_subject_key_identifier, "hash");
+               SSL_add_ext(x509, NID_netscape_comment, "Generated from umurmur");
+
+               X509_sign(x509, pkey, EVP_md5());
+
+               SSL_writecert(crt, x509);
+               SSL_writekey(key, rsa);
+       }
+
+}
+
+void SSLi_init(void)
+{
+       const SSL_METHOD *method;
+       SSL *ssl;
+       int i, offset = 0, cipherstringlen = 0;
+       STACK_OF(SSL_CIPHER) *cipherlist = NULL, *cipherlist_new = NULL;
+       SSL_CIPHER *cipher;
+       char *cipherstring, tempstring[128];
+
+       SSL_library_init();
+       OpenSSL_add_all_algorithms();           /* load & register all cryptos, etc. */
+       SSL_load_error_strings();                       /* load all error messages */
+       ERR_load_crypto_strings();                      /* load all error messages */
+       method = SSLv23_server_method();                /* create new server-method instance */
+       context = SSL_CTX_new(method);                  /* create new context from method */
+       if (context == NULL)
+       {
+               ERR_print_errors_fp(stderr);
+               abort();
+       }
+
+       char* sslCAPath = getStrConf(CAPATH);
+       if(sslCAPath != NULL)
+       {
+               SSL_CTX_load_verify_locations(context, NULL, sslCAPath);
+       }
+
+       SSL_initializeCert();
+       if (SSL_CTX_use_certificate(context, x509) <= 0)
+               Log_fatal("Failed to initialize cert");
+       if (SSL_CTX_use_PrivateKey(context, pkey) <= 0) {
+               ERR_print_errors_fp(stderr);
+               Log_fatal("Failed to initialize private key");
+       }
+
+       /* Set cipher list */
+       ssl = SSL_new(context);
+       cipherlist = (STACK_OF(SSL_CIPHER) *) SSL_get_ciphers(ssl);
+       cipherlist_new = (STACK_OF(SSL_CIPHER) *) sk_SSL_CIPHER_new_null();
+
+       for ( i = 0; (cipher = sk_SSL_CIPHER_value(cipherlist, i)) != NULL; i++) {
+               if (SSL_CIPHER_get_bits(cipher, NULL) >= 128) {
+                       sk_SSL_CIPHER_push(cipherlist_new, cipher);
+               }
+       }
+       Log_debug("List of ciphers:");
+       if (cipherlist_new) {
+               for (i = 0; (cipher = sk_SSL_CIPHER_value(cipherlist_new, i)) != NULL; i++) {
+                       Log_debug("%s", SSL_CIPHER_get_name(cipher));
+                       cipherstringlen += strlen(SSL_CIPHER_get_name(cipher)) + 1;
+               }
+               cipherstring = malloc(cipherstringlen + 1);
+               if (cipherstring == NULL)
+                       Log_fatal("Out of memory");
+               for (i = 0; (cipher = sk_SSL_CIPHER_value(cipherlist_new, i)) != NULL; i++) {
+                       offset += sprintf(cipherstring + offset, "%s:", SSL_CIPHER_get_name(cipher));
+               }
+       }
+
+       if (cipherlist_new)
+               sk_SSL_CIPHER_free(cipherlist_new);
+
+       if (strlen(cipherstring) == 0)
+               Log_fatal("No suitable ciphers found!");
+
+       if (SSL_CTX_set_cipher_list(context, cipherstring) == 0)
+               Log_fatal("Failed to set cipher list!");
+
+       free(cipherstring);
+
+       SSL_CTX_set_verify(context, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
+                          verify_callback);
+
+       SSL_free(ssl);
+       Log_info("OpenSSL library initialized");
+
+}
+
+void SSLi_deinit(void)
+{
+       SSL_CTX_free(context);
+       EVP_cleanup();
+}
+
+int SSLi_nonblockaccept(SSL_handle_t *ssl, bool_t *SSLready)
+{
+       int rc;
+       rc = SSL_accept(ssl);
+       if (rc < 0) {
+               if (SSL_get_error(ssl, rc) == SSL_ERROR_WANT_READ ||
+                       SSL_get_error(ssl, rc) == SSL_ERROR_WANT_WRITE) {
+                       Log_debug("SSL not ready");
+                       return 0;
+               } else {
+                       Log_warn("SSL error: %s", ERR_error_string(SSL_get_error(ssl, rc), NULL));
+                       return -1;
+               }
+       }
+       *SSLready = true;
+       return 0;
+}
+
+SSL_handle_t *SSLi_newconnection(int *fd, bool_t *SSLready)
+{
+       SSL *ssl;
+
+       *SSLready = false;
+       ssl = SSL_new(context);
+       SSL_set_fd(ssl, *fd);
+       if (SSLi_nonblockaccept(ssl, SSLready) < 0) {
+               SSL_free(ssl);
+               return NULL;
+       }
+       return ssl;
+}
+
+/* Create SHA1 of last certificate in the peer's chain. */
+bool_t SSLi_getSHA1Hash(SSL_handle_t *ssl, uint8_t *hash)
+{
+       X509 *x509;
+       uint8_t *buf, *p;
+       int len;
+
+       x509 = SSL_get_peer_certificate(ssl);
+       if (!x509) {
+               return false;
+       }
+
+       len = i2d_X509(x509, NULL);
+       buf = malloc(len);
+       if (buf == NULL) {
+               Log_fatal("malloc");
+       }
+
+       p = buf;
+       i2d_X509(x509, &p);
+
+       SHA1(buf, len, hash);
+       free(buf);
+       return true;
+}
+
+void SSLi_closeconnection(SSL_handle_t *ssl)
+{
+       SSL_free(ssl);
+}
+
+void SSLi_shutdown(SSL_handle_t *ssl)
+{
+       SSL_shutdown(ssl);
+}
+
+int SSLi_read(SSL_handle_t *ssl, uint8_t *buf, int len)
+{
+       return SSL_read(ssl, buf, len);
+}
+
+int SSLi_write(SSL_handle_t *ssl, uint8_t *buf, int len)
+{
+       return SSL_write(ssl, buf, len);
+}
+
+int SSLi_get_error(SSL_handle_t *ssl, int code)
+{
+       return SSL_get_error(ssl, code);
+}
+
+bool_t SSLi_data_pending(SSL_handle_t *ssl)
+{
+       return SSL_pending(ssl);
+}
+
+void SSLi_free(SSL_handle_t *ssl)
+{
+       SSL_free(ssl);
+}
+
+static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
+{
+       char    buf[256];
+       X509   *err_cert;
+       int     err, depth;
+       SSL    *ssl;
+
+    err_cert = X509_STORE_CTX_get_current_cert(ctx);
+    err = X509_STORE_CTX_get_error(ctx);
+    depth = X509_STORE_CTX_get_error_depth(ctx);
+
+    ssl = X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());
+    X509_NAME_oneline(X509_get_subject_name(err_cert), buf, 256);
+
+    if (depth > 5) {
+        preverify_ok = 0;
+        err = X509_V_ERR_CERT_CHAIN_TOO_LONG;
+        X509_STORE_CTX_set_error(ctx, err);
+    }
+    if (!preverify_ok) {
+           Log_warn("SSL: verify error:num=%d:%s:depth=%d:%s\n", err,
+                    X509_verify_cert_error_string(err), depth, buf);
+    }
+    /*
+     * At this point, err contains the last verification error. We can use
+     * it for something special
+     */
+    if (!preverify_ok && (err == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT)) {
+           X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf, 256);
+           Log_warn("issuer= %s", buf);
+    }
+    return 1;
+}
diff --git a/src/ssli_polarssl.c b/src/ssli_polarssl.c
new file mode 100644 (file)
index 0000000..b553f79
--- /dev/null
@@ -0,0 +1,379 @@
+/* Copyright (C) 2009-2014, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
+
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+   - Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+   - Neither the name of the Developers nor the names of its contributors may
+     be used to endorse or promote products derived from this software without
+     specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#include <string.h>
+#include <stdlib.h>
+#include <fcntl.h>
+
+#include "conf.h"
+#include "log.h"
+#include "ssl.h"
+
+/*
+ * PolarSSL interface
+ */
+
+#include <polarssl/config.h>
+#include <polarssl/havege.h>
+#include <polarssl/certs.h>
+#include <polarssl/x509.h>
+#include <polarssl/ssl.h>
+#include <polarssl/net.h>
+
+#ifdef POLARSSL_API_V1_2_ABOVE
+int ciphers[] =
+{
+    TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
+    TLS_RSA_WITH_AES_256_CBC_SHA,
+    TLS_RSA_WITH_AES_128_CBC_SHA,
+    0
+};
+#else
+int ciphers[] =
+{
+    SSL_EDH_RSA_AES_256_SHA,
+    SSL_RSA_AES_256_SHA,
+    SSL_RSA_AES_128_SHA,
+    0
+};
+#endif
+
+#ifdef POLARSSL_API_V1_3_ABOVE
+static x509_crt certificate;
+static inline int x509parse_keyfile(rsa_context *rsa, const char *path,
+                                    const char *pwd)
+{
+    int ret;
+    pk_context pk;
+
+    pk_init(&pk);
+    ret = pk_parse_keyfile(&pk, path, pwd);
+    if (ret == 0 && !pk_can_do( &pk, POLARSSL_PK_RSA))
+        ret = POLARSSL_ERR_PK_TYPE_MISMATCH;
+    if (ret == 0)
+        rsa_copy(rsa, pk_rsa(pk));
+    else
+        rsa_free(rsa);
+    pk_free(&pk);
+    return ret;
+}
+#else
+static x509_cert certificate;
+#endif
+
+static rsa_context key;
+bool_t builtInTestCertificate;
+
+#ifdef USE_POLARSSL_HAVEGE
+havege_state hs;
+#else
+int urandom_fd;
+#endif
+
+/* DH prime */
+char *my_dhm_P =
+       "9CE85640903BF123906947FEDE767261" \
+       "D9B4A973EB8F7D984A8C656E2BCC161C" \
+       "183D4CA471BA78225F940F16D1D99CA3" \
+       "E66152CC68EDCE1311A390F307741835" \
+       "44FF6AB553EC7073AD0CB608F2A3B480" \
+       "19E6C02BCED40BD30E91BB2469089670" \
+       "DEF409C08E8AC24D1732A6128D2220DC53";
+char *my_dhm_G = "4";
+
+#ifdef USE_POLARSSL_TESTCERT
+static void initTestCert()
+{
+       int rc;
+       builtInTestCertificate = true;
+#ifdef POLARSSL_API_V1_3_ABOVE
+       rc = x509_crt_parse_rsa(&certificate, (unsigned char *)test_srv_crt,
+               strlen(test_srv_crt));
+#else
+       rc = x509parse_crt(&certificate, (unsigned char *)test_srv_crt,
+               strlen(test_srv_crt));
+#endif
+       if (rc != 0)
+               Log_fatal("Could not parse built-in test certificate");
+}
+
+static void initTestKey()
+{
+       int rc;
+
+       rc = x509parse_key_rsa(&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");
+}
+#endif
+
+/*
+ * How to generate a self-signed cert with openssl:
+ * 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);
+
+       if (crtfile == NULL) {
+#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;
+       }
+#ifdef POLARSSL_API_V1_3_ABOVE
+       rc = x509_crt_parse_file(&certificate, crtfile);
+#else
+       rc = x509parse_crtfile(&certificate, crtfile);
+#endif
+       if (rc != 0) {
+#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;
+       }
+}
+
+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);
+       if (rc != 0)
+               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)
+{
+    if (level <= DEBUG_LEVEL)
+               Log_info("PolarSSL [level %d]: %s", level, str);
+}
+
+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 key and self-signed certificate ***");
+               initTestKey();
+       }
+       else
+               initKey();
+#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
+
+    version_get_string(verstring);
+    Log_info("PolarSSL library version %s initialized", verstring);
+}
+
+void SSLi_deinit(void)
+{
+#ifdef POLARSSL_API_V1_3_ABOVE
+       x509_crt_free(&certificate);
+#else
+       x509_free(&certificate);
+#endif
+       rsa_free(&key);
+}
+
+/* Create SHA1 of last certificate in the peer's chain. */
+bool_t SSLi_getSHA1Hash(SSL_handle_t *ssl, uint8_t *hash)
+{
+#ifdef POLARSSL_API_V1_3_ABOVE
+       x509_crt const *cert;
+#else
+       x509_cert const *cert;
+#endif
+#ifdef POLARSSL_API_V1_2_ABOVE
+       cert = ssl_get_peer_cert(ssl);
+#else
+       cert = ssl->peer_cert;
+#endif
+       if (!cert) {
+               return false;
+       }
+       sha1(cert->raw.p, cert->raw.len, hash);
+       return true;
+}
+
+SSL_handle_t *SSLi_newconnection(int *fd, bool_t *SSLready)
+{
+       ssl_context *ssl;
+       ssl_session *ssn;
+       int rc;
+
+       ssl = malloc(sizeof(ssl_context));
+       ssn = malloc(sizeof(ssl_session));
+       if (!ssl || !ssn)
+               Log_fatal("Out of memory");
+       memset(ssl, 0, sizeof(ssl_context));
+       memset(ssn, 0, sizeof(ssl_session));
+
+       rc = ssl_init(ssl);
+       if (rc != 0 )
+               Log_fatal("Failed to initialize: %d", rc);
+
+       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);
+
+       ssl_set_ciphersuites(ssl, ciphers);
+
+#ifdef POLARSSL_API_V1_2_ABOVE
+    ssl_set_session(ssl, ssn);
+#else
+    ssl_set_session(ssl, 0, 0, ssn);
+#endif
+
+    ssl_set_ca_chain(ssl, &certificate, NULL, NULL);
+#ifdef POLARSSL_API_V1_3_ABOVE
+       ssl_set_own_cert_rsa(ssl, &certificate, &key);
+#else
+       ssl_set_own_cert(ssl, &certificate, &key);
+#endif
+       ssl_set_dh_param(ssl, my_dhm_P, my_dhm_G);
+
+       return ssl;
+}
+
+int SSLi_nonblockaccept(SSL_handle_t *ssl, bool_t *SSLready)
+{
+       int rc;
+
+       rc = ssl_handshake(ssl);
+       if (rc != 0) {
+               if (rc == POLARSSL_ERR_NET_WANT_READ || rc == POLARSSL_ERR_NET_WANT_WRITE) {
+                       return 0;
+               } else if (rc == POLARSSL_ERR_X509_CERT_VERIFY_FAILED) { /* Allow this (selfsigned etc) */
+                       return 0;
+               } else {
+                       Log_warn("SSL handshake failed: %d", rc);
+                       return -1;
+               }
+       }
+       *SSLready = true;
+       return 0;
+}
+
+int SSLi_read(SSL_handle_t *ssl, uint8_t *buf, int len)
+{
+       int rc;
+
+       rc = ssl_read(ssl, buf, len);
+       if (rc == POLARSSL_ERR_NET_WANT_READ)
+               return SSLI_ERROR_WANT_READ;
+       return rc;
+}
+
+int SSLi_write(SSL_handle_t *ssl, uint8_t *buf, int len)
+{
+       int rc;
+
+       rc = ssl_write(ssl, buf, len);
+       if (rc == POLARSSL_ERR_NET_WANT_WRITE)
+               return SSLI_ERROR_WANT_WRITE;
+       return rc;
+}
+
+int SSLi_get_error(SSL_handle_t *ssl, int code)
+{
+       return code;
+}
+
+bool_t SSLi_data_pending(SSL_handle_t *ssl)
+{
+       return ssl_get_bytes_avail(ssl) > 0;
+}
+
+void SSLi_shutdown(SSL_handle_t *ssl)
+{
+       ssl_close_notify(ssl);
+}
+
+void SSLi_free(SSL_handle_t *ssl)
+{
+       Log_debug("SSLi_free");
+#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);
+}
+