Use C99 initialisers for the AEAD struct.

diff --git a/lib/libcrypto/evp/e_chacha20poly1305.c b/lib/libcrypto/evp/e_chacha20poly1305.c
index 6e4a3f5..75ff7f2 100644 (file)
--- a/lib/libcrypto/evp/e_chacha20poly1305.c
+++ b/lib/libcrypto/evp/e_chacha20poly1305.c
@@ -238,15 +238,15 @@ aead_chacha20_poly1305_open(const EVP_AEAD_CTX *ctx, unsigned char *out,
 }
 
 static const EVP_AEAD aead_chacha20_poly1305 = {
-       32,  /* key len */
-       CHACHA20_NONCE_LEN,   /* nonce len */
-       POLY1305_TAG_LEN,  /* overhead */
-       POLY1305_TAG_LEN,  /* max tag length */
-
-       aead_chacha20_poly1305_init,
-       aead_chacha20_poly1305_cleanup,
-       aead_chacha20_poly1305_seal,
-       aead_chacha20_poly1305_open,
+       .key_len = 32,
+       .nonce_len = CHACHA20_NONCE_LEN,
+       .overhead = POLY1305_TAG_LEN,
+       .max_tag_len = POLY1305_TAG_LEN,
+
+       .init = aead_chacha20_poly1305_init,
+       .cleanup = aead_chacha20_poly1305_cleanup,
+       .seal = aead_chacha20_poly1305_seal,
+       .open = aead_chacha20_poly1305_open,
 };
 
 const EVP_AEAD *

diff --git a/lib/libssl/src/crypto/evp/e_chacha20poly1305.c b/lib/libssl/src/crypto/evp/e_chacha20poly1305.c
index 6e4a3f5..75ff7f2 100644 (file)
--- a/lib/libssl/src/crypto/evp/e_chacha20poly1305.c
+++ b/lib/libssl/src/crypto/evp/e_chacha20poly1305.c
@@ -238,15 +238,15 @@ aead_chacha20_poly1305_open(const EVP_AEAD_CTX *ctx, unsigned char *out,
 }
 
 static const EVP_AEAD aead_chacha20_poly1305 = {
-       32,  /* key len */
-       CHACHA20_NONCE_LEN,   /* nonce len */
-       POLY1305_TAG_LEN,  /* overhead */
-       POLY1305_TAG_LEN,  /* max tag length */
-
-       aead_chacha20_poly1305_init,
-       aead_chacha20_poly1305_cleanup,
-       aead_chacha20_poly1305_seal,
-       aead_chacha20_poly1305_open,
+       .key_len = 32,
+       .nonce_len = CHACHA20_NONCE_LEN,
+       .overhead = POLY1305_TAG_LEN,
+       .max_tag_len = POLY1305_TAG_LEN,
+
+       .init = aead_chacha20_poly1305_init,
+       .cleanup = aead_chacha20_poly1305_cleanup,
+       .seal = aead_chacha20_poly1305_seal,
+       .open = aead_chacha20_poly1305_open,
 };
 
 const EVP_AEAD *