X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fstream-ssl.c;h=1fc7446fd588995ca73d2adb75e2c8365c37d5d7;hb=e0ce13c4dc34f44d81e0001882a0be88321b5c87;hp=9c7533d1e6346b8e4634f0220262d852dd43c773;hpb=2a022368f4b37559de5d5621a88c648023493f75;p=openvswitch diff --git a/lib/stream-ssl.c b/lib/stream-ssl.c index 9c7533d1..1fc7446f 100644 --- a/lib/stream-ssl.c +++ b/lib/stream-ssl.c @@ -45,7 +45,10 @@ #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. */ @@ -988,7 +991,9 @@ do_ssl_init(void) 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;