X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fvconn-ssl.c;h=d109cfdb0d394b4118c38c2eff458a55dc79499f;hb=9bff3b7f01b2fde6d2083d9fb71beddb46323c8c;hp=2bd0db04c1d162e0bef3ae88d36bfa18989ae90e;hpb=800a2f4c03658b08bf797d06f2d9c22b84b8223b;p=sliver-openvswitch.git diff --git a/lib/vconn-ssl.c b/lib/vconn-ssl.c index 2bd0db04c..d109cfdb0 100644 --- a/lib/vconn-ssl.c +++ b/lib/vconn-ssl.c @@ -1,28 +1,43 @@ -/* Copyright (C) 2008 Board of Trustees, Leland Stanford Jr. University. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. +/* Copyright (c) 2008 The Board of Trustees of The Leland Stanford + * Junior University + * + * We are making the OpenFlow specification and associated documentation + * (Software) available for public use and benefit with the expectation + * that others will use, modify and enhance the Software and contribute + * those enhancements back to the community. However, since we would + * like to make the Software available for broadest use, with as few + * restrictions as possible permission is hereby granted, free of + * charge, to any person obtaining a copy of this Software to deal in + * the Software under the copyrights without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * The name and trademarks of copyright holder(s) may NOT be used in + * advertising or publicity pertaining to the Software or any + * derivatives without specific, written prior permission. */ +#include #include "vconn-ssl.h" #include "dhparams.h" #include #include +#include +#include #include #include #include @@ -32,7 +47,10 @@ #include "socket-util.h" #include "util.h" #include "openflow.h" +#include "packets.h" +#include "poll-loop.h" #include "ofp-print.h" +#include "socket-util.h" #include "vconn.h" #include "vlog.h" @@ -41,8 +59,8 @@ /* Active SSL. */ enum ssl_state { - STATE_SSL_CONNECTING, - STATE_CONNECTED + STATE_TCP_CONNECTING, + STATE_SSL_CONNECTING }; enum session_type { @@ -60,6 +78,65 @@ struct ssl_vconn SSL *ssl; struct buffer *rxbuf; struct buffer *txbuf; + struct poll_waiter *tx_waiter; + + /* rx_want and tx_want record the result of the last call to SSL_read() + * and SSL_write(), respectively: + * + * - If the call reported that data needed to be read from the file + * descriptor, the corresponding member is set to SSL_READING. + * + * - If the call reported that data needed to be written to the file + * descriptor, the corresponding member is set to SSL_WRITING. + * + * - Otherwise, the member is set to SSL_NOTHING, indicating that the + * call completed successfully (or with an error) and that there is no + * need to block. + * + * These are needed because there is no way to ask OpenSSL what a data read + * or write would require without giving it a buffer to receive into or + * data to send, respectively. (Note that the SSL_want() status is + * overwritten by each SSL_read() or SSL_write() call, so we can't rely on + * its value.) + * + * A single call to SSL_read() or SSL_write() can perform both reading + * and writing and thus invalidate not one of these values but actually + * both. Consider this situation, for example: + * + * - SSL_write() blocks on a read, so tx_want gets SSL_READING. + * + * - SSL_read() laters succeeds reading from 'fd' and clears out the + * whole receive buffer, so rx_want gets SSL_READING. + * + * - Client calls vconn_wait(WAIT_RECV) and vconn_wait(WAIT_SEND) and + * blocks. + * + * - Now we're stuck blocking until the peer sends us data, even though + * SSL_write() could now succeed, which could easily be a deadlock + * condition. + * + * On the other hand, we can't reset both tx_want and rx_want on every call + * to SSL_read() or SSL_write(), because that would produce livelock, + * e.g. in this situation: + * + * - SSL_write() blocks, so tx_want gets SSL_READING or SSL_WRITING. + * + * - SSL_read() blocks, so rx_want gets SSL_READING or SSL_WRITING, + * but tx_want gets reset to SSL_NOTHING. + * + * - Client calls vconn_wait(WAIT_RECV) and vconn_wait(WAIT_SEND) and + * blocks. + * + * - Client wakes up immediately since SSL_NOTHING in tx_want indicates + * that no blocking is necessary. + * + * The solution we adopt here is to set tx_want to SSL_NOTHING after + * calling SSL_read() only if the SSL state of the connection changed, + * which indicates that an SSL-level renegotiation made some progress, and + * similarly for rx_want and SSL_write(). This prevents both the + * deadlock and livelock situations above. + */ + int rx_want, tx_want; }; /* SSL context created by ssl_init(). */ @@ -70,14 +147,34 @@ static bool has_private_key, has_certificate, has_ca_cert; static int ssl_init(void); static int do_ssl_init(void); -static void connect_completed(struct ssl_vconn *, int error); static bool ssl_wants_io(int ssl_error); static void ssl_close(struct vconn *); -static bool state_machine(struct ssl_vconn *sslv); +static int interpret_ssl_error(const char *function, int ret, int error, + int *want); +static void ssl_tx_poll_callback(int fd, short int revents, void *vconn_); static DH *tmp_dh_callback(SSL *ssl, int is_export UNUSED, int keylength); +short int +want_to_poll_events(int want) +{ + switch (want) { + case SSL_NOTHING: + NOT_REACHED(); + + case SSL_READING: + return POLLIN; + + case SSL_WRITING: + return POLLOUT; + + default: + NOT_REACHED(); + } +} + static int new_ssl_vconn(const char *name, int fd, enum session_type type, + enum ssl_state state, const struct sockaddr_in *sin, struct vconn **vconnp) { struct ssl_vconn *sslv; @@ -103,13 +200,7 @@ new_ssl_vconn(const char *name, int fd, enum session_type type, goto error; } - /* Make 'fd' non-blocking and disable Nagle. */ - retval = set_nonblocking(fd); - if (retval) { - VLOG_ERR("%s: set_nonblocking: %s", name, strerror(retval)); - close(fd); - return retval; - } + /* Disable Nagle. */ retval = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof on); if (retval) { VLOG_ERR("%s: setsockopt(TCP_NODELAY): %s", name, strerror(errno)); @@ -132,12 +223,16 @@ new_ssl_vconn(const char *name, int fd, enum session_type type, /* Create and return the ssl_vconn. */ sslv = xmalloc(sizeof *sslv); sslv->vconn.class = &ssl_vconn_class; - sslv->state = STATE_SSL_CONNECTING; + sslv->vconn.connect_status = EAGAIN; + sslv->vconn.ip = sin->sin_addr.s_addr; + sslv->state = state; sslv->type = type; sslv->fd = fd; sslv->ssl = ssl; sslv->rxbuf = NULL; sslv->txbuf = NULL; + sslv->tx_waiter = NULL; + sslv->rx_want = sslv->tx_want = SSL_NOTHING; *vconnp = &sslv->vconn; return 0; @@ -176,7 +271,8 @@ ssl_open(const char *name, char *suffix, struct vconn **vconnp) host_name = strtok_r(suffix, "::", &save_ptr); port_string = strtok_r(NULL, "::", &save_ptr); if (!host_name) { - fatal(0, "%s: bad peer name format", name); + error(0, "%s: bad peer name format", name); + return EAFNOSUPPORT; } memset(&sin, 0, sizeof sin); @@ -193,100 +289,83 @@ ssl_open(const char *name, char *suffix, struct vconn **vconnp) VLOG_ERR("%s: socket: %s", name, strerror(errno)); return errno; } + retval = set_nonblocking(fd); + if (retval) { + close(fd); + return retval; + } - /* Connect socket (blocking). */ + /* Connect socket. */ retval = connect(fd, (struct sockaddr *) &sin, sizeof sin); if (retval < 0) { - int error = errno; - VLOG_ERR("%s: connect: %s", name, strerror(error)); - close(fd); - return error; + if (errno == EINPROGRESS) { + return new_ssl_vconn(name, fd, CLIENT, STATE_TCP_CONNECTING, + &sin, vconnp); + } else { + int error = errno; + VLOG_ERR("%s: connect: %s", name, strerror(error)); + close(fd); + return error; + } + } else { + return new_ssl_vconn(name, fd, CLIENT, STATE_SSL_CONNECTING, + &sin, vconnp); } - - /* Make an ssl_vconn for the socket. */ - return new_ssl_vconn(name, fd, CLIENT, vconnp); } -static void -ssl_close(struct vconn *vconn) +static int +ssl_connect(struct vconn *vconn) { struct ssl_vconn *sslv = ssl_vconn_cast(vconn); - SSL_free(sslv->ssl); - close(sslv->fd); - free(sslv); -} + int retval; -static bool -ssl_want_io_to_events(SSL *ssl, short int *events) -{ - if (SSL_want_read(ssl)) { - *events |= POLLIN; - return true; - } else if (SSL_want_write(ssl)) { - *events |= POLLOUT; - return true; - } else { - return false; - } -} + switch (sslv->state) { + case STATE_TCP_CONNECTING: + retval = check_connection_completion(sslv->fd); + if (retval) { + return retval; + } + sslv->state = STATE_SSL_CONNECTING; + /* Fall through. */ -static bool -ssl_prepoll(struct vconn *vconn, int want, struct pollfd *pfd) -{ - struct ssl_vconn *sslv = ssl_vconn_cast(vconn); - pfd->fd = sslv->fd; - if (!state_machine(sslv)) { - switch (sslv->state) { - case STATE_SSL_CONNECTING: - if (!ssl_want_io_to_events(sslv->ssl, &pfd->events)) { - /* state_machine() should have transitioned us away to another - * state. */ - NOT_REACHED(); + case STATE_SSL_CONNECTING: + retval = (sslv->type == CLIENT + ? SSL_connect(sslv->ssl) : SSL_accept(sslv->ssl)); + if (retval != 1) { + int error = SSL_get_error(sslv->ssl, retval); + if (retval < 0 && ssl_wants_io(error)) { + return EAGAIN; + } else { + int unused; + interpret_ssl_error((sslv->type == CLIENT ? "SSL_connect" + : "SSL_accept"), retval, error, &unused); + shutdown(sslv->fd, SHUT_RDWR); + return EPROTO; } - break; - default: - NOT_REACHED(); - } - } else if (sslv->connect_error) { - pfd->events = 0; - return true; - } else if (!ssl_want_io_to_events(sslv->ssl, &pfd->events)) { - if (want & WANT_RECV) { - pfd->events |= POLLIN; - } - if (want & WANT_SEND || sslv->txbuf) { - pfd->events |= POLLOUT; + } else { + return 0; } } - return false; + + NOT_REACHED(); } static void -ssl_postpoll(struct vconn *vconn, short int *revents) +ssl_close(struct vconn *vconn) { struct ssl_vconn *sslv = ssl_vconn_cast(vconn); - if (!state_machine(sslv)) { - *revents = 0; - } else if (sslv->connect_error) { - *revents |= POLLERR; - } else if (*revents & POLLOUT && sslv->txbuf) { - ssize_t n = SSL_write(sslv->ssl, sslv->txbuf->data, sslv->txbuf->size); - if (n > 0) { - buffer_pull(sslv->txbuf, n); - if (sslv->txbuf->size == 0) { - buffer_delete(sslv->txbuf); - sslv->txbuf = NULL; - } - } - if (sslv->txbuf) { - *revents &= ~POLLOUT; - } - } + poll_cancel(sslv->tx_waiter); + SSL_free(sslv->ssl); + close(sslv->fd); + free(sslv); } static int -interpret_ssl_error(const char *function, int ret, int error) +interpret_ssl_error(const char *function, int ret, int error, + int *want) { + *want = SSL_NOTHING; + switch (error) { case SSL_ERROR_NONE: VLOG_ERR("%s: unexpected SSL_ERROR_NONE", function); @@ -297,7 +376,11 @@ interpret_ssl_error(const char *function, int ret, int error) break; case SSL_ERROR_WANT_READ: + *want = SSL_READING; + return EAGAIN; + case SSL_ERROR_WANT_WRITE: + *want = SSL_WRITING; return EAGAIN; case SSL_ERROR_WANT_CONNECT: @@ -352,14 +435,9 @@ ssl_recv(struct vconn *vconn, struct buffer **bufferp) struct ssl_vconn *sslv = ssl_vconn_cast(vconn); struct buffer *rx; size_t want_bytes; + int old_state; ssize_t ret; - if (!state_machine(sslv)) { - return EAGAIN; - } else if (sslv->connect_error) { - return sslv->connect_error; - } - if (sslv->rxbuf == NULL) { sslv->rxbuf = buffer_new(1564); } @@ -376,13 +454,28 @@ again: return EPROTO; } want_bytes = length - rx->size; + if (!want_bytes) { + *bufferp = rx; + sslv->rxbuf = NULL; + return 0; + } } - buffer_reserve_tailroom(rx, want_bytes); + buffer_prealloc_tailroom(rx, want_bytes); /* Behavior of zero-byte SSL_read is poorly defined. */ assert(want_bytes > 0); + old_state = SSL_get_state(sslv->ssl); ret = SSL_read(sslv->ssl, buffer_tail(rx), want_bytes); + if (old_state != SSL_get_state(sslv->ssl)) { + sslv->tx_want = SSL_NOTHING; + if (sslv->tx_waiter) { + poll_cancel(sslv->tx_waiter); + ssl_tx_poll_callback(sslv->fd, POLLIN, vconn); + } + } + sslv->rx_want = SSL_NOTHING; + if (ret > 0) { rx->size += ret; if (ret == want_bytes) { @@ -406,45 +499,144 @@ again: return EOF; } } else { - return interpret_ssl_error("SSL_read", ret, error); + return interpret_ssl_error("SSL_read", ret, error, &sslv->rx_want); } } } +static void +ssl_clear_txbuf(struct ssl_vconn *sslv) +{ + buffer_delete(sslv->txbuf); + sslv->txbuf = NULL; + sslv->tx_waiter = NULL; +} + +static void +ssl_register_tx_waiter(struct vconn *vconn) +{ + struct ssl_vconn *sslv = ssl_vconn_cast(vconn); + sslv->tx_waiter = poll_fd_callback(sslv->fd, + want_to_poll_events(sslv->tx_want), + ssl_tx_poll_callback, vconn); +} + static int -ssl_send(struct vconn *vconn, struct buffer *buffer) +ssl_do_tx(struct vconn *vconn) { struct ssl_vconn *sslv = ssl_vconn_cast(vconn); - ssize_t ret; - if (!state_machine(sslv)) { - return EAGAIN; - } else if (sslv->connect_error) { - return sslv->connect_error; + for (;;) { + int old_state = SSL_get_state(sslv->ssl); + int ret = SSL_write(sslv->ssl, sslv->txbuf->data, sslv->txbuf->size); + if (old_state != SSL_get_state(sslv->ssl)) { + sslv->rx_want = SSL_NOTHING; + } + sslv->tx_want = SSL_NOTHING; + if (ret > 0) { + buffer_pull(sslv->txbuf, ret); + if (sslv->txbuf->size == 0) { + return 0; + } + } else { + int ssl_error = SSL_get_error(sslv->ssl, ret); + if (ssl_error == SSL_ERROR_ZERO_RETURN) { + VLOG_WARN("SSL_write: connection closed"); + return EPIPE; + } else { + return interpret_ssl_error("SSL_write", ret, ssl_error, + &sslv->tx_want); + } + } } +} + +static void +ssl_tx_poll_callback(int fd UNUSED, short int revents UNUSED, void *vconn_) +{ + struct vconn *vconn = vconn_; + struct ssl_vconn *sslv = ssl_vconn_cast(vconn); + int error = ssl_do_tx(vconn); + if (error != EAGAIN) { + ssl_clear_txbuf(sslv); + } else { + ssl_register_tx_waiter(vconn); + } +} + +static int +ssl_send(struct vconn *vconn, struct buffer *buffer) +{ + struct ssl_vconn *sslv = ssl_vconn_cast(vconn); if (sslv->txbuf) { return EAGAIN; + } else { + int error; + + sslv->txbuf = buffer; + error = ssl_do_tx(vconn); + switch (error) { + case 0: + ssl_clear_txbuf(sslv); + return 0; + case EAGAIN: + ssl_register_tx_waiter(vconn); + return 0; + default: + sslv->txbuf = NULL; + return error; + } } +} - ret = SSL_write(sslv->ssl, buffer->data, buffer->size); - if (ret > 0) { - if (ret == buffer->size) { - buffer_delete(buffer); +static void +ssl_wait(struct vconn *vconn, enum vconn_wait_type wait) +{ + struct ssl_vconn *sslv = ssl_vconn_cast(vconn); + + switch (wait) { + case WAIT_CONNECT: + if (vconn_connect(vconn) != EAGAIN) { + poll_immediate_wake(); } else { - sslv->txbuf = buffer; - buffer_pull(buffer, ret); + switch (sslv->state) { + case STATE_TCP_CONNECTING: + poll_fd_wait(sslv->fd, POLLOUT); + break; + + case STATE_SSL_CONNECTING: + /* ssl_connect() called SSL_accept() or SSL_connect(), which + * set up the status that we test here. */ + poll_fd_wait(sslv->fd, + want_to_poll_events(SSL_want(sslv->ssl))); + break; + + default: + NOT_REACHED(); + } } - return 0; - } else { - int error = SSL_get_error(sslv->ssl, ret); - if (error == SSL_ERROR_ZERO_RETURN) { - /* Connection closed (EOF). */ - VLOG_WARN("SSL_write: connection close"); - return EPIPE; + break; + + case WAIT_RECV: + if (sslv->rx_want != SSL_NOTHING) { + poll_fd_wait(sslv->fd, want_to_poll_events(sslv->rx_want)); } else { - return interpret_ssl_error("SSL_write", ret, error); + poll_immediate_wake(); } + break; + + case WAIT_SEND: + if (!sslv->txbuf) { + /* We have room in our tx queue. */ + poll_immediate_wake(); + } else { + /* The call to ssl_tx_poll_callback() will wake us up. */ + } + break; + + default: + NOT_REACHED(); } } @@ -452,10 +644,10 @@ struct vconn_class ssl_vconn_class = { .name = "ssl", .open = ssl_open, .close = ssl_close, - .prepoll = ssl_prepoll, - .postpoll = ssl_postpoll, + .connect = ssl_connect, .recv = ssl_recv, .send = ssl_send, + .wait = ssl_wait, }; /* Passive SSL. */ @@ -523,13 +715,13 @@ pssl_open(const char *name, char *suffix, struct vconn **vconnp) retval = set_nonblocking(fd); if (retval) { - VLOG_ERR("%s: set_nonblocking: %s", name, strerror(retval)); close(fd); return retval; } pssl = xmalloc(sizeof *pssl); pssl->vconn.class = &pssl_vconn_class; + pssl->vconn.connect_status = 0; pssl->fd = fd; *vconnp = &pssl->vconn; return 0; @@ -543,47 +735,59 @@ pssl_close(struct vconn *vconn) free(pssl); } -static bool -pssl_prepoll(struct vconn *vconn, int want, struct pollfd *pfd) -{ - struct pssl_vconn *pssl = pssl_vconn_cast(vconn); - pfd->fd = pssl->fd; - if (want & WANT_ACCEPT) { - pfd->events |= POLLIN; - } - return false; -} - static int pssl_accept(struct vconn *vconn, struct vconn **new_vconnp) { struct pssl_vconn *pssl = pssl_vconn_cast(vconn); + struct sockaddr_in sin; + socklen_t sin_len = sizeof sin; + char name[128]; int new_fd; + int error; - new_fd = accept(pssl->fd, NULL, NULL); + new_fd = accept(pssl->fd, &sin, &sin_len); if (new_fd < 0) { int error = errno; if (error != EAGAIN) { - VLOG_DBG("pssl: accept: %s", strerror(error)); + VLOG_DBG("accept: %s", strerror(error)); } return error; } - return new_ssl_vconn("ssl" /* FIXME */, new_fd, SERVER, new_vconnp); + error = set_nonblocking(new_fd); + if (error) { + close(new_fd); + return error; + } + + sprintf(name, "ssl:"IP_FMT, IP_ARGS(&sin.sin_addr)); + if (sin.sin_port != htons(OFP_SSL_PORT)) { + sprintf(strchr(name, '\0'), ":%"PRIu16, ntohs(sin.sin_port)); + } + return new_ssl_vconn(name, new_fd, SERVER, STATE_SSL_CONNECTING, &sin, + new_vconnp); +} + +static void +pssl_wait(struct vconn *vconn, enum vconn_wait_type wait) +{ + struct pssl_vconn *pssl = pssl_vconn_cast(vconn); + assert(wait == WAIT_ACCEPT); + poll_fd_wait(pssl->fd, POLLIN); } struct vconn_class pssl_vconn_class = { .name = "pssl", .open = pssl_open, .close = pssl_close, - .prepoll = pssl_prepoll, .accept = pssl_accept, + .wait = pssl_wait, }; /* * Returns true if OpenSSL error is WANT_READ or WANT_WRITE, indicating that * OpenSSL is requesting that we call it back when the socket is ready for read - * or writing (respectively. + * or writing, respectively. */ static bool ssl_wants_io(int ssl_error) @@ -632,37 +836,6 @@ do_ssl_init(void) return 0; } -static bool -state_machine(struct ssl_vconn *sslv) -{ - if (sslv->state == STATE_SSL_CONNECTING) { - int ret = (sslv->type == CLIENT - ? SSL_connect(sslv->ssl) : SSL_accept(sslv->ssl)); - if (ret != 1) { - int error = SSL_get_error(sslv->ssl, ret); - if (ret < 0 && ssl_wants_io(error)) { - /* Stay in this state to repeat the SSL_connect later. */ - return false; - } else { - interpret_ssl_error((sslv->type == CLIENT ? "SSL_connect" - : "SSL_accept"), ret, error); - shutdown(sslv->fd, SHUT_RDWR); - connect_completed(sslv, EPROTO); - } - } else { - connect_completed(sslv, 0); - } - } - return sslv->state == STATE_CONNECTED; -} - -static void -connect_completed(struct ssl_vconn *sslv, int error) -{ - sslv->state = STATE_CONNECTED; - sslv->connect_error = error; -} - static DH * tmp_dh_callback(SSL *ssl, int is_export UNUSED, int keylength) { @@ -673,13 +846,14 @@ tmp_dh_callback(SSL *ssl, int is_export UNUSED, int keylength) }; static struct dh dh_table[] = { + {1024, NULL, get_dh1024}, {2048, NULL, get_dh2048}, {4096, NULL, get_dh4096}, }; struct dh *dh; - for (dh = dh_table; dh < &dh[ARRAY_SIZE(dh_table)]; dh++) { + for (dh = dh_table; dh < &dh_table[ARRAY_SIZE(dh_table)]; dh++) { if (dh->keylength == keylength) { if (!dh->dh) { dh->dh = dh->constructor(); @@ -695,6 +869,13 @@ tmp_dh_callback(SSL *ssl, int is_export UNUSED, int keylength) return NULL; } +/* Returns true if SSL is at least partially configured. */ +bool +vconn_ssl_is_configured(void) +{ + return has_private_key || has_certificate || has_ca_cert; +} + void vconn_ssl_set_private_key_file(const char *file_name) { @@ -743,7 +924,7 @@ vconn_ssl_set_ca_cert_file(const char *file_name) /* Set up CAs for OpenSSL to trust in verifying the peer's certificate. */ if (SSL_CTX_load_verify_locations(ctx, file_name, NULL) != 1) { - VLOG_ERR("SSL_load_verify_locations: %s", + VLOG_ERR("SSL_CTX_load_verify_locations: %s", ERR_error_string(ERR_get_error(), NULL)); return; }