Update contrib/restricted/aws/s2n to 1.3.29

1 files changed, 26 insertions, 22 deletions

diff --git a/contrib/restricted/aws/s2n/error/s2n_errno.c b/contrib/restricted/aws/s2n/error/s2n_errno.c
index 4d64fc4531..f1059bd182 100644
--- a/contrib/restricted/aws/s2n/error/s2n_errno.c
+++ b/contrib/restricted/aws/s2n/error/s2n_errno.c
@@ -13,19 +13,20 @@
  * permissions and limitations under the License.
  */
 
+#include "error/s2n_errno.h"
+
 #include <errno.h>
-#include <strings.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "error/s2n_errno.h"
+#include <strings.h>
 
 #include "api/s2n.h"
 #include "utils/s2n_map.h"
 #include "utils/s2n_safety.h"
 
 #ifdef S2N_STACKTRACE
-#   include <execinfo.h>
+    #include <execinfo.h>
 #endif
 
 __thread int s2n_errno;
@@ -287,10 +288,14 @@ static const char *no_such_error = "Internal s2n error";
     ERR_ENTRY(S2N_ERR_INTERNAL_LIBCRYPTO_ERROR, "An internal error has occurred in the libcrypto API") \
     ERR_ENTRY(S2N_ERR_NO_RENEGOTIATION, "Only secure, server-initiated renegotiation is supported") \
     ERR_ENTRY(S2N_ERR_APP_DATA_BLOCKED, "Blocked on application data during handshake") \
-/* clang-format on */
+    /* clang-format on */
 
-#define ERR_STR_CASE(ERR, str) case ERR: return str;
-#define ERR_NAME_CASE(ERR, str) case ERR: return #ERR;
+#define ERR_STR_CASE(ERR, str) \
+    case ERR:                  \
+        return str;
+#define ERR_NAME_CASE(ERR, str) \
+    case ERR:                   \
+        return #ERR;
 
 const char *s2n_strerror(int error, const char *lang)
 {
@@ -317,7 +322,7 @@ const char *s2n_strerror(int error, const char *lang)
         case S2N_ERR_T_USAGE_END:
             break;
 
-        /* No default to make compiler fail on missing values */
+            /* No default to make compiler fail on missing values */
     }
 
     return no_such_error;
@@ -340,7 +345,7 @@ const char *s2n_strerror_name(int error)
         case S2N_ERR_T_USAGE_END:
             break;
 
-        /* No default to make compiler fail on missing values */
+            /* No default to make compiler fail on missing values */
     }
 
     return no_such_error;
@@ -369,7 +374,6 @@ int s2n_error_get_type(int error)
     return (error >> S2N_ERR_NUM_VALUE_BITS);
 }
 
-
 /* https://www.gnu.org/software/libc/manual/html_node/Backtraces.html */
 static bool s_s2n_stack_traces_enabled = false;
 
@@ -386,15 +390,15 @@ int s2n_stack_traces_enabled_set(bool newval)
 
 #ifdef S2N_STACKTRACE
 
-#define MAX_BACKTRACE_DEPTH 20
-__thread struct s2n_stacktrace tl_stacktrace = {0};
+    #define MAX_BACKTRACE_DEPTH 20
+__thread struct s2n_stacktrace tl_stacktrace = { 0 };
 
 int s2n_free_stacktrace(void)
 {
     if (tl_stacktrace.trace != NULL) {
         free(tl_stacktrace.trace);
-	struct s2n_stacktrace zero_stacktrace = {0};
-	tl_stacktrace = zero_stacktrace;
+        struct s2n_stacktrace zero_stacktrace = { 0 };
+        tl_stacktrace = zero_stacktrace;
     }
     return S2N_SUCCESS;
 }
@@ -414,7 +418,8 @@ int s2n_calculate_stacktrace(void)
     return S2N_SUCCESS;
 }
 
-int s2n_get_stacktrace(struct s2n_stacktrace *trace) {
+int s2n_get_stacktrace(struct s2n_stacktrace *trace)
+{
     *trace = tl_stacktrace;
     return S2N_SUCCESS;
 }
@@ -422,20 +427,20 @@ int s2n_get_stacktrace(struct s2n_stacktrace *trace) {
 int s2n_print_stacktrace(FILE *fptr)
 {
     if (!s_s2n_stack_traces_enabled) {
-      fprintf(fptr, "%s\n%s\n",
-	      "NOTE: Some details are omitted, run with S2N_PRINT_STACKTRACE=1 for a verbose backtrace.",
-	      "See https://github.com/aws/s2n-tls/blob/main/docs/USAGE-GUIDE.md");
+        fprintf(fptr, "%s\n%s\n",
+                "NOTE: Some details are omitted, run with S2N_PRINT_STACKTRACE=1 for a verbose backtrace.",
+                "See https://github.com/aws/s2n-tls/blob/main/docs/USAGE-GUIDE.md");
         return S2N_SUCCESS;
     }
 
     fprintf(fptr, "\nStacktrace is:\n");
-    for (int i = 0; i < tl_stacktrace.trace_size; ++i){
-        fprintf(fptr, "%s\n",  tl_stacktrace.trace[i]);
+    for (int i = 0; i < tl_stacktrace.trace_size; ++i) {
+        fprintf(fptr, "%s\n", tl_stacktrace.trace[i]);
     }
     return S2N_SUCCESS;
 }
 
-#else /* !S2N_STACKTRACE */
+#else  /* !S2N_STACKTRACE */
 int s2n_free_stacktrace(void)
 {
     S2N_ERROR(S2N_ERR_UNIMPLEMENTED);
@@ -443,8 +448,7 @@ int s2n_free_stacktrace(void)
 
 int s2n_calculate_stacktrace(void)
 {
-    if (!s_s2n_stack_traces_enabled)
-    {
+    if (!s_s2n_stack_traces_enabled) {
         return S2N_SUCCESS;
     }