/*
- * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
VLOG_DEFINE_THIS_MODULE(stream_ssl);
-COVERAGE_DEFINE(ssl_session);
-COVERAGE_DEFINE(ssl_session_reused);
-
/* Active SSL. */
enum ssl_state {
/* SSL context created by ssl_init(). */
static SSL_CTX *ctx;
-/* Maps from stream target (e.g. "127.0.0.1:1234") to SSL_SESSION *. The
- * sessions are those from the last SSL connection to the given target.
- * OpenSSL caches server-side sessions internally, so this cache is only used
- * for client connections.
- *
- * The stream_ssl module owns a reference to each of the sessions in this
- * table, so they must be freed with SSL_SESSION_free() when they are no
- * longer needed. */
-static struct shash client_sessions = SHASH_INITIALIZER(&client_sessions);
-
-/* Maximum number of client sessions to cache. Ordinarily I'd expect that one
- * session would be sufficient but this should cover it. */
-#define MAX_CLIENT_SESSION_CACHE 16
-
struct ssl_config_file {
bool read; /* Whether the file was successfully read. */
char *file_name; /* Configured file name, if any. */
static DH *tmp_dh_callback(SSL *ssl, int is_export OVS_UNUSED, int keylength);
static void log_ca_cert(const char *file_name, X509 *cert);
static void stream_ssl_set_ca_cert_file__(const char *file_name,
- bool bootstrap);
+ bool bootstrap, bool force);
static void ssl_protocol_cb(int write_p, int version, int content_type,
const void *, size_t, SSL *, void *sslv_);
+static bool update_ssl_config(struct ssl_config_file *, const char *file_name);
static short int
want_to_poll_events(int want)
static int
new_ssl_stream(const char *name, int fd, enum session_type type,
- enum ssl_state state, const struct sockaddr_in *remote,
- struct stream **streamp)
+ enum ssl_state state, const struct sockaddr_in *remote,
+ struct stream **streamp)
{
struct sockaddr_in local;
socklen_t local_len = sizeof local;
if (!verify_peer_cert || (bootstrap_ca_cert && type == CLIENT)) {
SSL_set_verify(ssl, SSL_VERIFY_NONE, NULL);
}
- if (type == CLIENT) {
- /* Grab SSL session information from the cache. */
- SSL_SESSION *session = shash_find_data(&client_sessions, name);
- if (session && SSL_set_session(ssl, session) != 1) {
- interpret_queued_ssl_error("SSL_set_session");
- }
- }
/* Create and return the ssl_stream. */
sslv = xmalloc(sizeof *sslv);
}
static int
-ssl_open(const char *name, char *suffix, struct stream **streamp)
+ssl_open(const char *name, char *suffix, struct stream **streamp, uint8_t dscp)
{
struct sockaddr_in sin;
int error, fd;
return error;
}
- error = inet_open_active(SOCK_STREAM, suffix, OFP_SSL_PORT, &sin, &fd);
+ error = inet_open_active(SOCK_STREAM, suffix, OFP_SSL_PORT, &sin, &fd,
+ dscp);
if (fd >= 0) {
int state = error ? STATE_TCP_CONNECTING : STATE_SSL_CONNECTING;
return new_ssl_stream(name, fd, CLIENT, state, &sin, streamp);
fd = open(ca_cert.file_name, O_CREAT | O_EXCL | O_WRONLY, 0444);
if (fd < 0) {
if (errno == EEXIST) {
- VLOG_INFO("reading CA cert %s created by another process",
- ca_cert.file_name);
- stream_ssl_set_ca_cert_file(ca_cert.file_name, true);
+ VLOG_INFO_RL(&rl, "reading CA cert %s created by another process",
+ ca_cert.file_name);
+ stream_ssl_set_ca_cert_file__(ca_cert.file_name, true, true);
return EPROTO;
} else {
VLOG_ERR("could not bootstrap CA cert: creating %s failed: %s",
if (!cert) {
out_of_memory();
}
+ SSL_CTX_set_cert_store(ctx, X509_STORE_new());
if (SSL_CTX_load_verify_locations(ctx, ca_cert.file_name, NULL) != 1) {
VLOG_ERR("SSL_CTX_load_verify_locations: %s",
ERR_error_string(ERR_get_error(), NULL));
return EPROTO;
}
-static void
-ssl_delete_session(struct shash_node *node)
-{
- SSL_SESSION *session = node->data;
- SSL_SESSION_free(session);
- shash_delete(&client_sessions, node);
-}
-
-/* Find and free any previously cached session for 'stream''s target. */
-static void
-ssl_flush_session(struct stream *stream)
-{
- struct shash_node *node;
-
- node = shash_find(&client_sessions, stream_get_name(stream));
- if (node) {
- ssl_delete_session(node);
- }
-}
-
-/* Add 'stream''s session to the cache for its target, so that it will be
- * reused for future SSL connections to the same target. */
-static void
-ssl_cache_session(struct stream *stream)
-{
- struct ssl_stream *sslv = ssl_stream_cast(stream);
- SSL_SESSION *session;
-
- /* Get session from stream. */
- session = SSL_get1_session(sslv->ssl);
- if (session) {
- SSL_SESSION *old_session;
-
- old_session = shash_replace(&client_sessions, stream_get_name(stream),
- session);
- if (old_session) {
- /* Free the session that we replaced. (We might actually have
- * session == old_session, but either way we have to free it to
- * avoid leaking a reference.) */
- SSL_SESSION_free(old_session);
- } else if (shash_count(&client_sessions) > MAX_CLIENT_SESSION_CACHE) {
- for (;;) {
- struct shash_node *node = shash_random_node(&client_sessions);
- if (node->data != session) {
- ssl_delete_session(node);
- break;
- }
- }
- }
- }
-}
-
static int
ssl_connect(struct stream *stream)
{
} else {
int unused;
- if (sslv->type == CLIENT) {
- /* Delete any cached session for this stream's target.
- * Otherwise a single error causes recurring errors that
- * don't resolve until the SSL client or server is
- * restarted. (It can take dozens of reused connections to
- * see this behavior, so this is difficult to test.) If we
- * delete the session on the first error, though, the error
- * only occurs once and then resolves itself. */
- ssl_flush_session(stream);
- }
-
interpret_ssl_error((sslv->type == CLIENT ? "SSL_connect"
: "SSL_accept"), retval, error, &unused);
shutdown(sslv->fd, SHUT_RDWR);
VLOG_ERR("rejecting SSL connection during bootstrap race window");
return EPROTO;
} else {
- /* Statistics. */
- COVERAGE_INC(ssl_session);
- if (SSL_session_reused(sslv->ssl)) {
- COVERAGE_INC(ssl_session_reused);
- }
return 0;
}
}
* background. */
SSL_shutdown(sslv->ssl);
- ssl_cache_session(stream);
-
/* SSL_shutdown() might have signaled an error, in which case we need to
* flush it out of the OpenSSL error queue or the next OpenSSL operation
* will falsely signal an error. */
}
}
-struct stream_class ssl_stream_class = {
+const struct stream_class ssl_stream_class = {
"ssl", /* name */
+ true, /* needs_probes */
ssl_open, /* open */
ssl_close, /* close */
ssl_connect, /* connect */
int fd;
};
-struct pstream_class pssl_pstream_class;
+const struct pstream_class pssl_pstream_class;
static struct pssl_pstream *
pssl_pstream_cast(struct pstream *pstream)
}
static int
-pssl_open(const char *name OVS_UNUSED, char *suffix, struct pstream **pstreamp)
+pssl_open(const char *name OVS_UNUSED, char *suffix, struct pstream **pstreamp,
+ uint8_t dscp)
{
struct pssl_pstream *pssl;
struct sockaddr_in sin;
return retval;
}
- fd = inet_open_passive(SOCK_STREAM, suffix, OFP_SSL_PORT, &sin);
+ fd = inet_open_passive(SOCK_STREAM, suffix, OFP_SSL_PORT, &sin, dscp);
if (fd < 0) {
return -fd;
}
int new_fd;
int error;
- new_fd = accept(pssl->fd, &sin, &sin_len);
+ new_fd = accept(pssl->fd, (struct sockaddr *) &sin, &sin_len);
if (new_fd < 0) {
error = errno;
if (error != EAGAIN) {
sprintf(strchr(name, '\0'), ":%"PRIu16, ntohs(sin.sin_port));
}
return new_ssl_stream(name, new_fd, SERVER, STATE_SSL_CONNECTING, &sin,
- new_streamp);
+ new_streamp);
}
static void
poll_fd_wait(pssl->fd, POLLIN);
}
-struct pstream_class pssl_pstream_class = {
+const struct pstream_class pssl_pstream_class = {
"pssl",
+ true,
pssl_open,
pssl_close,
pssl_accept,
SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
NULL);
- /* We have to set a session context ID string in 'ctx' because OpenSSL
- * otherwise refuses to use a cached session on the server side when
- * SSL_VERIFY_PEER is set. And it not only refuses to use the cached
- * session, it actually generates an error and kills the connection.
- * According to a comment in ssl_get_prev_session() in OpenSSL's
- * ssl/ssl_sess.c, this is intentional behavior.
- *
- * Any context string is OK, as long as one is set. */
- SSL_CTX_set_session_id_context(ctx, (const unsigned char *) PACKAGE,
- strlen(PACKAGE));
-
return 0;
}
update_ssl_config(struct ssl_config_file *config, const char *file_name)
{
struct timespec mtime;
+ int error;
if (ssl_init() || !file_name) {
return false;
/* If the file name hasn't changed and neither has the file contents, stop
* here. */
- get_mtime(file_name, &mtime);
+ error = get_mtime(file_name, &mtime);
+ if (error && error != ENOENT) {
+ VLOG_ERR_RL(&rl, "%s: stat failed (%s)", file_name, strerror(error));
+ }
if (config->file_name
&& !strcmp(config->file_name, file_name)
&& mtime.tv_sec == config->mtime.tv_sec
}
static void
-stream_ssl_set_ca_cert_file__(const char *file_name, bool bootstrap)
+stream_ssl_set_ca_cert_file__(const char *file_name,
+ bool bootstrap, bool force)
{
X509 **certs;
size_t n_certs;
struct stat s;
+ if (!update_ssl_config(&ca_cert, file_name) && !force) {
+ return;
+ }
+
if (!strcmp(file_name, "none")) {
verify_peer_cert = false;
VLOG_WARN("Peer certificate validation disabled "
/* Set up CAs for OpenSSL to trust in verifying the peer's
* certificate. */
+ SSL_CTX_set_cert_store(ctx, X509_STORE_new());
if (SSL_CTX_load_verify_locations(ctx, file_name, NULL) != 1) {
VLOG_ERR("SSL_CTX_load_verify_locations: %s",
ERR_error_string(ERR_get_error(), NULL));
void
stream_ssl_set_ca_cert_file(const char *file_name, bool bootstrap)
{
- if (!update_ssl_config(&ca_cert, file_name)) {
- return;
- }
-
- stream_ssl_set_ca_cert_file__(file_name, bootstrap);
+ stream_ssl_set_ca_cert_file__(file_name, bootstrap, false);
}
\f
/* SSL protocol logging. */
projects / openvswitch / blobdiff