tls13: merge guarded code in a single section

rizlik · rizlik · commit d9bba72b8c9c · 2026-01-05T09:04:36.000+01:00
diff --git a/src/tls13.c b/src/tls13.c
@@ -5744,15 +5744,13 @@ static int DoTls13EncryptedExtensions(WOLFSSL* ssl, const byte* input,
         if (ext == NULL || !ext->val)
             ssl->earlyData = no_early_data;
     }
-#endif
 
-#ifdef WOLFSSL_EARLY_DATA
     if (ssl->earlyData == no_early_data) {
         ret = SetKeysSide(ssl, ENCRYPT_SIDE_ONLY);
         if (ret != 0)
             return ret;
     }
-#endif
+#endif /* WOLFSSL_EARLY_DATA */
 
     ssl->options.serverState = SERVER_ENCRYPTED_EXTENSIONS_COMPLETE;
 

Original file line number	Diff line number	Diff line change
`@@ -5744,15 +5744,13 @@ static int DoTls13EncryptedExtensions(WOLFSSL* ssl, const byte* input,`
`5744`	`5744`	`if (ext == NULL \|\| !ext->val)`
`5745`	`5745`	`ssl->earlyData = no_early_data;`
`5746`	`5746`	`}`
`5747`		`-#endif`
`5748`	`5747`
`5749`		`-#ifdef WOLFSSL_EARLY_DATA`
`5750`	`5748`	`if (ssl->earlyData == no_early_data) {`
`5751`	`5749`	`ret = SetKeysSide(ssl, ENCRYPT_SIDE_ONLY);`
`5752`	`5750`	`if (ret != 0)`
`5753`	`5751`	`return ret;`
`5754`	`5752`	`}`
`5755`		`-#endif`
	`5753`	`+#endif /* WOLFSSL_EARLY_DATA */`
`5756`	`5754`
`5757`	`5755`	`ssl->options.serverState = SERVER_ENCRYPTED_EXTENSIONS_COMPLETE;`
`5758`	`5756`