|
 |
a776bd |
--- stunnel-5.56/src/prototypes.h.default-tls-version 2020-04-06 11:22:24.480280384 +0200
|
|
|
a776bd |
+++ stunnel-5.56/src/prototypes.h 2020-04-06 11:21:05.407597053 +0200
|
|
|
a776bd |
@@ -897,6 +897,9 @@ ICON_IMAGE load_icon_default(ICON_TYPE);
|
|
|
a776bd |
ICON_IMAGE load_icon_file(const char *);
|
|
|
a776bd |
#endif
|
|
|
a776bd |
|
|
|
a776bd |
+#define USE_DEFAULT_TLS_VERSION ((int)-2) /* Use defaults in OpenSSL
|
|
|
a776bd |
+ crypto policies */
|
|
|
a776bd |
+
|
|
|
a776bd |
#endif /* defined PROTOTYPES_H */
|
|
|
a776bd |
|
|
|
a776bd |
/* end of prototypes.h */
|
|
|
a776bd |
--- stunnel-5.56/src/options.c.default-tls-version 2020-04-06 18:58:48.947214149 +0200
|
|
|
a776bd |
+++ stunnel-5.56/src/options.c 2020-04-08 15:45:18.093520780 +0200
|
|
|
a776bd |
@@ -3123,8 +3123,9 @@ NOEXPORT char *parse_service_option(CMD
|
|
|
a776bd |
return "Invalid protocol version";
|
|
|
a776bd |
return NULL; /* OK */
|
|
|
a776bd |
case CMD_INITIALIZE:
|
|
|
a776bd |
- if(section->max_proto_version && section->min_proto_version &&
|
|
|
a776bd |
- section->max_proto_version<section->min_proto_version)
|
|
|
a776bd |
+ if(section->max_proto_version != USE_DEFAULT_TLS_VERSION
|
|
|
a776bd |
+ && section->min_proto_version != USE_DEFAULT_TLS_VERSION
|
|
|
a776bd |
+ && section->max_proto_version<section->min_proto_version)
|
|
|
a776bd |
return "Invalid protocol version range";
|
|
|
a776bd |
break;
|
|
|
a776bd |
case CMD_PRINT_DEFAULTS:
|
|
|
a776bd |
@@ -3142,7 +3143,10 @@ NOEXPORT char *parse_service_option(CMD
|
|
|
a776bd |
/* sslVersionMax */
|
|
|
a776bd |
switch(cmd) {
|
|
|
a776bd |
case CMD_SET_DEFAULTS:
|
|
|
a776bd |
- section->max_proto_version=0; /* highest supported */
|
|
|
a776bd |
+ section->max_proto_version=USE_DEFAULT_TLS_VERSION; /* use defaults in
|
|
|
a776bd |
+ OpenSSL crypto
|
|
|
a776bd |
+ policies.Do not
|
|
|
a776bd |
+ override it */
|
|
|
a776bd |
break;
|
|
|
a776bd |
case CMD_SET_COPY:
|
|
|
a776bd |
section->max_proto_version=new_service_options.max_proto_version;
|
|
|
a776bd |
@@ -3173,7 +3177,10 @@ NOEXPORT char *parse_service_option(CMD
|
|
|
a776bd |
/* sslVersionMin */
|
|
|
a776bd |
switch(cmd) {
|
|
|
a776bd |
case CMD_SET_DEFAULTS:
|
|
|
a776bd |
- section->min_proto_version=TLS1_VERSION;
|
|
|
a776bd |
+ section->min_proto_version=USE_DEFAULT_TLS_VERSION; /* use defaults in
|
|
|
a776bd |
+ OpenSSL crypto
|
|
|
a776bd |
+ policies. Do not
|
|
|
a776bd |
+ override it */
|
|
|
a776bd |
break;
|
|
|
a776bd |
case CMD_SET_COPY:
|
|
|
a776bd |
section->min_proto_version=new_service_options.min_proto_version;
|
|
|
a776bd |
--- stunnel-5.56/src/ctx.c.default-tls-version 2019-10-24 10:48:11.000000000 +0200
|
|
|
a776bd |
+++ stunnel-5.56/src/ctx.c 2020-04-06 11:16:48.406406794 +0200
|
|
|
a776bd |
@@ -143,17 +143,29 @@ int context_init(SERVICE_OPTIONS *sectio
|
|
|
a776bd |
section->ctx=SSL_CTX_new(TLS_client_method());
|
|
|
a776bd |
else /* server mode */
|
|
|
a776bd |
section->ctx=SSL_CTX_new(TLS_server_method());
|
|
|
a776bd |
- if(!SSL_CTX_set_min_proto_version(section->ctx,
|
|
|
a776bd |
- section->min_proto_version)) {
|
|
|
a776bd |
- s_log(LOG_ERR, "Failed to set the minimum protocol version 0x%X",
|
|
|
a776bd |
- section->min_proto_version);
|
|
|
a776bd |
- return 1; /* FAILED */
|
|
|
a776bd |
+
|
|
|
a776bd |
+ if (section->min_proto_version == USE_DEFAULT_TLS_VERSION) {
|
|
|
a776bd |
+ s_log(LOG_INFO, "Using the default TLS version as specified in \
|
|
|
a776bd |
+ OpenSSL crypto policies. Not setting explicitly.");
|
|
|
a776bd |
+ } else {
|
|
|
a776bd |
+ if(!SSL_CTX_set_min_proto_version(section->ctx,
|
|
|
a776bd |
+ section->min_proto_version)) {
|
|
|
a776bd |
+ s_log(LOG_ERR, "Failed to set the minimum protocol version 0x%X",
|
|
|
a776bd |
+ section->min_proto_version);
|
|
|
a776bd |
+ return 1; /* FAILED */
|
|
|
a776bd |
+ }
|
|
|
a776bd |
}
|
|
|
a776bd |
- if(!SSL_CTX_set_max_proto_version(section->ctx,
|
|
|
a776bd |
- section->max_proto_version)) {
|
|
|
a776bd |
- s_log(LOG_ERR, "Failed to set the maximum protocol version 0x%X",
|
|
|
a776bd |
- section->max_proto_version);
|
|
|
a776bd |
- return 1; /* FAILED */
|
|
|
a776bd |
+
|
|
|
a776bd |
+ if (section->max_proto_version == USE_DEFAULT_TLS_VERSION) {
|
|
|
a776bd |
+ s_log(LOG_INFO, "Using the default TLS version as specified in \
|
|
|
a776bd |
+ OpenSSL crypto policies. Not setting explicitly");
|
|
|
a776bd |
+ } else {
|
|
|
a776bd |
+ if(!SSL_CTX_set_max_proto_version(section->ctx,
|
|
|
a776bd |
+ section->max_proto_version)) {
|
|
|
a776bd |
+ s_log(LOG_ERR, "Failed to set the maximum protocol version 0x%X",
|
|
|
a776bd |
+ section->max_proto_version);
|
|
|
a776bd |
+ return 1; /* FAILED */
|
|
|
a776bd |
+ }
|
|
|
a776bd |
}
|
|
|
a776bd |
#else /* OPENSSL_VERSION_NUMBER<0x10100000L */
|
|
|
a776bd |
if(section->option.client)
|