laantungir/fips
1
0
Fork 0
mirror of https://github.com/jmcorgan/fips.git synced 2026-07-30 19:46:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint' into master

Browse Source
This commit is contained in:
Johnathan Corgan
2026-07-16 05:55:20 +00:00
parent 054d17aac5 fbb4fb8879
commit e42598a86e
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/static/scripts/rekey-test.sh
+9 -5
View File
@@ -416,16 +416,20 @@ phase_result "Post-first-rekey (all 20 pairs)"
echo "" echo ""
# ── Phase 4: Wait for second rekey cycle ────────────────────────────── # ── Phase 4: Wait for second rekey cycle ──────────────────────────────
# Poll for the next FMP rekey cutover instead of blind-sleeping: capture # Poll for the FMP rekey cutovers instead of blind-sleeping: capture the
# the cutover count reached so far, then wait until at least one more # cutover count reached so far, then wait until two more land. The second
# cutover lands — that increment is the second rekey cycle firing. # rekey cycle produces two initiator cutovers, which is exactly the total
# the Phase 6 assertion (>= 4) requires. Waiting for only one guaranteed a
# count of three and left the fourth cutover to land in the gap before the
# Phase 6 snapshot, so host load could push it past the window and fail the
# run even though every cutover completed correctly.
# Bounded by SECOND_REKEY_WAIT so a stalled rekey still falls through to # Bounded by SECOND_REKEY_WAIT so a stalled rekey still falls through to
# the strict Phase 5/6 assertions rather than hanging. # the strict Phase 5/6 assertions rather than hanging.
echo "Phase 4: Second rekey cycle (waiting up to ${SECOND_REKEY_WAIT}s for the next cutover)" echo "Phase 4: Second rekey cycle (waiting up to ${SECOND_REKEY_WAIT}s for the second-cycle cutovers)"
fmp_cutovers_before=$(count_log_pattern "Rekey cutover complete (initiator), K-bit flipped") fmp_cutovers_before=$(count_log_pattern "Rekey cutover complete (initiator), K-bit flipped")
wait_for_log_pattern_count \ wait_for_log_pattern_count \
"Rekey cutover complete (initiator), K-bit flipped" \ "Rekey cutover complete (initiator), K-bit flipped" \
"$((fmp_cutovers_before + 1))" "$SECOND_REKEY_WAIT" || true "$((fmp_cutovers_before + 2))" "$SECOND_REKEY_WAIT" || true
# Verify connectivity after second rekey (back-to-back). This is the # Verify connectivity after second rekey (back-to-back). This is the
# site of the recurring post-second-rekey straggler-pair flake: wait for # site of the recurring post-second-rekey straggler-pair flake: wait for