mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-30 22:05:19 +00:00
Code Issues Releases Wiki Activity

stream-ssl: Only set SSL client session once.

Browse Source 
Attempting to call SSL_set_session() on every trip through the SSL
connection state machine seems like it could cause the session to be
re-set to the cached one even after the server has told us which session
is actually to be used.

In testing, this change didn't make any difference, but it seems seems like
the right thing to do.

Bug #4448.
This commit is contained in:
Ben Pfaff
2011-01-28 15:32:57 -08:00
parent 246f5b5ede
commit aae3743bf2
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/stream-ssl.c
View File

@@ -280,6 +280,13 @@ new_ssl_stream(const char *name, int fd, enum session_type type,
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);
@@ -511,15 +518,6 @@ ssl_connect(struct stream *stream)
MSG_PEEK);
}
/* Grab SSL session information from the cache. */
if (sslv->type == CLIENT) {
SSL_SESSION *session = shash_find_data(&client_sessions,
stream_get_name(stream));
if (session) {
SSL_set_session(sslv->ssl, session);
}
}
retval = (sslv->type == CLIENT
? SSL_connect(sslv->ssl) : SSL_accept(sslv->ssl));
if (retval != 1) {