Fix batch tests

Author: mxsasha

checks/models.py

@@ -679,7 +679,7 @@ def get_web_api_details(self):
             "protocols_phase_out": self.protocols_phase_out,
             "compression": self.compression,
             "secure_reneg": self.secure_reneg,
-            "client_reneg": self.client_reneg,
+            "client_reneg": self.client_reneg.name,
             "zero_rtt": self.zero_rtt.name,
             "ocsp_stapling": self.ocsp_stapling.name,
             "kex_hash_func": self.kex_hash_func.name,
@@ -717,7 +717,7 @@ def get_mail_api_details(self):
             "protocols_phase_out": self.protocols_phase_out,
             "compression": self.compression,
             "secure_reneg": self.secure_reneg,
-            "client_reneg": self.client_reneg,
+            "client_reneg": self.client_reneg.name,
             "zero_rtt": self.zero_rtt.name,
             "kex_hash_func": self.kex_hash_func.name,
             "key_exchange_rsa_pkcs": self.key_exchange_rsa_pkcs.name,

integration_tests/batch/results.py

@@ -26,11 +26,11 @@
         "web_https_http_compress": {"status": "passed", "verdict": "good"},
         "web_https_tls_keyexchange": {"status": "passed", "verdict": "good"},
         "web_https_tls_ciphers": {"status": "passed", "verdict": "good"},
-        "web_https_tls_cipherorder": {"status": "passed", "verdict": "na"},
+        "web_https_tls_cipherorder": {"status": "passed", "verdict": "good"},
         "web_https_tls_version": {"status": "passed", "verdict": "good"},
         "web_https_tls_compress": {"status": "passed", "verdict": "good"},
         "web_https_tls_secreneg": {"status": "passed", "verdict": "good"},
-        "web_https_tls_clientreneg": {"status": "passed", "verdict": "good"},
+        "web_https_tls_clientreneg": {"status": "passed", "verdict": "not-allowed"},
         "web_https_cert_chain": {"status": "failed", "verdict": "bad"},
         "web_https_cert_pubkey": {"status": "passed", "verdict": "good"},
         "web_https_cert_sig": {"status": "passed", "verdict": "good"},
@@ -72,16 +72,18 @@
                 "kex_params_phase_out": [],
                 "ciphers_bad": [],
                 "ciphers_phase_out": [],
-                "cipher_order": "na",
+                "cipher_order": "good",
                 "cipher_order_violation": [],
                 "protocols_bad": [],
                 "protocols_phase_out": [],
                 "compression": False,
                 "secure_reneg": True,
-                "client_reneg": False,
+                "client_reneg": "not_allowed",
                 "zero_rtt": "good",
                 "ocsp_stapling": "not_in_cert",
                 "kex_hash_func": "good",
+                "extended_master_secret": "supported",
+                "key_exchange_rsa_pkcs": "good",
                 "https_redirect": "good",
                 "http_compression": False,
                 "hsts": True,
@@ -136,16 +138,18 @@
                 "kex_params_phase_out": [],
                 "ciphers_bad": [],
                 "ciphers_phase_out": [],
-                "cipher_order": "na",
+                "cipher_order": "good",
                 "cipher_order_violation": [],
                 "protocols_bad": [],
                 "protocols_phase_out": [],
                 "compression": False,
                 "secure_reneg": True,
-                "client_reneg": False,
+                "client_reneg": "not_allowed",
                 "zero_rtt": "good",
                 "ocsp_stapling": "not_in_cert",
                 "kex_hash_func": "good",
+                "extended_master_secret": "supported",
+                "key_exchange_rsa_pkcs": "good",
                 "https_redirect": "good",
                 "http_compression": False,
                 "hsts": True,