From 080b0d5f6bc022f65db991f39f231ed89e71c7f7 Mon Sep 17 00:00:00 2001
From: Benjamin Beurdouche <bbeurdouche@mozilla.com>
Date: Wed, 10 Mar 2021 09:49:17 +0000
Subject: [PATCH] Bug 1683520 - ECCKiila P384, change syntax of nested structs
 initialization to prevent build isses with GCC 4.8. r=bbrumley

Depends on D102389

Differential Revision: https://phabricator.services.mozilla.com/D106881

--HG--
extra : moz-landing-system : lando
---
 lib/freebl/ecl/ecp_secp384r1.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/freebl/ecl/ecp_secp384r1.c b/lib/freebl/ecl/ecp_secp384r1.c
index 1388c6fb4f..31653149c4 100644
--- a/lib/freebl/ecl/ecp_secp384r1.c
+++ b/lib/freebl/ecl/ecp_secp384r1.c
@@ -6074,7 +6074,7 @@ var_smul_wnaf_two(pt_aff_t *out, const unsigned char a[48],
     int i, d, is_neg, is_inf = 1, flipped = 0;
     int8_t anaf[385] = { 0 };
     int8_t bnaf[385] = { 0 };
-    pt_prj_t Q = { 0 };
+    pt_prj_t Q = {{ 0 }};
     pt_prj_t precomp[DRADIX / 2];
 
     precomp_wnaf(precomp, P);
@@ -6143,7 +6143,7 @@ var_smul_rwnaf(pt_aff_t *out, const unsigned char scalar[48],
 {
     int i, j, d, diff, is_neg;
     int8_t rnaf[77] = { 0 };
-    pt_prj_t Q = { 0 }, lut = { 0 };
+    pt_prj_t Q = {{ 0 }}, lut = {{ 0 }};
     pt_prj_t precomp[DRADIX / 2];
 
     precomp_wnaf(precomp, P);
@@ -6212,8 +6212,8 @@ fixed_smul_cmb(pt_aff_t *out, const unsigned char scalar[48])
 {
     int i, j, k, d, diff, is_neg = 0;
     int8_t rnaf[77] = { 0 };
-    pt_prj_t Q = { 0 }, R = { 0 };
-    pt_aff_t lut = { 0 };
+    pt_prj_t Q = {{ 0 }}, R = {{ 0 }};
+    pt_aff_t lut = {{ 0 }};
 
     scalar_rwnaf(rnaf, scalar);
 
@@ -19288,7 +19288,7 @@ var_smul_wnaf_two(pt_aff_t *out, const unsigned char a[48],
     int i, d, is_neg, is_inf = 1, flipped = 0;
     int8_t anaf[385] = { 0 };
     int8_t bnaf[385] = { 0 };
-    pt_prj_t Q = { 0 };
+    pt_prj_t Q = {{ 0 }};
     pt_prj_t precomp[DRADIX / 2];
 
     precomp_wnaf(precomp, P);
@@ -19357,7 +19357,7 @@ var_smul_rwnaf(pt_aff_t *out, const unsigned char scalar[48],
 {
     int i, j, d, diff, is_neg;
     int8_t rnaf[77] = { 0 };
-    pt_prj_t Q = { 0 }, lut = { 0 };
+    pt_prj_t Q = {{ 0 }}, lut = {{ 0 }};
     pt_prj_t precomp[DRADIX / 2];
 
     precomp_wnaf(precomp, P);
@@ -19426,8 +19426,8 @@ fixed_smul_cmb(pt_aff_t *out, const unsigned char scalar[48])
 {
     int i, j, k, d, diff, is_neg = 0;
     int8_t rnaf[77] = { 0 };
-    pt_prj_t Q = { 0 }, R = { 0 };
-    pt_aff_t lut = { 0 };
+    pt_prj_t Q = {{ 0 }}, R = {{ 0 }};
+    pt_aff_t lut = {{ 0 }};
 
     scalar_rwnaf(rnaf, scalar);