From: Bogdan-Andrei Iancu <bogdan@opensips.org>
Date: Tue, 25 Jul 2017 14:18:08 +0300
Subject: [PATCH] Fixed wrong TLS parameters.

TLS configuration parameters were moved from proto_tls to tls_mgm module.
Credits to Mike Tesliuk for reporting this.

(cherry picked from commit f0e36896be10c69581ebf77def209df084c82d13)

diff --git a/menuconfig/configs/opensips_loadbalancer.m4 b/menuconfig/configs/opensips_loadbalancer.m4
index fcd468394..98506c3f1 100644
--- a/menuconfig/configs/opensips_loadbalancer.m4
+++ b/menuconfig/configs/opensips_loadbalancer.m4
@@ -145,12 +145,13 @@ loadmodule "proto_udp.so"
 
 ifelse(ENABLE_TCP, `yes', `loadmodule "proto_tcp.so"' , `')
 ifelse(ENABLE_TLS, `yes', `loadmodule "proto_tls.so"
-modparam("proto_tls","verify_cert", "1")
-modparam("proto_tls","require_cert", "0")
-modparam("proto_tls","tls_method", "TLSv1")
-modparam("proto_tls","certificate", "/usr/local/etc/opensips/tls/user/user-cert.pem")
-modparam("proto_tls","private_key", "/usr/local/etc/opensips/tls/user/user-privkey.pem")
-modparam("proto_tls","ca_list", "/usr/local/etc/opensips/tls/user/user-calist.pem")
+loadmodule "tls_mgm.so"
+modparam("tls_mgm","verify_cert", "1")
+modparam("tls_mgm","require_cert", "0")
+modparam("tls_mgm","tls_method", "TLSv1")
+modparam("tls_mgm","certificate", "/usr/local/etc/opensips/tls/user/user-cert.pem")
+modparam("tls_mgm","private_key", "/usr/local/etc/opensips/tls/user/user-privkey.pem")
+modparam("tls_mgm","ca_list", "/usr/local/etc/opensips/tls/user/user-calist.pem")
 
 ' , `')
 
diff --git a/menuconfig/configs/opensips_residential.m4 b/menuconfig/configs/opensips_residential.m4
index 94b9d6cc3..7018fa326 100644
--- a/menuconfig/configs/opensips_residential.m4
+++ b/menuconfig/configs/opensips_residential.m4
@@ -197,12 +197,13 @@ loadmodule "proto_udp.so"
 
 ifelse(ENABLE_TCP, `yes', `loadmodule "proto_tcp.so"' , `')
 ifelse(ENABLE_TLS, `yes', `loadmodule "proto_tls.so"
-modparam("proto_tls","verify_cert", "1")
-modparam("proto_tls","require_cert", "0")
-modparam("proto_tls","tls_method", "TLSv1")
-modparam("proto_tls","certificate", "/usr/local/etc/opensips/tls/user/user-cert.pem")
-modparam("proto_tls","private_key", "/usr/local/etc/opensips/tls/user/user-privkey.pem")
-modparam("proto_tls","ca_list", "/usr/local/etc/opensips/tls/user/user-calist.pem")
+loadmodule "tls_mgm.so"
+modparam("tls_mgm","verify_cert", "1")
+modparam("tls_mgm","require_cert", "0")
+modparam("tls_mgm","tls_method", "TLSv1")
+modparam("tls_mgm","certificate", "/usr/local/etc/opensips/tls/user/user-cert.pem")
+modparam("tls_mgm","private_key", "/usr/local/etc/opensips/tls/user/user-privkey.pem")
+modparam("tls_mgm","ca_list", "/usr/local/etc/opensips/tls/user/user-calist.pem")
 
 ' , `')
 
diff --git a/menuconfig/configs/opensips_trunking.m4 b/menuconfig/configs/opensips_trunking.m4
index 9b9500c05..6d2df2fac 100644
--- a/menuconfig/configs/opensips_trunking.m4
+++ b/menuconfig/configs/opensips_trunking.m4
@@ -141,12 +141,13 @@ loadmodule "proto_udp.so"
 
 ifelse(ENABLE_TCP, `yes', `loadmodule "proto_tcp.so"' , `')
 ifelse(ENABLE_TLS, `yes', `loadmodule "proto_tls.so"
-modparam("proto_tls","verify_cert", "1")
-modparam("proto_tls","require_cert", "0")
-modparam("proto_tls","tls_method", "TLSv1")
-modparam("proto_tls","certificate", "/usr/local/etc/opensips/tls/user/user-cert.pem")
-modparam("proto_tls","private_key", "/usr/local/etc/opensips/tls/user/user-privkey.pem")
-modparam("proto_tls","ca_list", "/usr/local/etc/opensips/tls/user/user-calist.pem")
+loadmodule "tls_mgm.so"
+modparam("tls_mgm","verify_cert", "1")
+modparam("tls_mgm","require_cert", "0")
+modparam("tls_mgm","tls_method", "TLSv1")
+modparam("tls_mgm","certificate", "/usr/local/etc/opensips/tls/user/user-cert.pem")
+modparam("tls_mgm","private_key", "/usr/local/etc/opensips/tls/user/user-privkey.pem")
+modparam("tls_mgm","ca_list", "/usr/local/etc/opensips/tls/user/user-calist.pem")
 
 ' , `')