MEDIUM: conf: rename 'nosslv3' and 'notlsvXX' statements 'no-sslv3' and 'no-tlsvXX'.
These ones were really not easy to read nor write, and become confusing
with the next ones to be added.
diff --git a/src/cfgparse.c b/src/cfgparse.c
index ed3157b..151bda4 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -4293,9 +4293,9 @@
goto out;
#endif
}
- else if (!strcmp(args[cur_arg], "nosslv3")) {
+ else if (!strcmp(args[cur_arg], "no-sslv3")) {
#ifdef USE_OPENSSL
- newsrv->ssl_ctx.nosslv3 = 1;
+ newsrv->ssl_ctx.no_sslv3 = 1;
cur_arg += 1;
#else /* USE_OPENSSL */
Alert("parsing [%s:%d]: '%s' option not implemented.\n",
@@ -4304,9 +4304,9 @@
goto out;
#endif /* USE_OPENSSL */
}
- else if (!strcmp(args[cur_arg], "notlsv10")) {
+ else if (!strcmp(args[cur_arg], "no-tlsv10")) {
#ifdef USE_OPENSSL
- newsrv->ssl_ctx.notlsv10 = 1;
+ newsrv->ssl_ctx.no_tlsv10 = 1;
cur_arg += 1;
#else /* USE_OPENSSL */
Alert("parsing [%s:%d]: '%s' option not implemented.\n",
@@ -4315,9 +4315,9 @@
goto out;
#endif /* USE_OPENSSL */
}
- else if (!strcmp(args[cur_arg], "notlsv11")) {
+ else if (!strcmp(args[cur_arg], "no-tlsv11")) {
#ifdef USE_OPENSSL
- newsrv->ssl_ctx.notlsv11 = 1;
+ newsrv->ssl_ctx.no_tlsv11 = 1;
cur_arg += 1;
#else /* USE_OPENSSL */
Alert("parsing [%s:%d]: '%s' option not implemented.\n",
@@ -4326,9 +4326,9 @@
goto out;
#endif /* USE_OPENSSL */
}
- else if (!strcmp(args[cur_arg], "notlsv12")) {
+ else if (!strcmp(args[cur_arg], "no-tlsv12")) {
#ifdef USE_OPENSSL
- newsrv->ssl_ctx.notlsv12 = 1;
+ newsrv->ssl_ctx.no_tlsv12 = 1;
cur_arg += 1;
#else /* USE_OPENSSL */
Alert("parsing [%s:%d]: '%s' option not implemented.\n",
@@ -6360,13 +6360,13 @@
goto next_srv;
}
- if (newsrv->ssl_ctx.nosslv3)
+ if (newsrv->ssl_ctx.no_sslv3)
ssloptions |= SSL_OP_NO_SSLv3;
- if (newsrv->ssl_ctx.notlsv10)
+ if (newsrv->ssl_ctx.no_tlsv10)
ssloptions |= SSL_OP_NO_TLSv1;
- if (newsrv->ssl_ctx.notlsv11)
+ if (newsrv->ssl_ctx.no_tlsv11)
ssloptions |= SSL_OP_NO_TLSv1_1;
- if (newsrv->ssl_ctx.notlsv12)
+ if (newsrv->ssl_ctx.no_tlsv12)
ssloptions |= SSL_OP_NO_TLSv1_2;
SSL_CTX_set_options(newsrv->ssl_ctx.ctx, ssloptions);
SSL_CTX_set_mode(newsrv->ssl_ctx.ctx, sslmode);