dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41266?usp=email )
Change subject: ES2Plus_Tests: rename mp_es2plus_server_host to _fqdn ......................................................................
ES2Plus_Tests: rename mp_es2plus_server_host to _fqdn
Let's rename the module parameter mp_es2plus_server_host to mp_es2plus_server_fqdn. The reason for this is that the suffix "host" suggests that one may use an arbitrary hostname or IP address. In this case this is in fact not true. The FQDN must match the hostname of the SSL server certificate. Apart from that GSMA SGP.22 always uses the word "FQDN" in their specs.
Change-Id: Idedfcce4d013c32f43307e159c45854a1e6a049b Related: SYS#7339 --- M smdpp/ES2Plus_Tests.cfg M smdpp/ES2Plus_Tests.ttcn 2 files changed, 3 insertions(+), 3 deletions(-)
Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved
diff --git a/smdpp/ES2Plus_Tests.cfg b/smdpp/ES2Plus_Tests.cfg index 8be08ff..695f54c 100644 --- a/smdpp/ES2Plus_Tests.cfg +++ b/smdpp/ES2Plus_Tests.cfg @@ -8,7 +8,7 @@
[MODULE_PARAMETERS] # ES2+ specific parameters -ES2Plus_Tests.mp_es2plus_server_host := "127.0.0.1" +ES2Plus_Tests.mp_es2plus_server_fqdn := "127.0.0.1" # Must match the hostname of the server SSL certificate! ES2Plus_Tests.mp_es2plus_server_port := 8000 # NIST tests use port 8000 ES2Plus_Tests.mp_es2plus_operator_id := "test.operator.com"
diff --git a/smdpp/ES2Plus_Tests.ttcn b/smdpp/ES2Plus_Tests.ttcn index 63e3a64..c6765f4 100644 --- a/smdpp/ES2Plus_Tests.ttcn +++ b/smdpp/ES2Plus_Tests.ttcn @@ -47,7 +47,7 @@ // testsuite (libcurl) will also verify the presented server certificate against the related CA. To ensure that // the server certificate verification is possible, ensure that the related CA certificates are made available in // /etc/ssl/certs - charstring mp_es2plus_server_host := "testsmdpplus1.example.com"; + charstring mp_es2plus_server_fqdn := "testsmdpplus1.example.com";
// Sets the server port of the ES2+ server (SM-DP+). integer mp_es2plus_server_port := 8000; @@ -191,7 +191,7 @@ function f_init_es2plus() runs on ES2Plus_ConnHdlr { // Initialize RSP client using imported function from smdpp_Tests g_rsp_client_handle := smdpp_Tests.ext_RSPClient_create( - mp_es2plus_server_host, + mp_es2plus_server_fqdn, mp_es2plus_server_port, c_es2plus_cert_path, c_es2plus_cert_name_filter