Update contrib/restricted/aws/s2n to 1.3.29

8 files changed, 28 insertions, 28 deletions

diff --git a/contrib/restricted/aws/s2n/crypto/s2n_aead_cipher_aes_gcm.c b/contrib/restricted/aws/s2n/crypto/s2n_aead_cipher_aes_gcm.c
index 914a44ceae..395c500994 100644
--- a/contrib/restricted/aws/s2n/crypto/s2n_aead_cipher_aes_gcm.c
+++ b/contrib/restricted/aws/s2n/crypto/s2n_aead_cipher_aes_gcm.c
@@ -378,7 +378,7 @@ static int s2n_aead_cipher_aes_gcm_destroy_key(struct s2n_session_key *key)
 
 #endif
 
-struct s2n_cipher s2n_aes128_gcm = {
+const struct s2n_cipher s2n_aes128_gcm = {
     .key_material_size = S2N_TLS_AES_128_GCM_KEY_LEN,
     .type = S2N_AEAD,
     .io.aead = {
@@ -394,7 +394,7 @@ struct s2n_cipher s2n_aes128_gcm = {
     .destroy_key = s2n_aead_cipher_aes_gcm_destroy_key,
 };
 
-struct s2n_cipher s2n_aes256_gcm = {
+const struct s2n_cipher s2n_aes256_gcm = {
     .key_material_size = S2N_TLS_AES_256_GCM_KEY_LEN,
     .type = S2N_AEAD,
     .io.aead = {
@@ -411,7 +411,7 @@ struct s2n_cipher s2n_aes256_gcm = {
 };
 
 /* TLS 1.3 GCM ciphers */
-struct s2n_cipher s2n_tls13_aes128_gcm = {
+const struct s2n_cipher s2n_tls13_aes128_gcm = {
     .key_material_size = S2N_TLS_AES_128_GCM_KEY_LEN,
     .type = S2N_AEAD,
     .io.aead = {
@@ -427,7 +427,7 @@ struct s2n_cipher s2n_tls13_aes128_gcm = {
     .destroy_key = s2n_aead_cipher_aes_gcm_destroy_key,
 };
 
-struct s2n_cipher s2n_tls13_aes256_gcm = {
+const struct s2n_cipher s2n_tls13_aes256_gcm = {
     .key_material_size = S2N_TLS_AES_256_GCM_KEY_LEN,
     .type = S2N_AEAD,
     .io.aead = {
diff --git a/contrib/restricted/aws/s2n/crypto/s2n_aead_cipher_chacha20_poly1305.c b/contrib/restricted/aws/s2n/crypto/s2n_aead_cipher_chacha20_poly1305.c
index f044352b6d..0a119baac6 100644
--- a/contrib/restricted/aws/s2n/crypto/s2n_aead_cipher_chacha20_poly1305.c
+++ b/contrib/restricted/aws/s2n/crypto/s2n_aead_cipher_chacha20_poly1305.c
@@ -262,7 +262,7 @@ static int s2n_aead_chacha20_poly1305_destroy_key(struct s2n_session_key *key)
 
 #endif
 
-struct s2n_cipher s2n_chacha20_poly1305 = {
+const struct s2n_cipher s2n_chacha20_poly1305 = {
     .key_material_size = S2N_TLS_CHACHA20_POLY1305_KEY_LEN,
     .type = S2N_AEAD,
     .io.aead = {
diff --git a/contrib/restricted/aws/s2n/crypto/s2n_cbc_cipher_3des.c b/contrib/restricted/aws/s2n/crypto/s2n_cbc_cipher_3des.c
index 2704a0deb3..f90d116f01 100644
--- a/contrib/restricted/aws/s2n/crypto/s2n_cbc_cipher_3des.c
+++ b/contrib/restricted/aws/s2n/crypto/s2n_cbc_cipher_3des.c
@@ -90,7 +90,7 @@ static int s2n_cbc_cipher_3des_destroy_key(struct s2n_session_key *key)
     return 0;
 }
 
-struct s2n_cipher s2n_3des = {
+const struct s2n_cipher s2n_3des = {
     .key_material_size = 24,
     .type = S2N_CBC,
     .io.cbc = {
diff --git a/contrib/restricted/aws/s2n/crypto/s2n_cbc_cipher_aes.c b/contrib/restricted/aws/s2n/crypto/s2n_cbc_cipher_aes.c
index d4a49940d6..489a0e329f 100644
--- a/contrib/restricted/aws/s2n/crypto/s2n_cbc_cipher_aes.c
+++ b/contrib/restricted/aws/s2n/crypto/s2n_cbc_cipher_aes.c
@@ -116,7 +116,7 @@ static int s2n_cbc_cipher_aes_destroy_key(struct s2n_session_key *key)
     return 0;
 }
 
-struct s2n_cipher s2n_aes128 = {
+const struct s2n_cipher s2n_aes128 = {
     .key_material_size = 16,
     .type = S2N_CBC,
     .io.cbc = {
@@ -131,7 +131,7 @@ struct s2n_cipher s2n_aes128 = {
     .destroy_key = s2n_cbc_cipher_aes_destroy_key,
 };
 
-struct s2n_cipher s2n_aes256 = {
+const struct s2n_cipher s2n_aes256 = {
     .key_material_size = 32,
     .type = S2N_CBC,
     .io.cbc = {
diff --git a/contrib/restricted/aws/s2n/crypto/s2n_cipher.h b/contrib/restricted/aws/s2n/crypto/s2n_cipher.h
index 811f3e081d..460187ee10 100644
--- a/contrib/restricted/aws/s2n/crypto/s2n_cipher.h
+++ b/contrib/restricted/aws/s2n/crypto/s2n_cipher.h
@@ -87,18 +87,18 @@ struct s2n_cipher {
 extern int s2n_session_key_alloc(struct s2n_session_key *key);
 extern int s2n_session_key_free(struct s2n_session_key *key);
 
-extern struct s2n_cipher s2n_null_cipher;
-extern struct s2n_cipher s2n_rc4;
-extern struct s2n_cipher s2n_aes128;
-extern struct s2n_cipher s2n_aes256;
-extern struct s2n_cipher s2n_3des;
-extern struct s2n_cipher s2n_aes128_gcm;
-extern struct s2n_cipher s2n_aes256_gcm;
-extern struct s2n_cipher s2n_aes128_sha;
-extern struct s2n_cipher s2n_aes256_sha;
-extern struct s2n_cipher s2n_aes128_sha256;
-extern struct s2n_cipher s2n_aes256_sha256;
-extern struct s2n_cipher s2n_chacha20_poly1305;
+extern const struct s2n_cipher s2n_null_cipher;
+extern const struct s2n_cipher s2n_rc4;
+extern const struct s2n_cipher s2n_aes128;
+extern const struct s2n_cipher s2n_aes256;
+extern const struct s2n_cipher s2n_3des;
+extern const struct s2n_cipher s2n_aes128_gcm;
+extern const struct s2n_cipher s2n_aes256_gcm;
+extern const struct s2n_cipher s2n_aes128_sha;
+extern const struct s2n_cipher s2n_aes256_sha;
+extern const struct s2n_cipher s2n_aes128_sha256;
+extern const struct s2n_cipher s2n_aes256_sha256;
+extern const struct s2n_cipher s2n_chacha20_poly1305;
 
-extern struct s2n_cipher s2n_tls13_aes128_gcm;
-extern struct s2n_cipher s2n_tls13_aes256_gcm;
+extern const struct s2n_cipher s2n_tls13_aes128_gcm;
+extern const struct s2n_cipher s2n_tls13_aes256_gcm;
diff --git a/contrib/restricted/aws/s2n/crypto/s2n_composite_cipher_aes_sha.c b/contrib/restricted/aws/s2n/crypto/s2n_composite_cipher_aes_sha.c
index 7141f9ccf1..10bedf3941 100644
--- a/contrib/restricted/aws/s2n/crypto/s2n_composite_cipher_aes_sha.c
+++ b/contrib/restricted/aws/s2n/crypto/s2n_composite_cipher_aes_sha.c
@@ -303,7 +303,7 @@ static int s2n_composite_cipher_aes_sha_destroy_key(struct s2n_session_key *key)
     return 0;
 }
 
-struct s2n_cipher s2n_aes128_sha = {
+const struct s2n_cipher s2n_aes128_sha = {
     .key_material_size = 16,
     .type = S2N_COMPOSITE,
     .io.comp = {
@@ -321,7 +321,7 @@ struct s2n_cipher s2n_aes128_sha = {
     .destroy_key = s2n_composite_cipher_aes_sha_destroy_key,
 };
 
-struct s2n_cipher s2n_aes256_sha = {
+const struct s2n_cipher s2n_aes256_sha = {
     .key_material_size = 32,
     .type = S2N_COMPOSITE,
     .io.comp = {
@@ -339,7 +339,7 @@ struct s2n_cipher s2n_aes256_sha = {
     .destroy_key = s2n_composite_cipher_aes_sha_destroy_key,
 };
 
-struct s2n_cipher s2n_aes128_sha256 = {
+const struct s2n_cipher s2n_aes128_sha256 = {
     .key_material_size = 16,
     .type = S2N_COMPOSITE,
     .io.comp = {
@@ -357,7 +357,7 @@ struct s2n_cipher s2n_aes128_sha256 = {
     .destroy_key = s2n_composite_cipher_aes_sha_destroy_key,
 };
 
-struct s2n_cipher s2n_aes256_sha256 = {
+const struct s2n_cipher s2n_aes256_sha256 = {
     .key_material_size = 32,
     .type = S2N_COMPOSITE,
     .io.comp = {
diff --git a/contrib/restricted/aws/s2n/crypto/s2n_stream_cipher_null.c b/contrib/restricted/aws/s2n/crypto/s2n_stream_cipher_null.c
index 6e4681782b..48b6f0dbf5 100644
--- a/contrib/restricted/aws/s2n/crypto/s2n_stream_cipher_null.c
+++ b/contrib/restricted/aws/s2n/crypto/s2n_stream_cipher_null.c
@@ -50,7 +50,7 @@ static int s2n_stream_cipher_null_init(struct s2n_session_key *key)
     return 0;
 }
 
-struct s2n_cipher s2n_null_cipher = {
+const struct s2n_cipher s2n_null_cipher = {
     .type = S2N_STREAM,
     .key_material_size = 0,
     .io.stream = {
diff --git a/contrib/restricted/aws/s2n/crypto/s2n_stream_cipher_rc4.c b/contrib/restricted/aws/s2n/crypto/s2n_stream_cipher_rc4.c
index e5eab24391..ccbfbceee5 100644
--- a/contrib/restricted/aws/s2n/crypto/s2n_stream_cipher_rc4.c
+++ b/contrib/restricted/aws/s2n/crypto/s2n_stream_cipher_rc4.c
@@ -125,7 +125,7 @@ static int s2n_stream_cipher_rc4_destroy_key(struct s2n_session_key *key)
 
 #endif /* S2N_LIBCRYPTO_SUPPORTS_EVP_RC4 */
 
-struct s2n_cipher s2n_rc4 = {
+const struct s2n_cipher s2n_rc4 = {
     .type = S2N_STREAM,
     .key_material_size = 16,
     .io.stream = {