Merge branch 'main' into remove-no-pq-opt

aws · Jun 25, 2024 · 91625bb · 91625bb
2 parents 7bdfe6c + 023f788
commit 91625bb
Show file tree

Hide file tree

Showing 13 changed files with 842 additions and 515 deletions.
diff --git a/api/s2n.h b/api/s2n.h
@@ -1992,6 +1992,8 @@ S2N_API extern uint64_t s2n_connection_get_delay(struct s2n_connection *conn);
  * @warning Do NOT set a lower blinding delay unless you understand the risks and have other
  * mitigations for timing side channels in place.
  *
+ * @note This delay needs to be set lower than any timeouts, such as your TCP socket timeout.
+ *
  * @param config The config object being updated.
  * @param seconds The maximum number of seconds that s2n-tls will delay for in the event of a
  * sensitive error.