projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xenserver: Change all bridge's fail_mode when updating.
[openvswitch]
/
lib
/
stream-ssl.c
diff --git
a/lib/stream-ssl.c
b/lib/stream-ssl.c
index 9c7533d1e6346b8e4634f0220262d852dd43c773..6baf88ff17b59e41d899fd050d7e81621065e579 100644
(file)
--- a/
lib/stream-ssl.c
+++ b/
lib/stream-ssl.c
@@
-45,7
+45,10
@@
#include "timeval.h"
#include "vlog.h"
#include "timeval.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(stream_ssl)
+VLOG_DEFINE_THIS_MODULE(stream_ssl);
+
+COVERAGE_DEFINE(ssl_session);
+COVERAGE_DEFINE(ssl_session_reused);
/* Active SSL. */
/* Active SSL. */
@@
-988,7
+991,9
@@
do_ssl_init(void)
SSL_library_init();
SSL_load_error_strings();
SSL_library_init();
SSL_load_error_strings();
- method = TLSv1_method();
+ /* New OpenSSL changed TLSv1_method() to return a "const" pointer, so the
+ * cast is needed to avoid a warning with those newer versions. */
+ method = (SSL_METHOD *) TLSv1_method();
if (method == NULL) {
VLOG_ERR("TLSv1_method: %s", ERR_error_string(ERR_get_error(), NULL));
return ENOPROTOOPT;
if (method == NULL) {
VLOG_ERR("TLSv1_method: %s", ERR_error_string(ERR_get_error(), NULL));
return ENOPROTOOPT;
@@
-1286,7
+1291,7
@@
stream_ssl_set_ca_cert_file__(const char *file_name, bool bootstrap)
for (i = 0; i < n_certs; i++) {
/* SSL_CTX_add_client_CA makes a copy of the relevant data. */
if (SSL_CTX_add_client_CA(ctx, certs[i]) != 1) {
for (i = 0; i < n_certs; i++) {
/* SSL_CTX_add_client_CA makes a copy of the relevant data. */
if (SSL_CTX_add_client_CA(ctx, certs[i]) != 1) {
- VLOG_ERR("failed to add client certificate %
d
from %s: %s",
+ VLOG_ERR("failed to add client certificate %
zu
from %s: %s",
i, file_name,
ERR_error_string(ERR_get_error(), NULL));
} else {
i, file_name,
ERR_error_string(ERR_get_error(), NULL));
} else {