*/
#include <string.h>
#include <stdlib.h>
+#include <fcntl.h>
#include "conf.h"
#include "log.h"
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 =
"DEF409C08E8AC24D1732A6128D2220DC53";
char *my_dhm_G = "4";
+#ifdef USE_POLARSSL_TESTCERT
static void initTestCert()
{
int rc;
if (rc != 0)
Log_fatal("Could not parse built-in test RSA key");
}
+#endif
/*
* How to generate a self-signed cert with openssl:
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;
}
}
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)
{
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
+
+ /* 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)
/* 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
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);
-
+
+#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);
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);
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;
}
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;
}
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);
}
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);
}
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);
}
#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);