|
1 | 1 | # Copyright: 2022, ECP, NLnet Labs and the Internet.nl contributors |
2 | 2 | # SPDX-License-Identifier: Apache-2.0 |
| 3 | +import itertools |
3 | 4 | import time |
4 | 5 | from timeit import default_timer as timer |
5 | 6 |
|
@@ -483,10 +484,11 @@ def annotate_and_combine_all(good_items, sufficient_items, bad_items, phaseout_i |
483 | 484 | pass |
484 | 485 | else: |
485 | 486 | cert_pubkey_all = annotate_and_combine(dttls.cert_pubkey_bad, dttls.cert_pubkey_phase_out) |
| 487 | + cert_pubkey_format = list(itertools.chain(*zip(cert_pubkey_all[0], cert_pubkey_all[1]))) |
486 | 488 | if len(dttls.cert_pubkey_bad) > 0: |
487 | | - category.subtests["cert_pubkey"].result_bad(cert_pubkey_all) |
| 489 | + category.subtests["cert_pubkey"].result_bad(cert_pubkey_format) |
488 | 490 | elif len(dttls.cert_pubkey_phase_out) > 0: |
489 | | - category.subtests["cert_pubkey"].result_phase_out(cert_pubkey_all) |
| 491 | + category.subtests["cert_pubkey"].result_phase_out(cert_pubkey_format) |
490 | 492 | else: |
491 | 493 | category.subtests["cert_pubkey"].result_good() |
492 | 494 |
|
@@ -643,10 +645,11 @@ def annotate_and_combine_all(good_items, sufficient_items, bad_items, phaseout_i |
643 | 645 | pass |
644 | 646 | else: |
645 | 647 | cert_pubkey_all = annotate_and_combine(dttls.cert_pubkey_bad, dttls.cert_pubkey_phase_out) |
| 648 | + cert_pubkey_format = list(itertools.chain(*zip(cert_pubkey_all[0], cert_pubkey_all[1]))) |
646 | 649 | if len(dttls.cert_pubkey_bad) > 0: |
647 | | - category.subtests["cert_pubkey"].result_bad(cert_pubkey_all) |
| 650 | + category.subtests["cert_pubkey"].result_bad(cert_pubkey_format) |
648 | 651 | elif len(dttls.cert_pubkey_phase_out) > 0: |
649 | | - category.subtests["cert_pubkey"].result_phase_out(cert_pubkey_all) |
| 652 | + category.subtests["cert_pubkey"].result_phase_out(cert_pubkey_format) |
650 | 653 | else: |
651 | 654 | category.subtests["cert_pubkey"].result_good() |
652 | 655 |
|
|
0 commit comments