diff --git a/.testbed/cdrouter/configurations/generic b/.testbed/cdrouter/configurations/generic index 90bc47b4b2..3aede74229 100644 --- a/.testbed/cdrouter/configurations/generic +++ b/.testbed/cdrouter/configurations/generic @@ -2297,9 +2297,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "Basic ACS Configuration" { # testvar acsIp 6.0.0.1 - # testvar acsPort 80 + testvar acsPort 443 testvar acsDomain acs-download.qacafe.com - # testvar acsTransport http + testvar acsTransport https # testvar acsAuth digest # testvar acsDigestQopAuth yes # testvar acsInterface wan @@ -2352,9 +2352,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "SSL Configuration" { - # testvar acsSslVersion tls - # testvar acsCertPath /usr/cdrouter/tests/acs.cdroutertest.com.pem - # testvar acsCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem + testvar acsSslVersion tlsv1_3 + testvar acsCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/server.pem + testvar acsCaCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/ca.crt # testvar acsDownloadCertPath /usr/cdrouter/tests/acs-download.cdroutertest.com.pem # testvar acsDownloadCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem # testvar acsCipherSuite auto diff --git a/.testbed/cdrouter/configurations/generic-ipv6 b/.testbed/cdrouter/configurations/generic-ipv6 index 330ce5bbe9..e26ee94ca5 100644 --- a/.testbed/cdrouter/configurations/generic-ipv6 +++ b/.testbed/cdrouter/configurations/generic-ipv6 @@ -2297,9 +2297,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "Basic ACS Configuration" { # testvar acsIp 6.0.0.1 - # testvar acsPort 80 + testvar acsPort 443 testvar acsDomain acs-download.qacafe.com - # testvar acsTransport http + testvar acsTransport https # testvar acsAuth digest # testvar acsDigestQopAuth yes # testvar acsInterface wan @@ -2352,9 +2352,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "SSL Configuration" { - # testvar acsSslVersion tls - # testvar acsCertPath /usr/cdrouter/tests/acs.cdroutertest.com.pem - # testvar acsCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem + testvar acsSslVersion tlsv1_3 + testvar acsCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/server.pem + testvar acsCaCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/ca.crt # testvar acsDownloadCertPath /usr/cdrouter/tests/acs-download.cdroutertest.com.pem # testvar acsDownloadCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem # testvar acsCipherSuite auto diff --git a/.testbed/cdrouter/configurations/generic-ipv6-dslite b/.testbed/cdrouter/configurations/generic-ipv6-dslite index 912dcfdfd9..dadcc4f9a5 100644 --- a/.testbed/cdrouter/configurations/generic-ipv6-dslite +++ b/.testbed/cdrouter/configurations/generic-ipv6-dslite @@ -2297,9 +2297,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "Basic ACS Configuration" { # testvar acsIp 6.0.0.1 - # testvar acsPort 80 + testvar acsPort 443 testvar acsDomain acs-download.qacafe.com - # testvar acsTransport http + testvar acsTransport https # testvar acsAuth digest # testvar acsDigestQopAuth yes # testvar acsInterface wan @@ -2352,9 +2352,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "SSL Configuration" { - # testvar acsSslVersion tls - # testvar acsCertPath /usr/cdrouter/tests/acs.cdroutertest.com.pem - # testvar acsCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem + testvar acsSslVersion tlsv1_3 + testvar acsCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/server.pem + testvar acsCaCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/ca.crt # testvar acsDownloadCertPath /usr/cdrouter/tests/acs-download.cdroutertest.com.pem # testvar acsDownloadCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem # testvar acsCipherSuite auto diff --git a/.testbed/cdrouter/configurations/generic-ipv6-upnp b/.testbed/cdrouter/configurations/generic-ipv6-upnp index 7ac1a3d96c..5311dff9ca 100644 --- a/.testbed/cdrouter/configurations/generic-ipv6-upnp +++ b/.testbed/cdrouter/configurations/generic-ipv6-upnp @@ -2297,9 +2297,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "Basic ACS Configuration" { # testvar acsIp 6.0.0.1 - # testvar acsPort 80 + testvar acsPort 443 testvar acsDomain acs-download.qacafe.com - # testvar acsTransport http + testvar acsTransport https # testvar acsAuth digest # testvar acsDigestQopAuth yes # testvar acsInterface wan @@ -2352,9 +2352,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "SSL Configuration" { - # testvar acsSslVersion tls - # testvar acsCertPath /usr/cdrouter/tests/acs.cdroutertest.com.pem - # testvar acsCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem + testvar acsSslVersion tlsv1_3 + testvar acsCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/server.pem + testvar acsCaCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/ca.crt # testvar acsDownloadCertPath /usr/cdrouter/tests/acs-download.cdroutertest.com.pem # testvar acsDownloadCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem # testvar acsCipherSuite auto diff --git a/.testbed/cdrouter/configurations/ppp b/.testbed/cdrouter/configurations/ppp index 297ff6b0ba..bd7669c418 100644 --- a/.testbed/cdrouter/configurations/ppp +++ b/.testbed/cdrouter/configurations/ppp @@ -2297,9 +2297,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "Basic ACS Configuration" { # testvar acsIp 6.0.0.1 - # testvar acsPort 80 + testvar acsPort 443 testvar acsDomain acs-download.qacafe.com - # testvar acsTransport http + testvar acsTransport https # testvar acsAuth digest # testvar acsDigestQopAuth yes # testvar acsInterface wan @@ -2352,9 +2352,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "SSL Configuration" { - # testvar acsSslVersion tls - # testvar acsCertPath /usr/cdrouter/tests/acs.cdroutertest.com.pem - # testvar acsCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem + testvar acsSslVersion tlsv1_3 + testvar acsCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/server.pem + testvar acsCaCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/ca.crt # testvar acsDownloadCertPath /usr/cdrouter/tests/acs-download.cdroutertest.com.pem # testvar acsDownloadCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem # testvar acsCipherSuite auto diff --git a/.testbed/cdrouter/configurations/ppp-ipv6 b/.testbed/cdrouter/configurations/ppp-ipv6 index 72fcc9546b..2e7c3d7d0d 100644 --- a/.testbed/cdrouter/configurations/ppp-ipv6 +++ b/.testbed/cdrouter/configurations/ppp-ipv6 @@ -2297,9 +2297,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "Basic ACS Configuration" { # testvar acsIp 6.0.0.1 - # testvar acsPort 80 + testvar acsPort 443 testvar acsDomain acs-download.qacafe.com - # testvar acsTransport http + testvar acsTransport https # testvar acsAuth digest # testvar acsDigestQopAuth yes # testvar acsInterface wan @@ -2352,9 +2352,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "SSL Configuration" { - # testvar acsSslVersion tls - # testvar acsCertPath /usr/cdrouter/tests/acs.cdroutertest.com.pem - # testvar acsCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem + testvar acsSslVersion tlsv1_3 + testvar acsCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/server.pem + testvar acsCaCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/ca.crt # testvar acsDownloadCertPath /usr/cdrouter/tests/acs-download.cdroutertest.com.pem # testvar acsDownloadCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem # testvar acsCipherSuite auto diff --git a/.testbed/cdrouter/configurations/smoke-test b/.testbed/cdrouter/configurations/smoke-test index 2ac5082628..e3bb7fc0a9 100644 --- a/.testbed/cdrouter/configurations/smoke-test +++ b/.testbed/cdrouter/configurations/smoke-test @@ -2297,9 +2297,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "Basic ACS Configuration" { # testvar acsIp 6.0.0.1 - # testvar acsPort 80 + testvar acsPort 443 testvar acsDomain acs-download.qacafe.com - # testvar acsTransport http + testvar acsTransport https # testvar acsAuth digest # testvar acsDigestQopAuth yes # testvar acsInterface wan @@ -2352,9 +2352,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "SSL Configuration" { - # testvar acsSslVersion tls - # testvar acsCertPath /usr/cdrouter/tests/acs.cdroutertest.com.pem - # testvar acsCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem + testvar acsSslVersion tlsv1_3 + testvar acsCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/server.pem + testvar acsCaCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/ca.crt # testvar acsDownloadCertPath /usr/cdrouter/tests/acs-download.cdroutertest.com.pem # testvar acsDownloadCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem # testvar acsCipherSuite auto diff --git a/.testbed/cdrouter/configurations/vlan b/.testbed/cdrouter/configurations/vlan index 123967a5ec..1dea7f4491 100644 --- a/.testbed/cdrouter/configurations/vlan +++ b/.testbed/cdrouter/configurations/vlan @@ -2297,9 +2297,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "Basic ACS Configuration" { # testvar acsIp 6.0.0.1 - # testvar acsPort 80 + testvar acsPort 443 testvar acsDomain acs-download.qacafe.com - # testvar acsTransport http + testvar acsTransport https # testvar acsAuth digest # testvar acsDigestQopAuth yes # testvar acsInterface wan @@ -2352,9 +2352,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "SSL Configuration" { - # testvar acsSslVersion tls - # testvar acsCertPath /usr/cdrouter/tests/acs.cdroutertest.com.pem - # testvar acsCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem + testvar acsSslVersion tlsv1_3 + testvar acsCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/server.pem + testvar acsCaCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/ca.crt # testvar acsDownloadCertPath /usr/cdrouter/tests/acs-download.cdroutertest.com.pem # testvar acsDownloadCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem # testvar acsCipherSuite auto diff --git a/.testbed/cdrouter/configurations/vlan-ipv6 b/.testbed/cdrouter/configurations/vlan-ipv6 index 5c16aab241..ca59fc84fe 100644 --- a/.testbed/cdrouter/configurations/vlan-ipv6 +++ b/.testbed/cdrouter/configurations/vlan-ipv6 @@ -2297,9 +2297,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "Basic ACS Configuration" { # testvar acsIp 6.0.0.1 - # testvar acsPort 80 + testvar acsPort 443 testvar acsDomain acs-download.qacafe.com - # testvar acsTransport http + testvar acsTransport https # testvar acsAuth digest # testvar acsDigestQopAuth yes # testvar acsInterface wan @@ -2352,9 +2352,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "SSL Configuration" { - # testvar acsSslVersion tls - # testvar acsCertPath /usr/cdrouter/tests/acs.cdroutertest.com.pem - # testvar acsCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem + testvar acsSslVersion tlsv1_3 + testvar acsCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/server.pem + testvar acsCaCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/ca.crt # testvar acsDownloadCertPath /usr/cdrouter/tests/acs-download.cdroutertest.com.pem # testvar acsDownloadCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem # testvar acsCipherSuite auto diff --git a/.testbed/cdrouter/configurations/vlan-ppp b/.testbed/cdrouter/configurations/vlan-ppp index da18bde8d4..57aa69c70f 100644 --- a/.testbed/cdrouter/configurations/vlan-ppp +++ b/.testbed/cdrouter/configurations/vlan-ppp @@ -2297,9 +2297,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "Basic ACS Configuration" { # testvar acsIp 6.0.0.1 - # testvar acsPort 80 + testvar acsPort 443 testvar acsDomain acs-download.qacafe.com - # testvar acsTransport http + testvar acsTransport https # testvar acsAuth digest # testvar acsDigestQopAuth yes # testvar acsInterface wan @@ -2352,9 +2352,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "SSL Configuration" { - # testvar acsSslVersion tls - # testvar acsCertPath /usr/cdrouter/tests/acs.cdroutertest.com.pem - # testvar acsCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem + testvar acsSslVersion tlsv1_3 + testvar acsCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/server.pem + testvar acsCaCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/ca.crt # testvar acsDownloadCertPath /usr/cdrouter/tests/acs-download.cdroutertest.com.pem # testvar acsDownloadCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem # testvar acsCipherSuite auto diff --git a/.testbed/cdrouter/configurations/vlan-ppp-ipv6 b/.testbed/cdrouter/configurations/vlan-ppp-ipv6 index 808c54c421..2a74d98d6e 100644 --- a/.testbed/cdrouter/configurations/vlan-ppp-ipv6 +++ b/.testbed/cdrouter/configurations/vlan-ppp-ipv6 @@ -2297,9 +2297,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "Basic ACS Configuration" { # testvar acsIp 6.0.0.1 - # testvar acsPort 80 + testvar acsPort 443 testvar acsDomain acs-download.qacafe.com - # testvar acsTransport http + testvar acsTransport https # testvar acsAuth digest # testvar acsDigestQopAuth yes # testvar acsInterface wan @@ -2352,9 +2352,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "SSL Configuration" { - # testvar acsSslVersion tls - # testvar acsCertPath /usr/cdrouter/tests/acs.cdroutertest.com.pem - # testvar acsCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem + testvar acsSslVersion tlsv1_3 + testvar acsCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/server.pem + testvar acsCaCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/ca.crt # testvar acsDownloadCertPath /usr/cdrouter/tests/acs-download.cdroutertest.com.pem # testvar acsDownloadCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem # testvar acsCipherSuite auto diff --git a/.testbed/cdrouter/configurations/wireless b/.testbed/cdrouter/configurations/wireless index 698aa58a93..549bc43ba2 100644 --- a/.testbed/cdrouter/configurations/wireless +++ b/.testbed/cdrouter/configurations/wireless @@ -2297,9 +2297,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "Basic ACS Configuration" { # testvar acsIp 6.0.0.1 - # testvar acsPort 80 + testvar acsPort 443 testvar acsDomain acs-download.qacafe.com - # testvar acsTransport http + testvar acsTransport https # testvar acsAuth digest # testvar acsDigestQopAuth yes # testvar acsInterface wan @@ -2352,9 +2352,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "SSL Configuration" { - # testvar acsSslVersion tls - # testvar acsCertPath /usr/cdrouter/tests/acs.cdroutertest.com.pem - # testvar acsCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem + testvar acsSslVersion tlsv1_3 + testvar acsCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/server.pem + testvar acsCaCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/ca.crt # testvar acsDownloadCertPath /usr/cdrouter/tests/acs-download.cdroutertest.com.pem # testvar acsDownloadCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem # testvar acsCipherSuite auto