-/* SSL support.
- Copyright (C) 2000 Free Software Foundation, Inc.
- Contributed by Christian Fraenkel.
+/* SSL support via OpenSSL library.
+ Copyright (C) 2000-2005 Free Software Foundation, Inc.
+ Originally contributed by Christian Fraenkel.
This file is part of GNU Wget.
#include "utils.h"
#include "connect.h"
#include "url.h"
+#include "gen_sslfunc.h"
#ifndef errno
extern int errno;
#endif
-void
+SSL_CTX *ssl_ctx;
+
+static void
ssl_init_prng (void)
{
/* It is likely that older versions of OpenSSL will fail on
#if SSLEAY_VERSION_NUMBER >= 0x00905100
char rand_file[256];
- int maxrand = 500;
/* First, seed from a file specified by the user. This will be
$RANDFILE, if set, or ~/.rnd. */
if (RAND_status ())
return;
- /* Get random data from EGD if opt.sslegdsock was set. */
- if (opt.sslegdsock && *opt.sslegdsock)
- RAND_egd (opt.sslegdsock);
+ /* Get random data from EGD if opt.egd_file was set. */
+ if (opt.egd_file && *opt.egd_file)
+ RAND_egd (opt.egd_file);
if (RAND_status ())
return;
return;
#endif
- /* Still not enough randomness, presumably because neither random
- file nor EGD have been available. Use the stupidest possible
- method -- seed OpenSSL's PRNG with the system's PRNG. This is
- insecure in the cryptographic sense, but people who care about
- security will use /dev/random or their own source of randomness
- anyway. */
+#if 0 /* don't do this by default */
+ {
+ int maxrand = 500;
- while (RAND_status () == 0 && maxrand-- > 0)
- {
- unsigned char rnd = random_number (256);
- RAND_seed (&rnd, sizeof (rnd));
- }
+ /* Still not random enough, presumably because neither /dev/random
+ nor EGD were available. Try to seed OpenSSL's PRNG with libc
+ PRNG. This is cryptographically weak and defeats the purpose
+ of using OpenSSL, which is why it is highly discouraged. */
+
+ logprintf (LOG_VERBOSE, _("WARNING: using a weak random seed.\n"));
+
+ while (RAND_status () == 0 && maxrand-- > 0)
+ {
+ unsigned char rnd = random_number (256);
+ RAND_seed (&rnd, sizeof (rnd));
+ }
+ }
+#endif
- if (RAND_status () == 0)
- {
- logprintf (LOG_NOTQUIET,
- _("Could not seed OpenSSL PRNG; disabling SSL.\n"));
- scheme_disable (SCHEME_HTTPS);
- }
#endif /* SSLEAY_VERSION_NUMBER >= 0x00905100 */
}
-int
+static int
verify_callback (int ok, X509_STORE_CTX *ctx)
{
char *s, buf[256];
- s = X509_NAME_oneline (X509_get_subject_name (ctx->current_cert), buf, 256);
- if (ok == 0) {
- switch (ctx->error) {
- case X509_V_ERR_CERT_NOT_YET_VALID:
- case X509_V_ERR_CERT_HAS_EXPIRED:
- /* This mean the CERT is not valid !!! */
- ok = 0;
- break;
- case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
- /* Unsure if we should handle that this way */
- ok = 1;
- break;
+ s = X509_NAME_oneline (X509_get_subject_name (ctx->current_cert),
+ buf, sizeof (buf));
+ if (ok == 0)
+ {
+ switch (ctx->error)
+ {
+ case X509_V_ERR_CERT_NOT_YET_VALID:
+ case X509_V_ERR_CERT_HAS_EXPIRED:
+ /* This mean the CERT is not valid !!! */
+ ok = 0;
+ break;
+ case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+ /* Unsure if we should handle that this way */
+ ok = 1;
+ break;
+ }
}
- }
return ok;
}
-/* pass all ssl errors to DEBUGP
- returns the number of printed errors */
-int
-ssl_printerrors (void)
+/* Print SSL errors. */
+
+static void
+ssl_print_errors (void)
{
- int ocerr = 0;
unsigned long curerr = 0;
- char errbuff[1024];
- xzero (errbuff);
while ((curerr = ERR_get_error ()) != 0)
- {
- DEBUGP (("OpenSSL: %s\n", ERR_error_string (curerr, errbuff)));
- ++ocerr;
- }
- return ocerr;
+ logprintf (LOG_NOTQUIET, "OpenSSL: %s\n", ERR_error_string (curerr, NULL));
}
/* Creates a SSL Context and sets some defaults for it */
uerr_t
-init_ssl (SSL_CTX **ctx)
+ssl_init ()
{
SSL_METHOD *meth = NULL;
- int verify;
- int can_validate;
+
+ if (ssl_ctx)
+ return 0;
+
+ /* Init the PRNG. If that fails, bail out. */
+ ssl_init_prng ();
+ if (RAND_status () == 0)
+ {
+ logprintf (LOG_NOTQUIET,
+ _("Could not seed OpenSSL PRNG; disabling SSL.\n"));
+ scheme_disable (SCHEME_HTTPS);
+ return SSLERRCTXCREATE;
+ }
+
SSL_library_init ();
SSL_load_error_strings ();
SSLeay_add_all_algorithms ();
SSLeay_add_ssl_algorithms ();
- switch (opt.sslprotocol)
+ switch (opt.secure_protocol)
{
- default:
- meth = SSLv23_client_method ();
- break;
- case 1 :
- meth = SSLv2_client_method ();
- break;
- case 2 :
- meth = SSLv3_client_method ();
- break;
- case 3 :
- meth = TLSv1_client_method ();
- break;
+ case secure_protocol_auto:
+ meth = SSLv23_client_method ();
+ break;
+ case secure_protocol_sslv2:
+ meth = SSLv2_client_method ();
+ break;
+ case secure_protocol_sslv3:
+ meth = SSLv3_client_method ();
+ break;
+ case secure_protocol_tlsv1:
+ meth = TLSv1_client_method ();
+ break;
}
if (meth == NULL)
{
- ssl_printerrors ();
+ ssl_print_errors ();
return SSLERRCTXCREATE;
}
- *ctx = SSL_CTX_new (meth);
+ ssl_ctx = SSL_CTX_new (meth);
if (meth == NULL)
{
- ssl_printerrors ();
+ ssl_print_errors ();
return SSLERRCTXCREATE;
}
- /* Can we validate the server Cert ? */
- if (opt.sslcadir != NULL || opt.sslcafile != NULL)
- {
- SSL_CTX_load_verify_locations (*ctx, opt.sslcafile, opt.sslcadir);
- can_validate = 1;
- }
- else
- {
- can_validate = 0;
- }
- if (!opt.sslcheckcert)
- {
- /* check cert but ignore error, do not break handshake on error */
- verify = SSL_VERIFY_NONE;
- }
- else
- {
- if (!can_validate)
- {
- logprintf (LOG_NOTQUIET, "Warrining validation of Server Cert not possible!\n");
- verify = SSL_VERIFY_NONE;
- }
- else
- {
- /* break handshake if server cert is not valid but allow NO-Cert mode */
- verify = SSL_VERIFY_PEER;
- }
- }
-
- SSL_CTX_set_verify (*ctx, verify, verify_callback);
+ SSL_CTX_set_default_verify_paths (ssl_ctx);
+ SSL_CTX_load_verify_locations (ssl_ctx, opt.ca_cert, opt.ca_directory);
+ SSL_CTX_set_verify (ssl_ctx,
+ opt.check_cert ? SSL_VERIFY_PEER : SSL_VERIFY_NONE,
+ verify_callback);
- if (opt.sslcertfile != NULL || opt.sslcertkey != NULL)
+ if (opt.cert_file != NULL || opt.cert_key != NULL)
{
int ssl_cert_type;
- if (!opt.sslcerttype)
- ssl_cert_type = SSL_FILETYPE_PEM;
- else
- ssl_cert_type = SSL_FILETYPE_ASN1;
+ switch (opt.cert_type)
+ {
+ case cert_type_pem:
+ ssl_cert_type = SSL_FILETYPE_PEM;
+ break;
+ case cert_type_asn1:
+ ssl_cert_type = SSL_FILETYPE_ASN1;
+ break;
+ }
- if (opt.sslcertkey == NULL)
- opt.sslcertkey = opt.sslcertfile;
- if (opt.sslcertfile == NULL)
- opt.sslcertfile = opt.sslcertkey;
+#if 0 /* what was this supposed to achieve? */
+ if (opt.cert_key == NULL)
+ opt.cert_key = opt.cert_file;
+ if (opt.cert_file == NULL)
+ opt.cert_file = opt.cert_key;
+#endif
- if (SSL_CTX_use_certificate_file (*ctx, opt.sslcertfile, ssl_cert_type) <= 0)
+ if (SSL_CTX_use_certificate_file (ssl_ctx, opt.cert_file,
+ ssl_cert_type) != 1)
{
- ssl_printerrors ();
+ ssl_print_errors ();
return SSLERRCERTFILE;
}
- if (SSL_CTX_use_PrivateKey_file (*ctx, opt.sslcertkey , ssl_cert_type) <= 0)
+ if (SSL_CTX_use_PrivateKey_file (ssl_ctx, opt.cert_key,
+ ssl_cert_type) != 1)
{
- ssl_printerrors ();
+ ssl_print_errors ();
return SSLERRCERTKEY;
}
}
return 0; /* Succeded */
}
-static
-int ssl_read (int fd, char *buf, int bufsize, void *ctx)
+static int
+ssl_read (int fd, char *buf, int bufsize, void *ctx)
{
- int res;
+ int ret;
SSL *ssl = (SSL *) ctx;
- /* #### Does SSL_read actually set EINTR? */
do
- res = SSL_read (ssl, buf, bufsize);
- while (res == -1 && errno == EINTR);
- return res;
+ ret = SSL_read (ssl, buf, bufsize);
+ while (ret == -1
+ && SSL_get_error (ssl, ret) == SSL_ERROR_SYSCALL
+ && errno == EINTR);
+ return ret;
}
static int
ssl_write (int fd, char *buf, int bufsize, void *ctx)
{
- int res = 0;
+ int ret = 0;
SSL *ssl = (SSL *) ctx;
- /* #### Does SSL_write actually set EINTR? */
do
- res = SSL_write (ssl, buf, bufsize);
- while (res == -1 && errno == EINTR);
- return res;
+ ret = SSL_write (ssl, buf, bufsize);
+ while (ret == -1
+ && SSL_get_error (ssl, ret) == SSL_ERROR_SYSCALL
+ && errno == EINTR);
+ return ret;
}
static int
return 1;
if (SSL_pending (ssl))
return 1;
-#ifdef HAVE_SELECT
return select_fd (fd, timeout, wait_for);
-#else
- return 1;
-#endif
+}
+
+static int
+ssl_peek (int fd, char *buf, int bufsize, void *ctx)
+{
+ int ret;
+ SSL *ssl = (SSL *) ctx;
+ do
+ ret = SSL_peek (ssl, buf, bufsize);
+ while (ret == -1
+ && SSL_get_error (ssl, ret) == SSL_ERROR_SYSCALL
+ && errno == EINTR);
+ return ret;
}
static void
DEBUGP (("Closed %d/SSL 0x%0lx\n", fd, (unsigned long) ssl));
}
-/* Sets up a SSL structure and performs the handshake on fd. */
+/* Sets up a SSL structure and performs the handshake on fd. The
+ resulting SSL structure is registered with the file descriptor FD
+ using fd_register_transport. That way subsequent calls to xread,
+ xwrite, etc., will use the appropriate SSL functions.
+
+ Returns 1 on success, 0 on failure. */
-SSL *
-connect_ssl (int fd, SSL_CTX *ctx)
+int
+ssl_connect (int fd)
{
- SSL *ssl = SSL_new (ctx);
+ SSL *ssl;
+
+ assert (ssl_ctx != NULL);
+ ssl = SSL_new (ssl_ctx);
if (!ssl)
goto err;
if (!SSL_set_fd (ssl, fd))
if (SSL_connect (ssl) <= 0 || ssl->state != SSL_ST_OK)
goto err;
- /* Register the FD to use our functions for read, write, etc. That
- way the rest of Wget can keep using xread, xwrite, and
- friends. */
- register_extended (fd, ssl_read, ssl_write, ssl_poll, ssl_close, ssl);
- DEBUGP (("Connected %d to SSL 0x%0lx\n", fd, (unsigned long) ssl));
- return ssl;
+ /* Register FD with Wget's transport layer, i.e. arrange that
+ SSL-enabled functions are used for reading, writing, and polling.
+ That way the rest of Wget can keep using xread, xwrite, and
+ friends and not care what happens underneath. */
+ fd_register_transport (fd, ssl_read, ssl_write, ssl_poll, ssl_peek,
+ ssl_close, ssl);
+ DEBUGP (("Connected %d to SSL 0x%0*lx\n", fd, 2 * sizeof (void *),
+ (unsigned long) ssl));
+ return 1;
err:
- ssl_printerrors ();
+ ssl_print_errors ();
if (ssl)
SSL_free (ssl);
- return NULL;
-}
-
-void
-free_ssl_ctx (SSL_CTX * ctx)
-{
- SSL_CTX_free (ctx);
+ return 0;
}
projects / wget / blobdiff