From: Caolán McNamara <caolanm@gmail.com>
Date: Thu, 18 Sep 2025 07:55:23 +0000 (+0100)
Subject: format embedded struct declaration for check-format.pl
X-Git-Tag: 4.0-PRE-CLANG-FORMAT-WEBKIT~129
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e164a3c13d46148f4f258f002bedec7f4b3e8989;p=thirdparty%2Fopenssl.git

format embedded struct declaration for check-format.pl

so that subsequent commits to e_chacha20_poly1305.c doesn't trigger
warnings about handling '{' later in this file in related code.

i.e.

crypto/evp/e_chacha20_poly1305.c:610:indent = 0 != 4 for stmt/decl:static const EVP_CIPHER chacha20_poly1305 = {
crypto/evp/e_chacha20_poly1305.c:611:indent = 4 != 45 for hanging '{' or 8 for lines after '{':    NID_chacha20_poly1305,

Reviewed-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28588)
---

diff --git a/crypto/evp/e_chacha20_poly1305.c b/crypto/evp/e_chacha20_poly1305.c
index 92fdaedb3a4..a06e9a66823 100644
--- a/crypto/evp/e_chacha20_poly1305.c
+++ b/crypto/evp/e_chacha20_poly1305.c
@@ -155,7 +155,9 @@ typedef struct {
     unsigned int nonce[12/4];
     unsigned char tag[POLY1305_BLOCK_SIZE];
     unsigned char tls_aad[POLY1305_BLOCK_SIZE];
-    struct { uint64_t aad, text; } len;
+    struct {
+        uint64_t aad, text;
+    } len;
     int aad, mac_inited, tag_len, nonce_len;
     size_t tls_payload_length;
 } EVP_CHACHA_AEAD_CTX;