int urandom_bytes(void *ctx, unsigned char *dest, size_t len)
{
int cur;
-
+
while (len) {
cur = read(urandom_fd, dest, len);
if (cur < 0)
urandom_fd = open("/dev/urandom", O_RDONLY);
if (urandom_fd < 0)
Log_fatal("Cannot open /dev/urandom");
- Log_info("Using random number generator /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)
if (rc != 0) {
if (rc == POLARSSL_ERR_NET_WANT_READ || rc == POLARSSL_ERR_NET_WANT_WRITE) {
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);
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);